From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../midori-0.5.10-fix-webkit2-build-breakage.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch (limited to 'www-client/midori/files') 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 + +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); -- cgit v1.2.3-65-gdbad