<!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>[147847] 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/147847">147847</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-04-17 17:12:16 -0700 (Sun, 17 Apr 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>webkit2-gtk-devel: Update to current trunk</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="#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 (147846 => 147847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk-devel/Portfile        2016-04-17 22:54:40 UTC (rev 147846)
+++ trunk/dports/www/webkit2-gtk-devel/Portfile        2016-04-18 00:12:16 UTC (rev 147847)
</span><span class="lines">@@ -10,11 +10,12 @@
</span><span class="cx"> PortGroup           cmake 1.0
</span><span class="cx"> PortGroup           compiler_blacklist_versions 1.0
</span><span class="cx"> PortGroup           cxx11 1.0
</span><ins>+PortGroup           github 1.0
</ins><span class="cx"> 
</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            2
</del><ins>+revision            3
</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">@@ -23,17 +24,10 @@
</span><span class="cx"> license             LGPL-2+ BSD
</span><span class="cx"> homepage            http://webkitgtk.org/
</span><span class="cx"> 
</span><del>-fetch.type          svn
-svn.revision        198900
-#bad  svn.revision        198930 # libANGLESupport failing?
-#bad  svn.revision        198940 # libANGLESupport failing?
-#bad  svn.revision        198950 # DatabaseProcess.dir issue
-#bad  svn.revision        199000 # DatabaseProcess.dir issue
-#bad  svn.revision        199100 # DatabaseProcess.dir issue
-#bad  svn.revision        199202 # DatabaseProcess.dir issue
-#bad  svn.revision        199571 # https://bugs.webkit.org/show_bug.cgi?id=156616
-svn.url             https://svn.webkit.org/repository/webkit/trunk
-worksrcdir          trunk
</del><ins>+# r199646
+github.setup        WebKit webkit d0ff398ccfa56a630f7bdf457cd0689f1d3b0e6d
+checksums           rmd160  8d411ccf4b6892f3deaa377d9ec9ba1c30bdb2eb \
+                    sha256  5f4fbbf4c3e94fc6c81aa0f2c95857334ccbd94ccf5224126c6983b5bf9a29b4
</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">@@ -74,9 +68,13 @@
</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><ins>+# PR-156679.patch: https://bugs.webkit.org/show_bug.cgi?id=156679
+# PR-156683.patch: https://bugs.webkit.org/show_bug.cgi?id=156683
</ins><span class="cx"> patchfiles-append \
</span><span class="cx">     PR-152650-2.patch \
</span><del>-    PR-153138.patch
</del><ins>+    PR-153138.patch \
+    PR-156679.patch \
+    PR-156683.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="addfile"><h4>Added: trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch (0 => 147847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch                                (rev 0)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch        2016-04-18 00:12:16 UTC (rev 147847)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+From fa22d6be82c69535d6bca1a90a62b7e4cf9d7d13 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia &lt;jeremyhu@apple.com&gt;
+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 &lt;jeremyhu@apple.com&gt;
+---
+ 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 &quot;${PORT}&quot; STREQUAL &quot;Mac&quot;)
+     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 &quot;${PORT}&quot; STREQUAL &quot;Mac&quot;)
+     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 (&quot;${PORT}&quot; STREQUAL &quot;Mac&quot;)
+     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 (&quot;${PORT}&quot; STREQUAL &quot;GTK&quot;)
+     if (ENABLE_MINIBROWSER)
+         add_subdirectory(MiniBrowser/gtk)
+     endif ()
++elseif (&quot;${PORT}&quot; STREQUAL &quot;Mac&quot;)
++    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 ()
</ins></span></pre></div>
<a id="trunkdportswwwwebkit2gtkdevelfilesPR156683patch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch (0 => 147847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch                                (rev 0)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch        2016-04-18 00:12:16 UTC (rev 147847)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+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 &quot;${PORT}&quot; STREQUAL &quot;Mac&quot;)
+     if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL &quot;SHARED&quot;)
+         POPULATE_LIBRARY_VERSION(JAVASCRIPTCORE)
+         set_target_properties(JavaScriptCore PROPERTIES VERSION ${JAVASCRIPTCORE_VERSION} SOVERSION ${JAVASCRIPTCORE_VERSION_MAJOR})
</ins></span></pre>
</div>
</div>

</body>
</html>