diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-08-09 08:16:43 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-08-09 08:16:43 +0000 |
| commit | 04aca4c7674f780be81ef24a73fdd107363574a8 (patch) | |
| tree | 31c123c4786f214fbc15ff91ac9accc341b18e45 /net-libs/webkit-gtk | |
| parent | Restrict pythonic things (diff) | |
| download | gentoo-2-04aca4c7674f780be81ef24a73fdd107363574a8.tar.gz gentoo-2-04aca4c7674f780be81ef24a73fdd107363574a8.tar.bz2 gentoo-2-04aca4c7674f780be81ef24a73fdd107363574a8.zip | |
Remove unused patch.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/webkit-gtk')
| -rw-r--r-- | net-libs/webkit-gtk/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/files/webkit-gtk-1.8.0-no-geoloc.patch | 57 |
2 files changed, 5 insertions, 58 deletions
diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog index a0b8cb938b9c..5dc67349ace0 100644 --- a/net-libs/webkit-gtk/ChangeLog +++ b/net-libs/webkit-gtk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/webkit-gtk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.170 2012/08/09 08:11:43 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.171 2012/08/09 08:16:43 tetromino Exp $ + + 09 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -files/webkit-gtk-1.8.0-no-geoloc.patch: + Remove unused patch. *webkit-gtk-1.8.2-r300 (09 Aug 2012) *webkit-gtk-1.8.2-r200 (09 Aug 2012) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-no-geoloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-no-geoloc.patch deleted file mode 100644 index 1094f505fadd..000000000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-no-geoloc.patch +++ /dev/null @@ -1,57 +0,0 @@ -2012-03-31 Martin Robinson <mrobinson@igalia.com> - - [GTK] [Stable] --disable geolocation broken after recent merges - https://bugs.webkit.org/show_bug.cgi?id=82452 - - No review, as this is just a build fix. - - Fix the geolocation build. - - * webkit/webkitgeolocationpolicydecision.cpp: - (webkit_geolocation_policy_decision_new): When gelocation is off, just return null. - * webkit/webkitgeolocationpolicydecisionprivate.h: Activate webkit_geolocation_policy_decision_new - for non-Geolocation builds. - -Index: /releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h -=================================================================== ---- /releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h (revision 112120) -+++ /releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h (revision 112800) -@@ -26,6 +26,4 @@ - #include "webkitgeolocationpolicydecision.h" - --#if ENABLE(GEOLOCATION) -- - extern "C" { - -@@ -34,5 +32,3 @@ - } - --#endif // ENABLE(GEOLOCATION) -- - #endif -Index: /releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp -=================================================================== ---- /releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp (revision 112120) -+++ /releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp (revision 112800) -@@ -54,8 +54,8 @@ - } - --#if ENABLE(GEOLOCATION) - WebKitGeolocationPolicyDecision* webkit_geolocation_policy_decision_new(WebKitWebFrame* frame, WebCore::Geolocation* geolocation) - { -- g_return_val_if_fail(frame, NULL); -+#if ENABLE(GEOLOCATION) -+ g_return_val_if_fail(frame, 0); - WebKitGeolocationPolicyDecision* decision = WEBKIT_GEOLOCATION_POLICY_DECISION(g_object_new(WEBKIT_TYPE_GEOLOCATION_POLICY_DECISION, NULL)); - WebKitGeolocationPolicyDecisionPrivate* priv = decision->priv; -@@ -64,6 +64,8 @@ - priv->geolocation = geolocation; - return decision; -+#else -+ return 0; -+#endif - } --#endif - - /** - |