<!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>[113973] 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/113973">113973</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2013-11-26 13:46:26 -0800 (Tue, 26 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>users/devans/GNOME-3/stable: webkit-gtk, apply jeremyhu's patch from #41560 to upgrade to version 2.2.2, reset revisions.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkPortfile">users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkfilesexecinfopatch">users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/execinfo.patch</a></li>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkfilesquartzwebcorepatch">users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-webcore.patch</a></li>
</ul>
<h3>Added 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="#usersdevansGNOME3stabledportswwwwebkitgtkfilesnoWebCoreLayerapatch">users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/no-WebCoreLayer.a.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 (113972 => 113973)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile 2013-11-26 21:30:44 UTC (rev 113972)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/Portfile 2013-11-26 21:46:26 UTC (rev 113973)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">
</span><span class="cx"> name webkit-gtk
</span><span class="cx"> epoch 2
</span><del>-version 2.0.4
</del><ins>+version 2.2.2
</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">@@ -21,9 +21,9 @@
</span><span class="cx"> use_xz yes
</span><span class="cx"> distname webkitgtk-${version}
</span><span class="cx">
</span><del>-checksums sha1 3b9ddbdc61e38b5c8fdd108e891b7db5fb12d55a \
- rmd160 19643cac3f53928757a7c3fe8ea33f144a581456 \
- sha256 bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f
</del><ins>+checksums sha1 6376d7d55802c3389c74a2ca8a33d53efc340c37 \
+ rmd160 2f4ec373d71f7912e2315bf09c708df90da5e61c \
+ sha256 4a45768695ccded14fdc47f99dbcdb750076f55dad61560cadac7b55db0b304d
</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">@@ -54,6 +54,7 @@
</span><span class="cx"> # ppc.patch: https://bugs.webkit.org/show_bug.cgi?id=96005
</span><span class="cx"> # tiger.patch: No upstream bug, http://trac.macports.org/ticket/35923
</span><span class="cx"> # quartz-webcore.patch: No upstream bug, http://trac.macports.org/ticket/39898
</span><ins>+# clang-check.patch: No upstream bug, emailed mailing list
</ins><span class="cx">
</span><span class="cx"> patchfiles \
</span><span class="cx"> clang-assertions.patch \
</span><span class="lines">@@ -64,7 +65,9 @@
</span><span class="cx"> ListableHandler.patch \
</span><span class="cx"> ppc.patch \
</span><span class="cx"> tiger.patch \
</span><del>- quartz-webcore.patch
</del><ins>+ quartz-webcore.patch \
+ clang-check.patch \
+ no-WebCoreLayer.a.patch
</ins><span class="cx">
</span><span class="cx"> conflicts_build google-test
</span><span class="cx">
</span><span class="lines">@@ -80,7 +83,6 @@
</span><span class="cx"> --enable-webgl
</span><span class="cx">
</span><span class="cx"> subport webkit-gtk3 {
</span><del>- revision 2
</del><span class="cx"> depends_lib-append port:gtk3
</span><span class="cx"> configure.args-append --with-gtk=3.0
</span><span class="cx">
</span><span class="lines">@@ -111,8 +113,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${name} == ${subport}} {
</span><del>- revision 1
-
</del><span class="cx"> depends_lib-append port:gtk2
</span><span class="cx"> configure.args-append --with-gtk=2.0
</span><span class="cx"> }
</span><span class="lines">@@ -155,9 +155,13 @@
</span><span class="cx"> # google-test suite build fix
</span><span class="cx"> configure.cppflags-append -DGTEST_USE_OWN_TR1_TUPLE=1
</span><span class="cx">
</span><ins>+# https://trac.macports.org/ticket/41560#comment:2
+configure.cflags-append -ftemplate-depth=256
+configure.cxxflags-append -ftemplate-depth=256
+
</ins><span class="cx"> autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
</span><span class="cx"> use_autoreconf yes
</span><del>-autoreconf.args -fi
</del><ins>+autoreconf.args -fvi
</ins><span class="cx">
</span><span class="cx"> lappend merger_dont_diff ${prefix}/include/webkitgtk-1.0/webkitdom/WebKitDOMNavigator.h
</span><span class="cx">
</span><span class="lines">@@ -175,6 +179,18 @@
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=58737
</span><span class="cx"> reinplace "s:OS(MAC_OS_X):PLATFORM(MAC):" \
</span><span class="cx"> ${worksrcpath}/Source/WTF/wtf/ThreadingPthreads.cpp
</span><ins>+
+ # Emailed to webkit-gtk mailing list 11/26/13
+ reinplace "s:-stdlib=libstdc\+\+::" \
+ ${worksrcpath}/Source/autotools/SetupCompilerFlags.m4
+
+ # TODO: Email/file a bug
+ # In file included from Source/JavaScriptCore/runtime/JSGlobalObject.cpp:83:
+ # ./Source/JavaScriptCore/API/ObjCCallbackFunction.h:32:9: fatal error: 'JavaScriptCore/JSCallbackFunction.h' file not found
+ # #import <JavaScriptCore/JSCallbackFunction.h>
+ # ^
+ reinplace "/^#define JSC_OBJC_API_ENABLED/s/^.*$/#define JSC_OBJC_API_ENABLED 0/" \
+ ${worksrcpath}/Source/JavaScriptCore/API/JSBase.h
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # TODO: fix this for muniversal
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesclangcheckpatch"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-check.patch (0 => 113973)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-check.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-check.patch 2013-11-26 21:46:26 UTC (rev 113973)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- Source/autotools/CheckSystemAndBasicDependencies.m4.orig 2013-11-10 17:44:57.000000000 -0800
++++ Source/autotools/CheckSystemAndBasicDependencies.m4 2013-11-10 17:45:57.000000000 -0800
+@@ -87,7 +87,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__ >= 2)
++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2)))))
+ #error Not a supported Clang compiler
+ #endif
+ ])], [c_compiler="clang"], [])
+@@ -106,7 +106,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__ >= 2)
++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2)))))
+ #error Not a supported Clang++ compiler
+ #endif
+ ])], [cxx_compiler="clang++"], [])
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesexecinfopatch"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/execinfo.patch (113972 => 113973)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/execinfo.patch 2013-11-26 21:30:44 UTC (rev 113972)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/execinfo.patch 2013-11-26 21:46:26 UTC (rev 113973)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> void WTFGetBacktrace(void** stack, int* size)
</span><span class="cx"> {
</span><del>--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if ((OS(DARWIN) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
</del><ins>+-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
++#if (OS(DARWIN) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) || (OS(LINUX) && !defined(__UCLIBC__))
</ins><span class="cx"> *size = backtrace(stack, *size);
</span><span class="cx"> #elif OS(WINDOWS) && !OS(WINCE)
</span><span class="cx"> // The CaptureStackBackTrace function is available in XP, but it is not defined
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesnoWebCoreLayerapatch"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/no-WebCoreLayer.a.patch (0 => 113973)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/no-WebCoreLayer.a.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/no-WebCoreLayer.a.patch 2013-11-26 21:46:26 UTC (rev 113973)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+--- Tools/TestWebKitAPI/GNUmakefile.am.orig 2013-11-11 00:32:41.000000000 -0800
++++ Tools/TestWebKitAPI/GNUmakefile.am 2013-11-26 10:40:03.000000000 -0800
+@@ -117,16 +117,6 @@ webcore_layer_deps += \
+ libANGLE.la
+ endif
+
+-webcore_layer_archives = $(foreach lib, $(webcore_layer_deps), $(shell echo $(lib) | sed "s/\(.*\)\.la/.libs\/\1.a/"))
+-
+-WebCoreLayer.a: $(webcore_layer_deps)
+- $(AM_V_GEN)
+- $(AM_V_at)$(shell rm -f $@)
+- $(AM_V_at)$(foreach archive, $(webcore_layer_archives), $(shell ar t $(archive) | xargs -n50 ar cruT $@))
+-
+-DISTCLEANFILES += \
+- $(top_builddir)/WebCoreLayer.a
+-
+ Programs_TestWebKitAPI_TestWebCore_CPPFLAGS = \
+ $(Libraries_libTestWebKitAPIMain_la_CPPFLAGS) \
+ -I$(top_builddir)/DerivedSources/WebCore/include
+@@ -140,7 +130,7 @@ Programs_TestWebKitAPI_TestWebCore_LDADD
+ Libraries/libgtest.la \
+ libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ libWTF.la \
+- WebCoreLayer.a \
++ $(webcore_layer_deps) \
+ $(CAIRO_LIBS) \
+ $(FREETYPE_LIBS) \
+ $(GAMEPAD_LIBS) \
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesquartzwebcorepatch"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-webcore.patch (113972 => 113973)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-webcore.patch 2013-11-26 21:30:44 UTC (rev 113972)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-webcore.patch 2013-11-26 21:46:26 UTC (rev 113973)
</span><span class="lines">@@ -1,14 +1,3 @@
</span><del>---- Source/WebCore/bridge/npruntime_internal-orig.h 2013-07-19 00:04:01.000000000 -0700
-+++ Source/WebCore/bridge/npruntime_internal.h 2013-08-12 16:04:17.000000000 -0700
-@@ -29,7 +29,7 @@
- #include "npfunctions.h"
- #include "npruntime.h"
-
--#ifdef XP_UNIX
-+#if PLATFORM(X11)
- #include <X11/Xresource.h>
-
- #undef None
</del><span class="cx"> --- Source/WebCore/plugins/PluginView-orig.cpp 2013-07-19 00:04:11.000000000 -0700
</span><span class="cx"> +++ Source/WebCore/plugins/PluginView.cpp 2013-08-12 17:48:20.000000000 -0700
</span><span class="cx"> @@ -865,7 +865,7 @@
</span></span></pre>
</div>
</div>
</body>
</html>