From: | "Lars Wendler (polynomial-c)" <polynomial-c@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in www-client/midori/files: midori-0.5.10-fix-webkit2-build-breakage.patch |
Date: | Thu, 25 Jun 2015 06:55:25 |
Message-Id: | 20150625065519.3095CA55@oystercatcher.gentoo.org |
1 | polynomial-c 15/06/25 06:55:19 |
2 | |
3 | Added: midori-0.5.10-fix-webkit2-build-breakage.patch |
4 | Log: |
5 | Fixed build failure with webkit2 |
6 | |
7 | (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
8 | |
9 | Revision Changes Path |
10 | 1.1 www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: midori-0.5.10-fix-webkit2-build-breakage.patch |
16 | =================================================================== |
17 | https://launchpadlibrarian.net/204464340/0002-fix-webkit2-build-breakage.patch |
18 | |
19 | webkit_web_view_get_main_frame() is a webkit1 API function. |
20 | Using it without a check breaks webkit2 builds. |
21 | |
22 | Signed-off-by: Gustavo Zacarias <gustavo@××××××××××××.ar> |
23 | |
24 | diff -Nura midori-0.5.10.orig/midori/midori-view.c midori-0.5.10.wk2/midori/midori-view.c |
25 | --- midori-0.5.10.orig/midori/midori-view.c 2015-04-24 08:50:24.940501790 -0300 |
26 | +++ midori-0.5.10.wk2/midori/midori-view.c 2015-04-25 07:19:21.707132362 -0300 |
27 | @@ -1256,9 +1256,11 @@ |
28 | message, error->message, NULL, |
29 | _("Try Again"), web_frame); |
30 | |
31 | +#ifdef WEBKIT2 |
32 | /* if the main frame for the whole tab has a network error, set tab error status */ |
33 | if (web_frame == webkit_web_view_get_main_frame (web_view)) |
34 | midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK); |
35 | +#endif |
36 | |
37 | g_free (message); |
38 | g_free (title); |