[136670] trunk/dports/www/webkit-gtk
devans at macports.org
devans at macports.org
Sat May 23 13:15:15 PDT 2015
Revision: 136670
https://trac.macports.org/changeset/136670
Author: devans at macports.org
Date: 2015-05-23 13:15:15 -0700 (Sat, 23 May 2015)
Log Message:
-----------
webkit-gtk, webkit-gtk3: update to version 2.4.9, remove outdated patches now incorporated upstream.
Modified Paths:
--------------
trunk/dports/www/webkit-gtk/Portfile
Removed Paths:
-------------
trunk/dports/www/webkit-gtk/files/clang-check.patch
trunk/dports/www/webkit-gtk/files/glib-2.44-GMutexLocker.patch
Property Changed:
----------------
trunk/dports/www/webkit-gtk/
Property changes on: trunk/dports/www/webkit-gtk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/www/webkit-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/www/webkit-gtk:127294-127323
+ /users/devans/GNOME-3/stable/dports/www/webkit-gtk:127294-136669
Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile 2015-05-23 19:06:10 UTC (rev 136669)
+++ trunk/dports/www/webkit-gtk/Portfile 2015-05-23 20:15:15 UTC (rev 136670)
@@ -12,8 +12,7 @@
name webkit-gtk
epoch 2
-version 2.4.8
-revision 1
+version 2.4.9
description Apple's WebKit HTML rendering library for GTK+
long_description ${description}
maintainers jeremyhu devans
@@ -28,9 +27,8 @@
dist_subdir webkit-gtk
-checksums sha1 44c6bbe52108297126830525619c1df047886a6f \
- rmd160 24f812f3989baa67e165c1076923020c37df9501 \
- sha256 68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23
+checksums rmd160 122468435539d69665d5206ae266fb36ff2d86c2 \
+ sha256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564
depends_lib \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
@@ -62,7 +60,6 @@
# our-icu.patch: No upstream bug report, probably not wanted
# ruby-1.8.patch: https://bugs.webkit.org/show_bug.cgi?id=126327
# quartz-webcore.patch: https://bugs.webkit.org/show_bug.cgi?id=126326
-# clang-check.patch: https://bugs.webkit.org/show_bug.cgi?id=126324
# gstreamer.patch: https://bugs.webkit.org/show_bug.cgi?id=126437
# libedit.patch: https://bugs.webkit.org/show_bug.cgi?id=127059
# leopard-malloc.patch: https://bugs.webkit.org/show_bug.cgi?id=140143
@@ -74,12 +71,10 @@
our-icu.patch \
ruby-1.8.patch \
quartz-webcore.patch \
- clang-check.patch \
gstreamer.patch \
leopard-platform.patch \
leopard-malloc.patch \
- libedit.patch \
- glib-2.44-GMutexLocker.patch
+ libedit.patch
conflicts_build google-test
Deleted: trunk/dports/www/webkit-gtk/files/clang-check.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/clang-check.patch 2015-05-23 19:06:10 UTC (rev 136669)
+++ trunk/dports/www/webkit-gtk/files/clang-check.patch 2015-05-23 20:15:15 UTC (rev 136670)
@@ -1,20 +0,0 @@
---- Source/autotools/CheckSystemAndBasicDependencies.m4.orig 2014-01-23 08:49:59.000000000 -0800
-+++ Source/autotools/CheckSystemAndBasicDependencies.m4 2014-02-05 17:29:39.000000000 -0800
-@@ -92,7 +92,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
- #endif
- ])], [c_compiler="gcc"], [])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
-+#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
- #error Not a supported Clang compiler
- #endif
- ])], [c_compiler="clang"], [])
-@@ -111,7 +111,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
- #endif
- ])], [cxx_compiler="g++"], [])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
-+#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
- #error Not a supported Clang++ compiler
- #endif
- ])], [cxx_compiler="clang++"], [])
Deleted: trunk/dports/www/webkit-gtk/files/glib-2.44-GMutexLocker.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/glib-2.44-GMutexLocker.patch 2015-05-23 19:06:10 UTC (rev 136669)
+++ trunk/dports/www/webkit-gtk/files/glib-2.44-GMutexLocker.patch 2015-05-23 20:15:15 UTC (rev 136670)
@@ -1,249 +0,0 @@
-diff -ur Source/WebCore/platform/graphics/gstreamer.orig/VideoSinkGStreamer.cpp Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
---- Source/WebCore/platform/graphics/gstreamer.orig/VideoSinkGStreamer.cpp 2015-04-20 15:30:23.000000000 -0700
-+++ Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-04-20 15:33:39.000000000 -0700
-@@ -118,7 +118,7 @@
- WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
- WebKitVideoSinkPrivate* priv = sink->priv;
-
-- GMutexLocker lock(priv->bufferMutex);
-+ WebCore::GMutexLocker lock(priv->bufferMutex);
- GstBuffer* buffer = priv->buffer;
- priv->buffer = 0;
- priv->timeoutId = 0;
-@@ -140,7 +140,7 @@
- WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
- WebKitVideoSinkPrivate* priv = sink->priv;
-
-- GMutexLocker lock(priv->bufferMutex);
-+ WebCore::GMutexLocker lock(priv->bufferMutex);
-
- if (priv->unlocked)
- return GST_FLOW_OK;
-@@ -279,7 +279,7 @@
-
- static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
- {
-- GMutexLocker lock(priv->bufferMutex);
-+ WebCore::GMutexLocker lock(priv->bufferMutex);
-
- if (priv->buffer) {
- gst_buffer_unref(priv->buffer);
-@@ -305,7 +305,7 @@
- WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
-
- {
-- GMutexLocker lock(priv->bufferMutex);
-+ WebCore::GMutexLocker lock(priv->bufferMutex);
- priv->unlocked = false;
- }
-
-@@ -330,7 +330,7 @@
- {
- WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
-
-- GMutexLocker lock(priv->bufferMutex);
-+ WebCore::GMutexLocker lock(priv->bufferMutex);
- priv->unlocked = false;
- return TRUE;
- }
-diff -ur Source/WebCore/platform/graphics/gstreamer.orig/WebKitWebSourceGStreamer.cpp Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
---- Source/WebCore/platform/graphics/gstreamer.orig/WebKitWebSourceGStreamer.cpp 2015-04-20 15:30:23.000000000 -0700
-+++ Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-04-20 15:33:39.000000000 -0700
-@@ -346,7 +346,7 @@
-
- switch (propID) {
- case PROP_IRADIO_MODE: {
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- priv->iradioMode = g_value_get_boolean(value);
- break;
- }
-@@ -364,7 +364,7 @@
- WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
- WebKitWebSrcPrivate* priv = src->priv;
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- switch (propID) {
- case PROP_IRADIO_MODE:
- g_value_set_boolean(value, priv->iradioMode);
-@@ -417,7 +417,7 @@
-
- ASSERT(isMainThread());
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-
- bool seeking = priv->seekID;
-
-@@ -476,7 +476,7 @@
-
- ASSERT(isMainThread());
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-
- priv->startID = 0;
- priv->corsAccessCheck = CORSNoCheck;
-@@ -573,7 +573,7 @@
- return ret;
- }
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- switch (transition) {
- case GST_STATE_CHANGE_READY_TO_PAUSED:
- GST_DEBUG_OBJECT(src, "READY->PAUSED");
-@@ -604,7 +604,7 @@
- gst_query_parse_duration(query, &format, NULL);
-
- GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
- gst_query_set_duration(query, format, src->priv->size);
- result = TRUE;
-@@ -612,7 +612,7 @@
- break;
- }
- case GST_QUERY_URI: {
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- gst_query_set_uri(query, src->priv->uri);
- result = TRUE;
- break;
-@@ -653,7 +653,7 @@
- WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
- gchar* ret;
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- ret = g_strdup(src->priv->uri);
- return ret;
- }
-@@ -668,7 +668,7 @@
- return FALSE;
- }
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-
- g_free(priv->uri);
- priv->uri = 0;
-@@ -704,7 +704,7 @@
-
- ASSERT(isMainThread());
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- // already stopped
- if (!priv->needDataID)
- return FALSE;
-@@ -725,7 +725,7 @@
-
- GST_DEBUG_OBJECT(src, "Need more data: %u", length);
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- if (priv->needDataID || !priv->paused) {
- return;
- }
-@@ -739,7 +739,7 @@
-
- ASSERT(isMainThread());
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- // already stopped
- if (!priv->enoughDataID)
- return FALSE;
-@@ -760,7 +760,7 @@
-
- GST_DEBUG_OBJECT(src, "Have enough data");
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- if (priv->enoughDataID || priv->paused) {
- return;
- }
-@@ -774,7 +774,7 @@
-
- ASSERT(isMainThread());
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- // already stopped
- if (!priv->seekID)
- return FALSE;
-@@ -792,7 +792,7 @@
- WebKitWebSrcPrivate* priv = src->priv;
-
- GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- if (offset == priv->offset && priv->requestedOffset == priv->offset)
- return TRUE;
-
-@@ -811,7 +811,7 @@
- void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
- {
- ASSERT(player);
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- src->priv->player = player;
- }
-
-@@ -841,7 +841,7 @@
-
- mapGstBuffer(buffer);
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- priv->buffer = adoptGRef(buffer);
- locker.unlock();
-
-@@ -867,7 +867,7 @@
- return;
- }
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-
- priv->corsAccessCheck = corsAccessCheck;
-
-@@ -966,7 +966,7 @@
- WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
- WebKitWebSrcPrivate* priv = src->priv;
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-
- GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
-
-@@ -1035,7 +1035,7 @@
-
- GST_DEBUG_OBJECT(src, "Have EOS");
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- if (!priv->seekID) {
- locker.unlock();
- gst_app_src_end_of_stream(priv->appsrc);
-@@ -1194,7 +1194,7 @@
-
- GST_ERROR_OBJECT(src, "Request was blocked");
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- uri.reset(g_strdup(src->priv->uri));
- locker.unlock();
-
-@@ -1208,7 +1208,7 @@
-
- GST_ERROR_OBJECT(src, "Cannot show URL");
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- uri.reset(g_strdup(src->priv->uri));
- locker.unlock();
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150523/d38ee8b3/attachment.html>
More information about the macports-changes
mailing list