<!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>[154405] users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files</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 { white-space: pre-line; 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/154405">154405</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-10-29 00:42:59 +0200 (Sat, 29 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: webkit2-gtk-devel, bump to current trunk (<a href="https://trac.macports.org/changeset/207192">r207192</a>), disable GRAPHICS_CONTEXT_3D for +quartz (#52495).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkit2gtkdevelPortfile">users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkit2gtkdevelfilesPR163340patch">users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163340.patch</a></li>
<li><a href="#usersdevansGNOME3stabledportswwwwebkit2gtkdevelfilesPR163346patch">users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163346.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkit2gtkdevelfilesPR162261patch">users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162261.patch</a></li>
<li><a href="#usersdevansGNOME3stabledportswwwwebkit2gtkdevelfilesPR162302patch">users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162302.patch</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkit2gtkdevel">users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel
</span><span class="cx">===================================================================
</span><del>--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel 2016-10-28 22:38:20 UTC (rev 154404)
</del><ins>+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel 2016-10-28 22:42:59 UTC (rev 154405)
</ins><a id="usersdevansGNOME3stabledportswwwwebkit2gtkdevel"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/mld-qt-481/dports/www/webkit2-gtk-devel:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><del>-/trunk/dports/www/webkit2-gtk-devel:151441-153511
</del><span class="cx">\ No newline at end of property
</span><ins>+/trunk/dports/www/webkit2-gtk-devel:151441-154404
</ins><span class="cx">\ No newline at end of property
</span><a id="usersdevansGNOME3stabledportswwwwebkit2gtkdevelPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/Portfile (154404 => 154405)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/Portfile 2016-10-28 22:38:20 UTC (rev 154404)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/Portfile 2016-10-28 22:42:59 UTC (rev 154405)
</span><span class="lines">@@ -10,7 +10,7 @@
</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><del>-#PortGroup github 1.0
</del><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="lines">@@ -22,23 +22,23 @@
</span><span class="cx"> license LGPL-2+ BSD
</span><span class="cx"> homepage http://webkitgtk.org/
</span><span class="cx">
</span><del>-# r202372
-#github.setup WebKit webkit 63f4f7120dfbc0235b90e6d2f2c68be36895d067
-#checksums rmd160 3fd91e14df1668b34bf1cb2bb4ab19526a68b7eb \
-# sha256 3ae58d6c15052cae2ad1c76fa0ecb7c63555671d4f7fc2a16bbbf5b83977124a
</del><ins>+# r207192
+github.setup WebKit webkit 91ef51ea3f538ade6f168a1d701dab90bfbee4db
+checksums rmd160 d8352cc158d68a22a2910d503fa70b447de4224d \
+ sha256 ae1311360a5b54fb01596057986e9a9be07f34ed176d8777e4f2b9d39c2b4f53
</ins><span class="cx">
</span><span class="cx"> # version needs to come after github.setup
</span><del>-version 2.14.0
</del><ins>+version 2.14.90
</ins><span class="cx"> revision 0
</span><span class="cx"> epoch 1
</span><span class="cx">
</span><del>-master_sites http://webkitgtk.org/releases/
-use_xz yes
-distname webkitgtk-${version}
</del><ins>+#master_sites http://webkitgtk.org/releases/
+#use_xz yes
+#distname webkitgtk-${version}
</ins><span class="cx"> dist_subdir webkit-gtk
</span><span class="cx">
</span><del>-checksums rmd160 25116c98970867950e5b2e8e3506527aa2a9021c \
- sha256 0513ad836c624a3d24bdf1a99f4b4aead984ab6684150bc70f16db651590ea0a
</del><ins>+#checksums rmd160 e8274de845d1314c497f84ccd88ed602995c1e56 \
+# sha256 2e2d76c328de65bed6e0e4f096b2720a366654b27fc1af0830ece90bc4b7ceb5
</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">@@ -81,15 +81,14 @@
</span><span class="cx"> # PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
</span><span class="cx"> # PR-157554.patch: https://bugs.webkit.org/show_bug.cgi?id=157554
</span><span class="cx"> # PR-157574.patch: https://bugs.webkit.org/show_bug.cgi?id=157574
</span><del>-# PR-162261.patch: https://bugs.webkit.org/show_bug.cgi?id=162261
-# PR-162302.patch: https://bugs.webkit.org/show_bug.cgi?id=162302
</del><ins>+# PR-163340.patch: https://bugs.webkit.org/show_bug.cgi?id=163340
+# PR-163346.patch: https://bugs.webkit.org/show_bug.cgi?id=163346
</ins><span class="cx"> patchfiles-append \
</span><del>- PR-152650-2.patch \
</del><span class="cx"> PR-153138.patch \
</span><span class="cx"> PR-157554.patch \
</span><span class="cx"> PR-157574.patch \
</span><del>- PR-162261.patch \
- PR-162302.patch
</del><ins>+ PR-163340.patch \
+ PR-163346.patch
</ins><span class="cx">
</span><span class="cx"> # Build out-of-tree
</span><span class="cx"> configure.post_args ../${worksrcdir}
</span><span class="lines">@@ -168,7 +167,8 @@
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -DENABLE_QUARTZ_TARGET=ON \
</span><span class="cx"> -DENABLE_X11_TARGET=OFF \
</span><del>- -DENABLE_OPENGL=OFF
</del><ins>+ -DENABLE_OPENGL=OFF \
+ -DENABLE_GRAPHICS_CONTEXT_3D=OFF
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant x11 conflicts quartz {
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> default_variants-append +x11 +gtk2
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#livecheck.type none
-livecheck.type regex
-livecheck.url http://webkitgtk.org/releases/
-livecheck.regex "webkitgtk-(\\d+\\.\\d*\[134579\](?:\\.\\d+)*)"
</del><ins>+livecheck.type none
+#livecheck.type regex
+#livecheck.url http://webkitgtk.org/releases/
+#livecheck.regex "webkitgtk-(\\d+\\.\\d*\[134579\](?:\\.\\d+)*)"
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkit2gtkdevelfilesPR162261patch"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162261.patch (154404 => 154405)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162261.patch 2016-10-28 22:38:20 UTC (rev 154404)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162261.patch 2016-10-28 22:42:59 UTC (rev 154405)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>-diff --git a/Source/WebCore/platform/PlatformPasteboard.h b/Source/WebCore/platform/PlatformPasteboard.h
-index 695bc0e..1bfdfa4 100644
---- Source/WebCore/platform/PlatformPasteboard.h
-+++ Source/WebCore/platform/PlatformPasteboard.h
-@@ -26,6 +26,7 @@
- #ifndef PlatformPasteboard_h
- #define PlatformPasteboard_h
-
-+#include <functional>
- #include <wtf/Forward.h>
- #include <wtf/RefCounted.h>
- #include <wtf/RetainPtr.h>
-diff --git a/Source/WebCore/platform/gtk/PasteboardHelper.h b/Source/WebCore/platform/gtk/PasteboardHelper.h
-index b15fbef..3f3c8da 100644
---- Source/WebCore/platform/gtk/PasteboardHelper.h
-+++ Source/WebCore/platform/gtk/PasteboardHelper.h
-@@ -26,6 +26,7 @@
- #define PasteboardHelper_h
-
- #include "GRefPtrGtk.h"
-+#include <functional>
- #include <wtf/Noncopyable.h>
- #include <wtf/Vector.h>
- #include <wtf/glib/GRefPtr.h>
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkit2gtkdevelfilesPR162302patch"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162302.patch (154404 => 154405)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162302.patch 2016-10-28 22:38:20 UTC (rev 154404)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162302.patch 2016-10-28 22:42:59 UTC (rev 154405)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-diff --git a/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp b/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
-index 4fed6e9..c58d835 100644
---- Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
-+++ Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
-@@ -33,6 +33,7 @@
- #include "RenderThemeGadget.h"
- #include "ScrollView.h"
- #include "Scrollbar.h"
-+#include <cstdlib>
- #include <gtk/gtk.h>
-
- namespace WebCore {
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkit2gtkdevelfilesPR163340patchfromrev154404trunkdportswwwwebkit2gtkdevelfilesPR163340patch"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163340.patch (from rev 154404, trunk/dports/www/webkit2-gtk-devel/files/PR-163340.patch) (0 => 154405)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163340.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163340.patch 2016-10-28 22:42:59 UTC (rev 154405)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+From 6cb629514378ea9439617081febb4aa1ec9fa35f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Wed, 12 Oct 2016 10:06:47 -0700
+Subject: [PATCH] Fix a build failure with clang due to std::function usage
+ without #include <functional>
+
+https://bugs.webkit.org/show_bug.cgi?id=163340
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ Source/WebCore/ChangeLog | 9 +++++++++
+ Source/WebCore/platform/network/soup/SoupNetworkSession.h | 1 +
+ 2 files changed, 10 insertions(+)
+
+diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h
+index 9f1c183..0132cb4 100644
+--- Source/WebCore/platform/network/soup/SoupNetworkSession.h
++++ Source/WebCore/platform/network/soup/SoupNetworkSession.h
+@@ -26,6 +26,7 @@
+ #ifndef SoupNetworkSession_h
+ #define SoupNetworkSession_h
+
++#include <functional>
+ #include <wtf/Noncopyable.h>
+ #include <wtf/Vector.h>
+ #include <wtf/glib/GRefPtr.h>
+--
+2.10.1
+
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkit2gtkdevelfilesPR163346patchfromrev154404trunkdportswwwwebkit2gtkdevelfilesPR163346patch"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163346.patch (from rev 154404, trunk/dports/www/webkit2-gtk-devel/files/PR-163346.patch) (0 => 154405)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163346.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163346.patch 2016-10-28 22:42:59 UTC (rev 154405)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+Index: Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp
+===================================================================
+--- Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp (revision 207243)
++++ Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp (working copy)
+@@ -27,7 +27,7 @@
+ #include "WKTextChecker.h"
+ #include "TextChecker.h"
+
+-#if !defined(__APPLE__)
++#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__) || !defined(__APPLE__)
+ #include "WKAPICast.h"
+ #include "WebPageProxy.h"
+ #include "WebTextChecker.h"
+@@ -40,7 +40,7 @@ void WKTextCheckerSetTestingMode(bool en
+ TextChecker::setTestingMode(enabled);
+ }
+
+-#if !defined(__APPLE__)
++#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__) || !defined(__APPLE__)
+
+ void WKTextCheckerSetClient(const WKTextCheckerClientBase* wkClient)
+ {
+Index: Source/WebKit2/UIProcess/API/C/WKTextChecker.h
+===================================================================
+--- Source/WebKit2/UIProcess/API/C/WKTextChecker.h (revision 207243)
++++ Source/WebKit2/UIProcess/API/C/WKTextChecker.h (working copy)
+@@ -34,7 +34,7 @@ extern "C" {
+
+ WK_EXPORT void WKTextCheckerSetTestingMode(bool enabled);
+
+-#if !defined(__APPLE__)
++#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__) || !defined(__APPLE__)
+
+ // TextChecker Client
+ typedef bool (*WKTextCheckerContinousSpellCheckingAllowed)(const void *clientInfo);
</ins></span></pre>
</div>
</div>
</body>
</html>