<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[136646] users/devans/GNOME-3/stable/dports/www/webkit-gtk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/136646">136646</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-05-23 10:06:42 -0700 (Sat, 23 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: webkit-gtk, webkit-gtk3, update to version 2.4.9, remove outdated patches now incorporated upstream.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkPortfile">users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkfilesclangcheckpatch">users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-check.patch</a></li>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkfilesglib244GMutexLockerpatch">users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/glib-2.44-GMutexLocker.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile (136645 => 136646)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile 2015-05-23 16:59:37 UTC (rev 136645)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile 2015-05-23 17:06:42 UTC (rev 136646)
</span><span class="lines">@@ -12,8 +12,7 @@
</span><span class="cx">
</span><span class="cx"> name webkit-gtk
</span><span class="cx"> epoch 2
</span><del>-version 2.4.8
-revision 1
</del><ins>+version 2.4.9
</ins><span class="cx"> description Apple's WebKit HTML rendering library for GTK+
</span><span class="cx"> long_description ${description}
</span><span class="cx"> maintainers jeremyhu devans
</span><span class="lines">@@ -28,9 +27,8 @@
</span><span class="cx">
</span><span class="cx"> dist_subdir webkit-gtk
</span><span class="cx">
</span><del>-checksums sha1 44c6bbe52108297126830525619c1df047886a6f \
- rmd160 24f812f3989baa67e165c1076923020c37df9501 \
- sha256 68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23
</del><ins>+checksums rmd160 122468435539d69665d5206ae266fb36ff2d86c2 \
+ sha256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564
</ins><span class="cx">
</span><span class="cx"> depends_lib \
</span><span class="cx"> path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span class="lines">@@ -62,7 +60,6 @@
</span><span class="cx"> # our-icu.patch: No upstream bug report, probably not wanted
</span><span class="cx"> # ruby-1.8.patch: https://bugs.webkit.org/show_bug.cgi?id=126327
</span><span class="cx"> # quartz-webcore.patch: https://bugs.webkit.org/show_bug.cgi?id=126326
</span><del>-# clang-check.patch: https://bugs.webkit.org/show_bug.cgi?id=126324
</del><span class="cx"> # gstreamer.patch: https://bugs.webkit.org/show_bug.cgi?id=126437
</span><span class="cx"> # libedit.patch: https://bugs.webkit.org/show_bug.cgi?id=127059
</span><span class="cx"> # leopard-malloc.patch: https://bugs.webkit.org/show_bug.cgi?id=140143
</span><span class="lines">@@ -74,12 +71,10 @@
</span><span class="cx"> our-icu.patch \
</span><span class="cx"> ruby-1.8.patch \
</span><span class="cx"> quartz-webcore.patch \
</span><del>- clang-check.patch \
</del><span class="cx"> gstreamer.patch \
</span><span class="cx"> leopard-platform.patch \
</span><span class="cx"> leopard-malloc.patch \
</span><del>- libedit.patch \
- glib-2.44-GMutexLocker.patch
</del><ins>+ libedit.patch
</ins><span class="cx">
</span><span class="cx"> conflicts_build google-test
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesclangcheckpatch"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-check.patch (136645 => 136646)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-check.patch 2015-05-23 16:59:37 UTC (rev 136645)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-check.patch 2015-05-23 17:06:42 UTC (rev 136646)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>---- 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++"], [])
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesglib244GMutexLockerpatch"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/glib-2.44-GMutexLocker.patch (136645 => 136646)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/glib-2.44-GMutexLocker.patch 2015-05-23 16:59:37 UTC (rev 136645)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/glib-2.44-GMutexLocker.patch 2015-05-23 17:06:42 UTC (rev 136646)
</span><span class="lines">@@ -1,249 +0,0 @@
</span><del>-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();
-
</del></span></pre>
</div>
</div>
</body>
</html>