<!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>[148240] trunk/dports/www/webkit2-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/148240">148240</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-04-30 17:17:28 -0700 (Sat, 30 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkit2-gtk-devel: Bump to <a href="https://trac.macports.org/changeset/200069">r200069</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkit2gtkdevelPortfile">trunk/dports/www/webkit2-gtk-devel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkit2gtkdevelfilesPR157182patch">trunk/dports/www/webkit2-gtk-devel/files/PR-157182.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkit2gtkdevelfilesPR156679patch">trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch</a></li>
<li><a href="#trunkdportswwwwebkit2gtkdevelfilesPR156683patch">trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwwebkit2gtkdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit2-gtk-devel/Portfile (148239 => 148240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk-devel/Portfile 2016-04-30 23:56:37 UTC (rev 148239)
+++ trunk/dports/www/webkit2-gtk-devel/Portfile 2016-05-01 00:17:28 UTC (rev 148240)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> name webkit2-gtk-devel
</span><span class="cx"> conflicts webkit2-gtk
</span><span class="cx"> version 2.13.0
</span><del>-revision 3
</del><ins>+revision 9
</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">@@ -24,11 +24,16 @@
</span><span class="cx"> license LGPL-2+ BSD
</span><span class="cx"> homepage http://webkitgtk.org/
</span><span class="cx">
</span><del>-# r199646
-github.setup WebKit webkit d0ff398ccfa56a630f7bdf457cd0689f1d3b0e6d
-checksums rmd160 8d411ccf4b6892f3deaa377d9ec9ba1c30bdb2eb \
- sha256 5f4fbbf4c3e94fc6c81aa0f2c95857334ccbd94ccf5224126c6983b5bf9a29b4
</del><ins>+# r200216 -- has issue with m_font (https://bugs.webkit.org/show_bug.cgi?id=157167)
+#github.setup WebKit webkit 999e572d853fe32b9fb11955bc1a8f7ed97632c7
+#checksums rmd160 761d51bd5f7878efe08b3f7e586fcbd0444fd9fa \
+# sha256 f5772d6fb4609d0cf335704fe40eacb15b5e3fe7e267f00a8ffa24c444ea3aa2
</ins><span class="cx">
</span><ins>+# r200069
+github.setup WebKit webkit 20484cc465bfbd872275a774549560cb16fb4997
+checksums rmd160 67364a2406d722a7fcebda0110cc6c0821316163 \
+ sha256 d670bed23113423ccb01cf8bedc5580068ccd4dc65b704e1821257f817adef38
+
</ins><span class="cx"> # don't overwrite build dependencies provided by cmake portgroup
</span><span class="cx"> depends_build-append \
</span><span class="cx"> port:gperf \
</span><span class="lines">@@ -68,13 +73,11 @@
</span><span class="cx">
</span><span class="cx"> # PR-152650-2.patch: WIP to re-enable gtk-doc support
</span><span class="cx"> # PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
</span><del>-# PR-156679.patch: https://bugs.webkit.org/show_bug.cgi?id=156679
-# PR-156683.patch: https://bugs.webkit.org/show_bug.cgi?id=156683
</del><ins>+# PR-157182.patch: https://bugs.webkit.org/show_bug.cgi?id=157182
</ins><span class="cx"> patchfiles-append \
</span><span class="cx"> PR-152650-2.patch \
</span><span class="cx"> PR-153138.patch \
</span><del>- PR-156679.patch \
- PR-156683.patch
</del><ins>+ PR-157182.patch
</ins><span class="cx">
</span><span class="cx"> # Build out-of-tree
</span><span class="cx"> configure.post_args ../${worksrcdir}
</span></span></pre></div>
<a id="trunkdportswwwwebkit2gtkdevelfilesPR156679patch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch (148239 => 148240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch 2016-04-30 23:56:37 UTC (rev 148239)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch 2016-05-01 00:17:28 UTC (rev 148240)
</span><span class="lines">@@ -1,75 +0,0 @@
</span><del>-From fa22d6be82c69535d6bca1a90a62b7e4cf9d7d13 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun, 17 Apr 2016 14:00:01 -0700
-Subject: [PATCH] Fix incorrect assumption that APPLE implies Mac.
- https://bugs.webkit.org/show_bug.cgi?id=156679
-
-Addresses build failure introduced in r198947
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- Source/WebKit2/CMakeLists.txt | 6 +++---
- Source/WebKit2/ChangeLog | 11 +++++++++++
- Tools/CMakeLists.txt | 10 ++++------
- Tools/ChangeLog | 11 +++++++++++
- 4 files changed, 29 insertions(+), 9 deletions(-)
-
-diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
-index 1b172bd..97fe019 100644
---- Source/WebKit2/CMakeLists.txt
-+++ Source/WebKit2/CMakeLists.txt
-@@ -868,7 +868,7 @@ if (WebKit2_NetworkProcess_OUTPUT_NAME)
- set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
- endif ()
-
--if (ENABLE_PLUGIN_PROCESS AND NOT APPLE)
-+if (ENABLE_PLUGIN_PROCESS AND NOT "${PORT}" STREQUAL "Mac")
- add_definitions(-DENABLE_PLUGIN_PROCESS=1)
- add_executable(PluginProcess ${PluginProcess_SOURCES})
- add_webkit2_prefix_header(PluginProcess)
-@@ -880,7 +880,7 @@ if (ENABLE_PLUGIN_PROCESS AND NOT APPLE)
- endif ()
- endif ()
-
--if (ENABLE_DATABASE_PROCESS AND NOT APPLE)
-+if (ENABLE_DATABASE_PROCESS AND NOT "${PORT}" STREQUAL "Mac")
- add_definitions(-DENABLE_DATABASE_PROCESS=1)
- add_executable(DatabaseProcess ${DatabaseProcess_SOURCES})
- add_webkit2_prefix_header(DatabaseProcess)
-@@ -892,7 +892,7 @@ if (ENABLE_DATABASE_PROCESS AND NOT APPLE)
- endif ()
- endif ()
-
--if (APPLE)
-+if ("${PORT}" STREQUAL "Mac")
- set(_web_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.WebContent.Development.xpc/Contents)
- make_directory(${_web_xpc_dir}/MacOS)
- make_directory(${_web_xpc_dir}/Resources)
-diff --git a/Tools/CMakeLists.txt b/Tools/CMakeLists.txt
-index fae8b61..a9e79df 100644
---- Tools/CMakeLists.txt
-+++ Tools/CMakeLists.txt
-@@ -27,6 +27,10 @@ elseif ("${PORT}" STREQUAL "GTK")
- if (ENABLE_MINIBROWSER)
- add_subdirectory(MiniBrowser/gtk)
- endif ()
-+elseif ("${PORT}" STREQUAL "Mac")
-+ add_subdirectory(DumpRenderTree)
-+ add_subdirectory(WebKitTestRunner)
-+ add_subdirectory(MiniBrowser/mac)
- endif ()
-
- if (WIN32)
-@@ -35,12 +39,6 @@ if (WIN32)
- add_subdirectory(MiniBrowser/win)
- endif ()
-
--if (APPLE)
-- add_subdirectory(DumpRenderTree)
-- add_subdirectory(WebKitTestRunner)
-- add_subdirectory(MiniBrowser/mac)
--endif ()
--
- if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)
- add_subdirectory(TestWebKitAPI)
- endif ()
</del></span></pre></div>
<a id="trunkdportswwwwebkit2gtkdevelfilesPR156683patch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch (148239 => 148240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch 2016-04-30 23:56:37 UTC (rev 148239)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch 2016-05-01 00:17:28 UTC (rev 148240)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
-index ee67f89..44739c7 100644
---- Source/JavaScriptCore/CMakeLists.txt
-+++ Source/JavaScriptCore/CMakeLists.txt
-@@ -1329,7 +1329,7 @@ add_subdirectory(shell)
- WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
- WEBKIT_FRAMEWORK(JavaScriptCore)
-
--if (NOT APPLE)
-+if (NOT "${PORT}" STREQUAL "Mac")
- if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
- POPULATE_LIBRARY_VERSION(JAVASCRIPTCORE)
- set_target_properties(JavaScriptCore PROPERTIES VERSION ${JAVASCRIPTCORE_VERSION} SOVERSION ${JAVASCRIPTCORE_VERSION_MAJOR})
</del></span></pre></div>
<a id="trunkdportswwwwebkit2gtkdevelfilesPR157182patch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/webkit2-gtk-devel/files/PR-157182.patch (0 => 148240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk-devel/files/PR-157182.patch (rev 0)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-157182.patch 2016-05-01 00:17:28 UTC (rev 148240)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+commit 9d9a9921add35954bc436b0d8f9adfd732698e77
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Fri Apr 29 09:47:21 2016 -0700
+
+ [GTK] Fix build failure introduced by r199738
+
+ https://bugs.webkit.org/show_bug.cgi?id=157182
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
+index 8248f6a..78a0b1f 100644
+--- Source/WebCore/CMakeLists.txt
++++ Source/WebCore/CMakeLists.txt
+@@ -3274,6 +3274,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/PruneEmptyDeclarations.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RecordConstantPrecision.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RegenerateStructNames.cpp
++ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveDynamicIndexing.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemovePow.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveSwitchFallThrough.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RewriteDoWhile.cpp
+@@ -3281,6 +3282,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SearchSymbol.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateArrayInitialization.cpp
++ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateExpressionsReturningArrays.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateDeclarations.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ShaderLang.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ShaderVars.cpp
+@@ -3291,6 +3293,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/TranslatorHLSL.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Types.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UnfoldShortCircuitAST.cpp
++ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UnfoldShortCircuitToIf.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UniformHLSL.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/util.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UtilsHLSL.cpp
</ins></span></pre>
</div>
</div>
</body>
</html>