<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/797bd0d235bce567056f4e9b5d6459edfa47de63">https://github.com/macports/macports-ports/commit/797bd0d235bce567056f4e9b5d6459edfa47de63</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 797bd0d235bce567056f4e9b5d6459edfa47de63
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sat Nov 5 21:22:37 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> webkit2-gtk-devel: Bump to 2.15.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
www/webkit2-gtk-devel/Portfile | 26 +++++++++------------
www/webkit2-gtk-devel/files/PR-153138.patch | 26 ---------------------
www/webkit2-gtk-devel/files/PR-163340.patch | 29 ------------------------
www/webkit2-gtk-devel/files/PR-163346.patch | 35 -----------------------------
4 files changed, 10 insertions(+), 106 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/Portfile b/www/webkit2-gtk-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b8356e5..99a5204 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,22 +23,22 @@ license LGPL-2+ BSD
</span> homepage http://webkitgtk.org/
# r207192
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup WebKit webkit 91ef51ea3f538ade6f168a1d701dab90bfbee4db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d8352cc158d68a22a2910d503fa70b447de4224d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ae1311360a5b54fb01596057986e9a9be07f34ed176d8777e4f2b9d39c2b4f53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#github.setup WebKit webkit 91ef51ea3f538ade6f168a1d701dab90bfbee4db
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#checksums rmd160 d8352cc158d68a22a2910d503fa70b447de4224d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# sha256 ae1311360a5b54fb01596057986e9a9be07f34ed176d8777e4f2b9d39c2b4f53
</span>
# version needs to come after github.setup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.14.90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.15.1
</span> revision 0
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#master_sites http://webkitgtk.org/releases/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#distname webkitgtk-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://webkitgtk.org/releases/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname webkitgtk-${version}
</span> dist_subdir webkit-gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#checksums rmd160 e8274de845d1314c497f84ccd88ed602995c1e56 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# sha256 2e2d76c328de65bed6e0e4f096b2720a366654b27fc1af0830ece90bc4b7ceb5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 64b5c995f10582cec4a53ea1ac9ed94f52b518cb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 43b57d79d636a76f6ee3fbcf2a7e63aba7b86931b2113fa8dd59ca674f95ed80
</span>
# don't overwrite build dependencies provided by cmake portgroup
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,17 +78,11 @@ depends_lib port:atk \
</span> port:zlib
# PR-152650-2.patch: WIP to re-enable gtk-doc support
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
</span> # PR-157554.patch: https://bugs.webkit.org/show_bug.cgi?id=157554
# PR-157574.patch: https://bugs.webkit.org/show_bug.cgi?id=157574
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# PR-163340.patch: https://bugs.webkit.org/show_bug.cgi?id=163340
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# PR-163346.patch: https://bugs.webkit.org/show_bug.cgi?id=163346
</span> patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PR-153138.patch \
</span> PR-157554.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PR-157574.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PR-163340.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PR-163346.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PR-157574.patch
</span>
# Build out-of-tree
configure.post_args ../${worksrcdir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/PR-153138.patch b/www/webkit2-gtk-devel/files/PR-153138.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 10851e8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/PR-153138.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 07886d9eacb7587dd52a9bcae10c1fc8ab56a910 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 15 Jan 2016 11:53:07 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] https://bugs.webkit.org/show_bug.cgi?id=153138
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Source/JavaScriptCore/bytecode/StructureStubInfo.cpp | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1e4b4f5..9b27aed 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "config.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "StructureStubInfo.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "JSCellInlines.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "JSObject.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "PolymorphicAccess.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Repatch.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/PR-163340.patch b/www/webkit2-gtk-devel/files/PR-163340.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5de6dea..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/PR-163340.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6cb629514378ea9439617081febb4aa1ec9fa35f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 12 Oct 2016 10:06:47 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix a build failure with clang due to std::function usage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- without #include <functional>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.webkit.org/show_bug.cgi?id=163340
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Source/WebCore/ChangeLog | 9 +++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Source/WebCore/platform/network/soup/SoupNetworkSession.h | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 10 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9f1c183..0132cb4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WebCore/platform/network/soup/SoupNetworkSession.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebCore/platform/network/soup/SoupNetworkSession.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef SoupNetworkSession_h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SoupNetworkSession_h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <functional>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <wtf/Noncopyable.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <wtf/Vector.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <wtf/glib/GRefPtr.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.10.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/PR-163346.patch b/www/webkit2-gtk-devel/files/PR-163346.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 602962d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/PR-163346.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp (revision 207243)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "WKTextChecker.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "TextChecker.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__) || !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "WKAPICast.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "WebPageProxy.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "WebTextChecker.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,7 +40,7 @@ void WKTextCheckerSetTestingMode(bool en
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TextChecker::setTestingMode(enabled);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__) || !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void WKTextCheckerSetClient(const WKTextCheckerClientBase* wkClient)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Source/WebKit2/UIProcess/API/C/WKTextChecker.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WebKit2/UIProcess/API/C/WKTextChecker.h (revision 207243)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebKit2/UIProcess/API/C/WKTextChecker.h (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,7 @@ extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WK_EXPORT void WKTextCheckerSetTestingMode(bool enabled);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__) || !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // TextChecker Client
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef bool (*WKTextCheckerContinousSpellCheckingAllowed)(const void *clientInfo);
</span></pre><pre style='margin:0'>
</pre>