<!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>[144915] trunk/dports/www/webkit2-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/144915">144915</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-01-20 15:46:02 -0800 (Wed, 20 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkit2-gtk: Update to 2.11.4</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkit2gtkPortfile">trunk/dports/www/webkit2-gtk/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkit2gtkfilesPR152720patch">trunk/dports/www/webkit2-gtk/files/PR-152720.patch</a></li>
<li><a href="#trunkdportswwwwebkit2gtkfilesPR153117patch">trunk/dports/www/webkit2-gtk/files/PR-153117.patch</a></li>
<li><a href="#trunkdportswwwwebkit2gtkfilesPR153120patch">trunk/dports/www/webkit2-gtk/files/PR-153120.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwwebkit2gtkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit2-gtk/Portfile (144914 => 144915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/Portfile 2016-01-20 23:36:57 UTC (rev 144914)
+++ trunk/dports/www/webkit2-gtk/Portfile 2016-01-20 23:46:02 UTC (rev 144915)
</span><span class="lines">@@ -11,8 +11,7 @@
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="cx">
</span><span class="cx"> name webkit2-gtk
</span><del>-version 2.11.3
-revision 5
</del><ins>+version 2.11.4
</ins><span class="cx"> description Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
</span><span class="cx"> long_description ${description}
</span><span class="cx"> maintainers jeremyhu devans
</span><span class="lines">@@ -27,8 +26,8 @@
</span><span class="cx">
</span><span class="cx"> dist_subdir webkit-gtk
</span><span class="cx">
</span><del>-checksums rmd160 9b478b93f0853bd049949249a4078774ad31a09b \
- sha256 728b54364f067029b8c6106476c2cd874c68999a1d09eb1cdabe60fa5e38562a
</del><ins>+checksums rmd160 16b3b304cf7fad5c06583a57456d105ed3b81adb \
+ sha256 47631d5d66967ebda2683c065706d5d91d4d886fc11f382eecd39451c71dfe3c
</ins><span class="cx">
</span><span class="cx"> # don't overwrite build dependencies provided by cmake portgroup
</span><span class="cx"> depends_build-append \
</span><span class="lines">@@ -83,14 +82,8 @@
</span><span class="cx"> default_variants-append +llvm37
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# PR-152720.patch: https://bugs.webkit.org/show_bug.cgi?id=152720
-# PR-153117.patch: https://bugs.webkit.org/show_bug.cgi?id=153117
-# PR-153120.patch: https://bugs.webkit.org/show_bug.cgi?id=153120
</del><span class="cx"> # PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
</span><span class="cx"> patchfiles-append \
</span><del>- PR-152720.patch \
- PR-153117.patch \
- PR-153120.patch \
</del><span class="cx"> PR-153138.patch
</span><span class="cx">
</span><span class="cx"> # Build out-of-tree
</span><span class="lines">@@ -209,9 +202,9 @@
</span><span class="cx"> xinstall -m 755 ${build.dir}/bin/LLIntOffsetsExtractor ${destroot}${prefix}/libexec/webkit2gtk-4.0
</span><span class="cx"> xinstall -m 755 ${build.dir}/bin/WebKitWebProcess ${destroot}${prefix}/libexec/webkit2gtk-4.0
</span><span class="cx"> xinstall -m 755 ${build.dir}/bin/WebKitNetworkProcess ${destroot}${prefix}/libexec/webkit2gtk-4.0
</span><del>- xinstall -m 755 ${build.dir}/lib/libwebkit2gtk-4.0.37.13.0.dylib ${destroot}${prefix}/lib
- ln -s libwebkit2gtk-4.0.37.13.0.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.37.dylib
- ln -s libwebkit2gtk-4.0.37.13.0.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.dylib
</del><ins>+ xinstall -m 755 ${build.dir}/lib/libwebkit2gtk-4.0.37.13.1.dylib ${destroot}${prefix}/lib
+ ln -s libwebkit2gtk-4.0.37.13.1.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.37.dylib
+ ln -s libwebkit2gtk-4.0.37.13.1.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.dylib
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span></span></pre></div>
<a id="trunkdportswwwwebkit2gtkfilesPR152720patch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/webkit2-gtk/files/PR-152720.patch (144914 => 144915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/files/PR-152720.patch 2016-01-20 23:36:57 UTC (rev 144914)
+++ trunk/dports/www/webkit2-gtk/files/PR-152720.patch 2016-01-20 23:46:02 UTC (rev 144915)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-From 8cc961974887e4b6e51feb21e0fda0bfcba44096 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Thu, 14 Jan 2016 23:28:03 -0800
-Subject: [PATCH] Ensure CF_AVAILABLE is undefined
-
-https://bugs.webkit.org/show_bug.cgi?id=152720
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- Source/JavaScriptCore/API/WebKitAvailability.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h
-index 28b3af4..a9bb276 100644
---- Source/JavaScriptCore/API/WebKitAvailability.h
-+++ Source/JavaScriptCore/API/WebKitAvailability.h
-@@ -26,7 +26,7 @@
- #ifndef __WebKitAvailability__
- #define __WebKitAvailability__
-
--#if defined(__APPLE__) && !defined(BUILDING_GTK__)
-+#if defined(__APPLE__)
-
- #include <AvailabilityMacros.h>
- #include <CoreFoundation/CoreFoundation.h>
-@@ -64,6 +64,11 @@
-
- #endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */
-
-+#if defined(BUILDING_GTK__)
-+#undef CF_AVAILABLE
-+#define CF_AVAILABLE(_mac, _ios)
-+#endif
-+
- #else
- #define CF_AVAILABLE(_mac, _ios)
- #endif
---
-2.7.0
-
</del></span></pre></div>
<a id="trunkdportswwwwebkit2gtkfilesPR153117patch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/webkit2-gtk/files/PR-153117.patch (144914 => 144915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/files/PR-153117.patch 2016-01-20 23:36:57 UTC (rev 144914)
+++ trunk/dports/www/webkit2-gtk/files/PR-153117.patch 2016-01-20 23:46:02 UTC (rev 144915)
</span><span class="lines">@@ -1,34 +0,0 @@
</span><del>-From d88f798c7719a3f72366a0f8aca3a556907fbb3e Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Thu, 14 Jan 2016 23:24:26 -0800
-Subject: [PATCH 1/2] Fix linking on darwin
-
-https://bugs.webkit.org/show_bug.cgi?id=153117
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- Source/cmake/OptionsGTK.cmake | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index ebb525a..d3e67ea 100644
---- Source/cmake/OptionsGTK.cmake
-+++ Source/cmake/OptionsGTK.cmake
-@@ -471,10 +471,11 @@ endmacro()
- # CMake does not automatically add --whole-archive when building shared objects from
- # a list of convenience libraries. This can lead to missing symbols in the final output.
- # We add --whole-archive to all libraries manually to prevent the linker from trimming
--# symbols that we actually need later. (--whole-archive isn't an option on XCode's
--# linker, though.)
-+# symbols that we actually need later. With ld64 on darwin, we use -all_load instead.
- macro(ADD_WHOLE_ARCHIVE_TO_LIBRARIES _list_name)
-- if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+ list(APPEND ${_list_name} -Wl,-all_load)
-+ else ()
- foreach (library IN LISTS ${_list_name})
- list(APPEND ${_list_name}_TMP -Wl,--whole-archive ${library} -Wl,--no-whole-archive)
- endforeach ()
---
-2.7.0
-
</del></span></pre></div>
<a id="trunkdportswwwwebkit2gtkfilesPR153120patch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/webkit2-gtk/files/PR-153120.patch (144914 => 144915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/files/PR-153120.patch 2016-01-20 23:36:57 UTC (rev 144914)
+++ trunk/dports/www/webkit2-gtk/files/PR-153120.patch 2016-01-20 23:46:02 UTC (rev 144915)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- Source/WebCore/CMakeLists.txt.orig 2016-01-15 15:10:27.000000000 -0800
-+++ Source/WebCore/CMakeLists.txt 2016-01-15 15:11:11.000000000 -0800
-@@ -3278,6 +3278,8 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/timing/RestrictVertexShaderTiming.cpp
-
-+ ${THIRDPARTY_DIR}/ANGLE/src/libANGLE/Platform.cpp
-+
- ${THIRDPARTY_DIR}/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp
- )
-
</del></span></pre>
</div>
</div>
</body>
</html>