<!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>[115984] trunk/dports/www/webkit-gtk-devel</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/115984">115984</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-01-15 16:08:24 -0800 (Wed, 15 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkit-gtk-devel: Bump to 2.3.4</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkitgtkdevelPortfile">trunk/dports/www/webkit-gtk-devel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkitgtkdevelfilesleopardpythonpatch">trunk/dports/www/webkit-gtk-devel/files/leopard-python.patch</a></li>
<li><a href="#trunkdportswwwwebkitgtkdevelfileslibeditpatch">trunk/dports/www/webkit-gtk-devel/files/libedit.patch</a></li>
<li><a href="#trunkdportswwwwebkitgtkdevelfilesquartzduplicatesymbols2patch">trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols2.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkitgtkdevelfileslibcpatch">trunk/dports/www/webkit-gtk-devel/files/libc++.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwwebkitgtkdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit-gtk-devel/Portfile (115983 => 115984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk-devel/Portfile 2014-01-15 23:46:47 UTC (rev 115983)
+++ trunk/dports/www/webkit-gtk-devel/Portfile 2014-01-16 00:08:24 UTC (rev 115984)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">
</span><span class="cx"> name webkit-gtk-devel
</span><span class="cx"> epoch 2
</span><del>-version 2.3.3
</del><ins>+version 2.3.4
</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">@@ -27,9 +27,9 @@
</span><span class="cx">
</span><span class="cx"> dist_subdir webkit-gtk
</span><span class="cx">
</span><del>-checksums sha1 30094e23a4cae478cf03f11c12cd29c0bb326cc6 \
- rmd160 165727f34786fcbc62a153e97ba40ec0567c93c6 \
- sha256 43b779d0c30a1d7af6fb62fcf4e0ed13871edd302317c6acaba7beb9c8157b1e
</del><ins>+checksums sha1 ef1aacb24bb9b41e4be10fd84cf4fe571b765313 \
+ rmd160 283dd533d07d613ad08a962eee63353bbb3c1d13 \
+ sha256 5e7d9daf4f87a25c4fee50d11d00e9b76879021e488a97827021b3ce7342a9a7
</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">@@ -57,8 +57,9 @@
</span><span class="cx"> # quartz-webcore.patch: https://bugs.webkit.org/show_bug.cgi?id=126326
</span><span class="cx"> # quartz-duplicate-symbols.patch: https://bugs.webkit.org/show_bug.cgi?id=126821
</span><span class="cx"> # clang-check.patch: https://bugs.webkit.org/show_bug.cgi?id=126324
</span><del>-# libc++.patch: https://bugs.webkit.org/show_bug.cgi?id=126431
</del><span class="cx"> # gstreamer.patch: https://bugs.webkit.org/show_bug.cgi?id=126437
</span><ins>+# libedit.patch: https://bugs.webkit.org/show_bug.cgi?id=127059
+# leopard-python.patch: https://bugs.webkit.org/show_bug.cgi?id=126323
</ins><span class="cx">
</span><span class="cx"> patchfiles \
</span><span class="cx"> clang-assertions.patch \
</span><span class="lines">@@ -67,8 +68,9 @@
</span><span class="cx"> quartz-duplicate-symbols.patch \
</span><span class="cx"> quartz-webcore.patch \
</span><span class="cx"> clang-check.patch \
</span><del>- libc++.patch \
- gstreamer.patch
</del><ins>+ gstreamer.patch \
+ libedit.patch \
+ leopard-python.patch
</ins><span class="cx">
</span><span class="cx"> conflicts_build google-test
</span><span class="cx">
</span><span class="lines">@@ -110,7 +112,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport webkit-gtk3-devel {
</span><del>- revision 1
</del><span class="cx"> conflicts webkit-gtk3 webkit-gtk3-2.0
</span><span class="cx"> depends_lib-append port:gtk3
</span><span class="cx"> configure.args-append --with-gtk=3.0
</span><span class="lines">@@ -241,7 +242,8 @@
</span><span class="cx"> # quartz-include-widgetbackingstorecairo.patch
</span><span class="cx"> # https://trac.macports.org/ticket/38203
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=111598
</span><del>- patchfiles-append quartz-include-widgetbackingstorecairo.patch
</del><ins>+ patchfiles-append quartz-include-widgetbackingstorecairo.patch \
+ quartz-duplicate-symbols2.patch
</ins><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="trunkdportswwwwebkitgtkdevelfilesleopardpythonpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/webkit-gtk-devel/files/leopard-python.patch (0 => 115984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk-devel/files/leopard-python.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/leopard-python.patch 2014-01-16 00:08:24 UTC (rev 115984)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+diff --git Tools/gtk/generate-feature-defines-files Tools/gtk/generate-feature-defines-files
+index f5b2c7e61eab12bf0eb25b0f9c595f2fd83ebbe9..17d52e65a450e3687d8f80a72917ddec34a08caa 100755
+--- Tools/gtk/generate-feature-defines-files
++++ Tools/gtk/generate-feature-defines-files
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env python
+-
++from __future__ import with_statement
+ import os
+ import re
+ import sys
</ins></span></pre></div>
<a id="trunkdportswwwwebkitgtkdevelfileslibcpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/webkit-gtk-devel/files/libc++.patch (115983 => 115984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk-devel/files/libc++.patch 2014-01-15 23:46:47 UTC (rev 115983)
+++ trunk/dports/www/webkit-gtk-devel/files/libc++.patch 2014-01-16 00:08:24 UTC (rev 115984)
</span><span class="lines">@@ -1,17 +0,0 @@
</span><del>---- Source/autotools/CheckSystemAndBasicDependencies.m4.orig 2014-01-03 08:55:20.000000000 -0800
-+++ Source/autotools/CheckSystemAndBasicDependencies.m4 2014-01-03 08:57:19.000000000 -0800
-@@ -123,14 +123,6 @@ elif test "$cxx_compiler" = "clang++"; t
- OLD_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="-std=c++11"
- AC_LANG_PUSH([C++])
-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#include <type_traits>
--#if defined(__GLIBCXX__) && __GLIBCXX__ >= 20130531
--bool libstdcxxTest = std::is_trivially_destructible<bool>::value;
--#else
--#error libstdc++ >= 4.8.1 is required
--#endif
--])], [], [AC_MSG_ERROR([libstdc++ >= 4.8.1 is required as the standard library used with the Clang compiler.])])
- AC_LANG_POP([C++])
- CXXFLAGS="$OLD_CXXFLAGS"
- fi
</del></span></pre></div>
<a id="trunkdportswwwwebkitgtkdevelfileslibeditpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/webkit-gtk-devel/files/libedit.patch (0 => 115984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk-devel/files/libedit.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/libedit.patch 2014-01-16 00:08:24 UTC (rev 115984)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- Source/JavaScriptCore/GNUmakefile.am.orig 2014-01-12 11:11:12.000000000 -0800
++++ Source/JavaScriptCore/GNUmakefile.am 2014-01-15 12:33:06.000000000 -0800
+@@ -26,6 +26,7 @@ libjavascriptcoregtk_@WEBKITGTK_API_MAJO
+ $(javascriptcore_sources)
+
+ libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
++ -ledit \
+ -lpthread \
+ libWTF.la \
+ $(GLIB_LIBS) \
</ins></span></pre></div>
<a id="trunkdportswwwwebkitgtkdevelfilesquartzduplicatesymbols2patch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols2.patch (0 => 115984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols2.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols2.patch 2014-01-16 00:08:24 UTC (rev 115984)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- 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;
</ins></span></pre>
</div>
</div>
</body>
</html>