<!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>[131881] users/devans/GNOME-3/stable/dports/www</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/131881">131881</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-01-20 00:59:12 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: webkit-gtk, webkit-gtkdevel, sync with trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkPortfile">users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkfilesleopardmallocpatch">users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-malloc.patch</a></li>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkfilesleopardplatformpatch">users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch</a></li>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkfilesruby18patch">users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/ruby-1.8.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkfilesquartzduplicatesymbols2patch">users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-duplicate-symbols2.patch</a></li>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkfilesquartzincludewidgetbackingstorecairopatch">users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtk">users/devans/GNOME-3/stable/dports/www/webkit-gtk/</a></li>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkdevel">users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportswwwwebkitgtk"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/www/webkit-gtk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/www/webkit-gtk:127269-127943
</span><span class="cx"> + /branches/mld-qt-481/dports/www/webkit-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/www/webkit-gtk:127269-131880
</span><a id="usersdevansGNOME3stabledportswwwwebkitgtkPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile (131880 => 131881)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile 2015-01-20 08:53:40 UTC (rev 131880)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile 2015-01-20 08:59:12 UTC (rev 131881)
</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.7
-revision 1
</del><ins>+version 2.4.8
</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,9 @@
</span><span class="cx">
</span><span class="cx"> dist_subdir webkit-gtk
</span><span class="cx">
</span><del>-checksums sha1 10d4cd1c1f7454adc576c6b97fa3d262b6665764 \
- rmd160 25e1732f7e04ee0e15d7292aa5ef693d5c25679d \
- sha256 f5cf26e39abf1d6b2d25f1398348fef6bbe6c03fb4f99e11c569091c05197d38
</del><ins>+checksums sha1 44c6bbe52108297126830525619c1df047886a6f \
+ rmd160 24f812f3989baa67e165c1076923020c37df9501 \
+ sha256 68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23
</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">@@ -51,31 +50,36 @@
</span><span class="cx">
</span><span class="cx"> depends_build \
</span><span class="cx"> port:gtk-doc \
</span><del>- port:pkgconfig
</del><ins>+ port:pkgconfig \
+ port:python27 \
+ port:py27-simplejson
</ins><span class="cx">
</span><ins>+configure.python ${prefix}/bin/python2.7
+
</ins><span class="cx"> # case-insensitive.patch: https://bugs.webkit.org/show_bug.cgi?id=65811
</span><span class="cx"> # our-icu.patch: No upstream bug report, probably not wanted
</span><ins>+# ruby-1.8.patch: https://bugs.webkit.org/show_bug.cgi?id=126327
</ins><span class="cx"> # quartz-webcore.patch: https://bugs.webkit.org/show_bug.cgi?id=126326
</span><del>-# quartz-duplicate-symbols.patch: https://bugs.webkit.org/show_bug.cgi?id=126821
</del><span class="cx"> # clang-check.patch: https://bugs.webkit.org/show_bug.cgi?id=126324
</span><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><ins>+# leopard-malloc.patch: https://bugs.webkit.org/show_bug.cgi?id=140143
+# leopard-platform.patch: https://bugs.webkit.org/show_bug.cgi?id=140143
</ins><span class="cx">
</span><span class="cx"> patchfiles \
</span><span class="cx"> clang-assertions.patch \
</span><span class="cx"> case-insensitive.patch \
</span><span class="cx"> our-icu.patch \
</span><del>- quartz-duplicate-symbols.patch \
</del><ins>+ ruby-1.8.patch \
</ins><span class="cx"> quartz-webcore.patch \
</span><span class="cx"> clang-check.patch \
</span><span class="cx"> gstreamer.patch \
</span><ins>+ leopard-platform.patch \
+ leopard-malloc.patch \
</ins><span class="cx"> libedit.patch
</span><span class="cx">
</span><span class="cx"> conflicts_build google-test
</span><span class="cx">
</span><del>-# https://trac.macports.org/ticket/36329
-configure.python /usr/bin/python
-
</del><span class="cx"> # --disable-webkit2: https://bugs.webkit.org/show_bug.cgi?id=126416
</span><span class="cx"> # --disable-web-audio: https://bugs.webkit.org/show_bug.cgi?id=126438
</span><span class="cx"> # --disable-jit: https://bugs.webkit.org/show_bug.cgi?id=133293
</span><span class="lines">@@ -226,12 +230,6 @@
</span><span class="cx"> depends_lib-delete \
</span><span class="cx"> port:mesa \
</span><span class="cx"> port:xorg-libXt
</span><del>-
- # quartz-include-widgetbackingstorecairo.patch
- # https://trac.macports.org/ticket/38203
- # https://bugs.webkit.org/show_bug.cgi?id=111598
- patchfiles-append quartz-include-widgetbackingstorecairo.patch \
- quartz-duplicate-symbols2.patch
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant video description {Enable HTML5 video support using gstreamer} {
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesleopardmallocpatchfromrev131290trunkdportswwwwebkitgtkfilesleopardmallocpatch"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-malloc.patch (from rev 131290, trunk/dports/www/webkit-gtk/files/leopard-malloc.patch) (0 => 131881)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-malloc.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-malloc.patch 2015-01-20 08:59:12 UTC (rev 131881)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+--- Source/WTF/wtf/FastMalloc.cpp.orig 2015-01-07 16:04:31.000000000 -0800
++++ Source/WTF/wtf/FastMalloc.cpp 2015-01-07 16:06:05.000000000 -0800
+@@ -5095,8 +5095,13 @@ void* FastMallocZone::zoneRealloc(malloc
+ extern "C" {
+ malloc_introspection_t jscore_fastmalloc_introspection = { &FastMallocZone::enumerate, &FastMallocZone::goodSize, &FastMallocZone::check, &FastMallocZone::print,
+ &FastMallocZone::log, &FastMallocZone::forceLock, &FastMallocZone::forceUnlock, &FastMallocZone::statistics
++
++#if OS(IOS) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+ , 0 // zone_locked will not be called on the zone unless it advertises itself as version five or higher.
++#endif
++#if OS(IOS) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+ , 0, 0, 0, 0 // These members will not be used unless the zone advertises itself as version seven or higher.
++#endif
+
+ };
+ }
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesleopardplatformpatchfromrev131290trunkdportswwwwebkitgtkfilesleopardplatformpatch"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch (from rev 131290, trunk/dports/www/webkit-gtk/files/leopard-platform.patch) (0 => 131881)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch 2015-01-20 08:59:12 UTC (rev 131881)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+--- Source/WTF/wtf/Platform.h.orig 2015-01-06 13:30:52.000000000 -0800
++++ Source/WTF/wtf/Platform.h 2015-01-06 13:42:15.000000000 -0800
+@@ -587,11 +587,14 @@
+
+ #if OS(DARWIN)
+
++#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 || PLATFORM(IOS)
+ #define HAVE_DISPATCH_H 1
+-#define HAVE_MADV_FREE 1
+ #define HAVE_MADV_FREE_REUSE 1
+-#define HAVE_MERGESORT 1
+ #define HAVE_PTHREAD_SETNAME_NP 1
++#endif
++
++#define HAVE_MADV_FREE 1
++#define HAVE_MERGESORT 1
+ #define HAVE_READLINE 1
+ #define HAVE_SYS_TIMEB_H 1
+ #define WTF_USE_ACCELERATE 1
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesquartzduplicatesymbols2patch"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-duplicate-symbols2.patch (131880 => 131881)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-duplicate-symbols2.patch 2015-01-20 08:53:40 UTC (rev 131880)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-duplicate-symbols2.patch 2015-01-20 08:59:12 UTC (rev 131881)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- Source/WebCore/plugins/PluginPackageNone.cpp.orig 2012-10-29 20:40:46.000000000 -0400
-+++ Source/WebCore/plugins/PluginPackageNone.cpp 2012-10-29 20:40:46.000000000 -0400
-@@ -28,10 +28,6 @@
-
- namespace WebCore {
-
--void PluginPackage::determineQuirks(const String&)
--{
--}
--
- bool PluginPackage::fetchInfo()
- {
- return false;
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesquartzincludewidgetbackingstorecairopatch"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch (131880 => 131881)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch 2015-01-20 08:53:40 UTC (rev 131880)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch 2015-01-20 08:59:12 UTC (rev 131881)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>---- Source/WebCore/GNUmakefile.list.am.orig 2014-01-11 12:15:07.000000000 -0800
-+++ Source/WebCore/GNUmakefile.list.am 2014-01-11 12:16:03.000000000 -0800
-@@ -6328,6 +6328,9 @@ else
- webcore_sources += \
- Source/WebCore/plugins/PluginPackageNone.cpp \
- Source/WebCore/plugins/PluginViewNone.cpp
-+# in quartz mode include cairo widgetbackingstore implementation also
-+webcoregtk_sources += \
-+ Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
- endif # END TARGET_WIN32
- endif # END TARGET_X11_OR_WAYLAND
-
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesruby18patchfromrev131290trunkdportswwwwebkitgtkfilesruby18patch"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/ruby-1.8.patch (from rev 131290, trunk/dports/www/webkit-gtk/files/ruby-1.8.patch) (0 => 131881)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/ruby-1.8.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/ruby-1.8.patch 2015-01-20 08:59:12 UTC (rev 131881)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- Source/JavaScriptCore/offlineasm/offsets.rb.orig 2012-11-23 14:12:16.000000000 -0600
++++ Source/JavaScriptCore/offlineasm/offsets.rb 2013-01-22 19:35:47.000000000 -0600
+@@ -109,7 +109,11 @@
+ File.open(file, "r") {
+ | inp |
+ loop {
+- byte = inp.getbyte
++ if RUBY_VERSION >= '1.8.7'
++ byte = inp.getbyte
++ else
++ byte = inp.getc
++ end
+ break unless byte
+ fileBytes << byte
+ }
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkdevel"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/www/webkit-gtk-devel</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/www/webkit-gtk-devel:127269-127943
</span><span class="cx"> + /branches/mld-qt-481/dports/www/webkit-gtk-devel:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/www/webkit-gtk-devel:127269-131880
</span></div>
</body>
</html>