Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (c6f54031e3575a31b6253f2f683a54797078e3e2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (c6f54031e3575a31b6253f2f683a54797078e3e2)
  • Date: Tue, 24 Apr 2012 20:34:09 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

http/webkitgtk/DETAILS | 10 +++---
http/webkitgtk/HISTORY | 4 ++
http/webkitgtk/PRE_BUILD | 1
http/webkitgtk/disable-geo.patch | 57
---------------------------------------
4 files changed, 9 insertions(+), 63 deletions(-)

New commits:
commit c6f54031e3575a31b6253f2f683a54797078e3e2
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

webkitgtk 1.8.1, SECURITY_PATCH=5

diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 03a28d2..c13f78d 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,19 +1,19 @@
SPELL=webkitgtk
if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- VERSION=1.8.0
+ VERSION=1.8.1
SOURCE=webkit-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:592e89522cbc7f746a44e880dbd9c8e5096c29cbf431585772500c842ff1130a162c525ccabc01c7714512760d76d9b383c8a9d8b97b9da1865e27ef5d566b3c
+
SOURCE_HASH=sha512:67d9eaedfc18805ae7694bb56e74538726e2f1bc653363adcd941e0394c54c72c55c31aedd3b65b8798cc0e19ab69e0fe8c3ad0a313dec02c505214f48f5ffff
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
else
- VERSION=1.8.0
- SECURITY_PATCH=4
+ VERSION=1.8.1
SOURCE=webkit-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:592e89522cbc7f746a44e880dbd9c8e5096c29cbf431585772500c842ff1130a162c525ccabc01c7714512760d76d9b383c8a9d8b97b9da1865e27ef5d566b3c
+
SOURCE_HASH=sha512:67d9eaedfc18805ae7694bb56e74538726e2f1bc653363adcd941e0394c54c72c55c31aedd3b65b8798cc0e19ab69e0fe8c3ad0a313dec02c505214f48f5ffff
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
fi
WEB_SITE=http://webkitgtk.org/
+ SECURITY_PATCH=5
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20071208
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index b1c6262..774407e 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,7 @@
+2012-04-25 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.1, SECURITY_PATCH=5
+ * PRE_BUILD, disable-geo.patch: patch removed
+
2012-04-15 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to apply patches
* disable-geo.patch: added, to fix compilation with disabled geoclue
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
index 1cc9db5..cdd362a 100755
--- a/http/webkitgtk/PRE_BUILD
+++ b/http/webkitgtk/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/disable-geo.patch" &&
patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
diff --git a/http/webkitgtk/disable-geo.patch
b/http/webkitgtk/disable-geo.patch
deleted file mode 100644
index dbe474c..0000000
--- a/http/webkitgtk/disable-geo.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- Source/WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h.orig
-+++ Source/WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h
-@@ -26,6 +26,4 @@
- #include "webkitgeolocationpolicydecision.h"
-
--#if ENABLE(GEOLOCATION)
--
- extern "C" {
-
-@@ -34,5 +32,3 @@
- }
-
--#endif // ENABLE(GEOLOCATION)
--
- #endif
---- Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp.orig
-+++ Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp
-@@ -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
-
- /**
---- Source/WebKit/gtk/ChangeLog.orig
-+++ Source/WebKit/gtk/ChangeLog
-@@ -1,2 +1,16 @@
-+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>
-



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (c6f54031e3575a31b6253f2f683a54797078e3e2), Ladislav Hagara, 04/24/2012

Archive powered by MHonArc 2.6.24.

Top of Page