[mingw-webkitgtk] Update to 1.8.0
Kalev Lember
kalev at fedoraproject.org
Tue Apr 3 21:23:49 UTC 2012
commit 3ac151f2aa67abbdae9bf43bc4f8d55c4f215415
Author: Kalev Lember <kalevlember at gmail.com>
Date: Tue Apr 3 21:28:39 2012 +0300
Update to 1.8.0
- Backported a patch to fix build with --disable-geolocation
.gitignore | 1 +
mingw-webkitgtk.spec | 13 ++++-
sources | 2 +-
webkit-disable-geolocation.patch | 96 ++++++++++++++++++++++++++++++++++++++
4 files changed, 108 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 77ad2ae..bd62c5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/webkit-1.6.1.tar.gz
/webkit-1.7.5.tar.xz
/webkit-1.7.92.tar.xz
+/webkit-1.8.0.tar.xz
diff --git a/mingw-webkitgtk.spec b/mingw-webkitgtk.spec
index f42ccd9..2bb127c 100644
--- a/mingw-webkitgtk.spec
+++ b/mingw-webkitgtk.spec
@@ -29,7 +29,7 @@
%bcond_with jit
Name: mingw-webkitgtk
-Version: 1.7.92
+Version: 1.8.0
Release: 1%{?dist}
Summary: MinGW Windows web content engine library
@@ -37,8 +37,10 @@ Group: Development/Libraries
License: LGPLv2+ and BSD
URL: http://webkit.org/
-#Source0: http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2
-Source0: http://www.webkitgtk.org/webkit-%{version}.tar.xz
+Source0: http://webkitgtk.org/releases/webkit-%{version}.tar.xz
+
+# Fix --disable-geolocation build, backported from webkit-1.8 branch
+Patch0: webkit-disable-geolocation.patch
# The DumpRenderTree tool fails to compile for version 1.3.13
# as it depends on internal symbols which aren't exported in
@@ -148,6 +150,7 @@ Static version of the MinGW Windows WebKitGTK+ library.
%prep
%setup -qn "webkit-%{version}"
+%patch0 -p1 -b .disable_geolocation
%patch2 -p0 -b .dumprendertree
autoreconf --verbose --install -I Source/autotools
@@ -252,6 +255,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
+* Tue Apr 03 2012 Kalev Lember <kalevlember at gmail.com> - 1.8.0-1
+- Update to 1.8.0
+- Backported a patch to fix build with --disable-geolocation
+
* Wed Mar 28 2012 Kalev Lember <kalevlember at gmail.com> - 1.7.92-1
- Update to 1.7.92
- Dropped upstreamed patches
diff --git a/sources b/sources
index 03c98a3..d2a5b07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-520a421566584ea56552ee314de0b671 webkit-1.7.92.tar.xz
+52b2feb0fae01e68432b547bd85e8d74 webkit-1.8.0.tar.xz
diff --git a/webkit-disable-geolocation.patch b/webkit-disable-geolocation.patch
new file mode 100644
index 0000000..77cfca2
--- /dev/null
+++ b/webkit-disable-geolocation.patch
@@ -0,0 +1,96 @@
+From 6ff15f2ed289b1bbb3729463d0e1de3e26452bd9 Mon Sep 17 00:00:00 2001
+From: "mrobinson at webkit.org"
+ <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Sat, 31 Mar 2012 19:59:01 +0000
+Subject: [PATCH] [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.
+
+
+git-svn-id: http://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-1.8@112800 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebKit/gtk/ChangeLog | 14 ++++++++++++++
+ .../gtk/webkit/webkitgeolocationpolicydecision.cpp | 8 +++++---
+ .../webkitgeolocationpolicydecisionprivate.h | 4 ----
+ 3 files changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
+index 6307883..26e6d46 100644
+--- a/Source/WebKit/gtk/ChangeLog
++++ b/Source/WebKit/gtk/ChangeLog
+@@ -1,3 +1,17 @@
++2012-03-31 Martin Robinson <mrobinson at 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.
++
+ 2012-03-27 Martin Robinson <mrobinson at igalia.com>
+
+ Update the NEWS and version for the impending 1.8.0 release.
+diff --git a/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp b/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp
+index 930b687..efd4c89 100644
+--- a/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp
++++ b/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp
+@@ -53,18 +53,20 @@ static void webkit_geolocation_policy_decision_init(WebKitGeolocationPolicyDecis
+ decision->priv = G_TYPE_INSTANCE_GET_PRIVATE(decision, WEBKIT_TYPE_GEOLOCATION_POLICY_DECISION, WebKitGeolocationPolicyDecisionPrivate);
+ }
+
+-#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;
+
+ priv->frame = frame;
+ priv->geolocation = geolocation;
+ return decision;
+-}
++#else
++ return 0;
+ #endif
++}
+
+ /**
+ * webkit_geolocation_policy_allow
+diff --git a/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h b/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h
+index 177154c..d250044 100644
+--- a/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h
++++ b/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h
+@@ -25,14 +25,10 @@
+
+ #include "webkitgeolocationpolicydecision.h"
+
+-#if ENABLE(GEOLOCATION)
+-
+ extern "C" {
+
+ WebKitGeolocationPolicyDecision* webkit_geolocation_policy_decision_new(WebKitWebFrame*, WebCore::Geolocation*);
+
+ }
+
+-#endif // ENABLE(GEOLOCATION)
+-
+ #endif
+--
+1.7.9.3
+
More information about the scm-commits
mailing list