diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2015-06-25 06:55:19 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2015-06-25 06:55:19 +0000 |
| commit | 864caa28fcb59af62bec8d4b5e29a17cd5287dba (patch) | |
| tree | 9cb27973c9b75932bd799a33423d5f401f303b95 /www-client | |
| parent | mask games-fps/tremulous for removal (diff) | |
| download | gentoo-2-864caa28fcb59af62bec8d4b5e29a17cd5287dba.tar.gz gentoo-2-864caa28fcb59af62bec8d4b5e29a17cd5287dba.tar.bz2 gentoo-2-864caa28fcb59af62bec8d4b5e29a17cd5287dba.zip | |
Fixed build failure with webkit2
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/midori/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch | 22 | ||||
| -rw-r--r-- | www-client/midori/midori-0.5.10.ebuild | 3 |
3 files changed, 29 insertions, 2 deletions
diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog index 055dabde43b3..522c1d71ad9e 100644 --- a/www-client/midori/ChangeLog +++ b/www-client/midori/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/midori # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.132 2015/06/24 20:48:23 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.133 2015/06/25 06:55:19 polynomial-c Exp $ + + 25 Jun 2015; Lars Wendler <polynomial-c@gentoo.org> midori-0.5.10.ebuild, + +files/midori-0.5.10-fix-webkit2-build-breakage.patch: + Fixed build failure with webkit2. *midori-0.5.10 (24 Jun 2015) diff --git a/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch b/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch new file mode 100644 index 000000000000..3c6059c229b6 --- /dev/null +++ b/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch @@ -0,0 +1,22 @@ +https://launchpadlibrarian.net/204464340/0002-fix-webkit2-build-breakage.patch + +webkit_web_view_get_main_frame() is a webkit1 API function. +Using it without a check breaks webkit2 builds. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura midori-0.5.10.orig/midori/midori-view.c midori-0.5.10.wk2/midori/midori-view.c +--- midori-0.5.10.orig/midori/midori-view.c 2015-04-24 08:50:24.940501790 -0300 ++++ midori-0.5.10.wk2/midori/midori-view.c 2015-04-25 07:19:21.707132362 -0300 +@@ -1256,9 +1256,11 @@ + message, error->message, NULL, + _("Try Again"), web_frame); + ++#ifdef WEBKIT2 + /* if the main frame for the whole tab has a network error, set tab error status */ + if (web_frame == webkit_web_view_get_main_frame (web_view)) + midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK); ++#endif + + g_free (message); + g_free (title); diff --git a/www-client/midori/midori-0.5.10.ebuild b/www-client/midori/midori-0.5.10.ebuild index 153bf8eb4435..a7e3ce909b37 100644 --- a/www-client/midori/midori-0.5.10.ebuild +++ b/www-client/midori/midori-0.5.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.10.ebuild,v 1.1 2015/06/24 20:48:23 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.10.ebuild,v 1.2 2015/06/25 06:55:19 polynomial-c Exp $ EAPI=5 @@ -77,6 +77,7 @@ src_unpack() { } src_prepare() { + epatch "${FILESDIR}/${P}-fix-webkit2-build-breakage.patch" vala_src_prepare sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die } |