<!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>[153247] 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/153247">153247</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-09-27 15:23:04 -0700 (Tue, 27 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkit2-gtk: update to version 2.14.0.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkit2gtkPortfile">trunk/dports/www/webkit2-gtk/Portfile</a></li>
<li><a href="#trunkdportswwwwebkit2gtkfilesPR157574patch">trunk/dports/www/webkit2-gtk/files/PR-157574.patch</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkit2gtkfilesPR162261patch">trunk/dports/www/webkit2-gtk/files/PR-162261.patch</a></li>
<li><a href="#trunkdportswwwwebkit2gtkfilesPR162302patch">trunk/dports/www/webkit2-gtk/files/PR-162302.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkit2gtkfilesPR1526501patch">trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportswwwwebkit2gtk">trunk/dports/www/webkit2-gtk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwwebkit2gtk"></a>
<div class="propset"><h4>Property changes: trunk/dports/www/webkit2-gtk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /users/devans/GNOME-3/stable/dports/www/webkit2-gtk:146462-153246
</span><a id="trunkdportswwwwebkit2gtkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit2-gtk/Portfile (153246 => 153247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/Portfile 2016-09-27 21:59:36 UTC (rev 153246)
+++ trunk/dports/www/webkit2-gtk/Portfile 2016-09-27 22:23:04 UTC (rev 153247)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx">
</span><span class="cx"> name webkit2-gtk
</span><span class="cx"> conflicts webkit2-gtk-devel
</span><del>-version 2.12.5
</del><ins>+version 2.14.0
</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">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> dist_subdir webkit-gtk
</span><span class="cx">
</span><del>-checksums rmd160 76bf4e0ae63fe2f5ce7b7440766250df03bbd213 \
- sha256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40
</del><ins>+checksums rmd160 25116c98970867950e5b2e8e3506527aa2a9021c \
+ sha256 0513ad836c624a3d24bdf1a99f4b4aead984ab6684150bc70f16db651590ea0a
</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">@@ -72,11 +72,15 @@
</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><ins>+# PR-162261.patch: https://bugs.webkit.org/show_bug.cgi?id=162261
+# PR-162302.patch: https://bugs.webkit.org/show_bug.cgi?id=162302
</ins><span class="cx"> patchfiles-append \
</span><span class="cx"> PR-152650-2.patch \
</span><span class="cx"> PR-153138.patch \
</span><span class="cx"> PR-157554.patch \
</span><del>- PR-157574.patch
</del><ins>+ PR-157574.patch \
+ PR-162261.patch \
+ PR-162302.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">@@ -97,6 +101,9 @@
</span><span class="cx"> # <rdar://problem/24031030>
</span><span class="cx"> configure.optflags -Os
</span><span class="cx">
</span><ins>+# clang 3.4, 503.0.35, and 600.0.57 (error: call to 'make_unique' is ambiguous, error: call to 'exchange' is ambiguous)
+compiler.blacklist-append {clang < 602} macports-clang-3.4
+
</ins><span class="cx"> pre-configure {
</span><span class="cx"> if {![variant_isset quartz] && ![variant_isset x11]} {
</span><span class="cx"> error "Either +x11 or +quartz is required"
</span></span></pre></div>
<a id="trunkdportswwwwebkit2gtkfilesPR1526501patch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch (153246 => 153247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch 2016-09-27 21:59:36 UTC (rev 153246)
+++ trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch 2016-09-27 22:23:04 UTC (rev 153247)
</span><span class="lines">@@ -1,96 +0,0 @@
</span><del>-From 729bc3fa9f47114960dd4ab1d2fd2054aa34345c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 8 Mar 2016 17:21:36 -0800
-Subject: [PATCH 1/2] [GTK][Mac] Enable support for gobject introspection on
- Mac
-
-https://bugs.webkit.org/show_bug.cgi?id=152650
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- ChangeLog | 9 +++++++++
- Source/WebKit2/ChangeLog | 9 +++++++++
- Source/WebKit2/PlatformGTK.cmake | 16 ++++++++++++----
- Source/cmake/OptionsGTK.cmake | 9 +++++++--
- 4 files changed, 37 insertions(+), 6 deletions(-)
-
-diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
-index 22878ee..0dc8fe9 100644
---- Source/WebKit2/PlatformGTK.cmake.orig 2016-02-29 23:34:20.000000000 -0800
-+++ Source/WebKit2/PlatformGTK.cmake 2016-03-11 14:48:17.000000000 -0800
-@@ -888,15 +888,23 @@
- add_webkit2_prefix_header(webkit2gtkinjectedbundle)
- target_link_libraries(webkit2gtkinjectedbundle WebKit2)
-
--# Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH
--string(COMPARE EQUAL "$ENV{LD_LIBRARY_PATH}" "" ld_library_path_not_exist)
-+# Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH or DYLD_LIBRARY_PATH
-+if (APPLE)
-+ set(LOADER_LIBRARY_PATH_VAR "DYLD_LIBRARY_PATH")
-+ set(PREV_LOADER_LIBRARY_PATH "$ENV{DYLD_LIBRARY_PATH}")
-+else ()
-+ set(LOADER_LIBRARY_PATH_VAR "LD_LIBRARY_PATH")
-+ set(PREV_LOADER_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}")
-+endif ()
-+
-+string(COMPARE EQUAL "${PREV_LOADER_LIBRARY_PATH}" "" ld_library_path_not_exist)
- if (ld_library_path_does_not_exist)
- set(INTROSPECTION_ADDITIONAL_LIBRARY_PATH
- "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
- )
- else ()
- set(INTROSPECTION_ADDITIONAL_LIBRARY_PATH
-- "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{LD_LIBRARY_PATH}"
-+ "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:${PREV_LOADER_LIBRARY_PATH}"
- )
- endif ()
-
-@@ -908,8 +916,8 @@
- DEPENDS WebKit2
- DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
-- LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
-- ${INTROSPECTION_SCANNER}
-+ ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
-+ ${PYTHON_EXECUTABLE} ${INTROSPECTION_SCANNER}
- --quiet
- --warn-all
- --symbol-prefix=webkit
-@@ -950,8 +958,8 @@
- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
- LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
-- LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
-- ${INTROSPECTION_SCANNER}
-+ ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
-+ ${PYTHON_EXECUTABLE} ${INTROSPECTION_SCANNER}
- --quiet
- --warn-all
- --symbol-prefix=webkit
-diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 54671fe..6b01f1a 100644
---- Source/cmake/OptionsGTK.cmake
-+++ Source/cmake/OptionsGTK.cmake
-@@ -418,12 +418,17 @@ if (USE_LIBHYPHEN)
- endif ()
- endif ()
-
--# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building or when building on Mac.
--if (CMAKE_CROSSCOMPILING OR APPLE)
-+# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building.
-+if (CMAKE_CROSSCOMPILING)
- set(ENABLE_GTKDOC OFF)
- set(ENABLE_INTROSPECTION OFF)
- endif ()
-
-+# Override the cached variable, gtk-doc does not really work when building on Mac.
-+if (APPLE)
-+ set(ENABLE_GTKDOC OFF)
-+endif ()
-+
- set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
- set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
- set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
---
-2.7.2
-
</del></span></pre></div>
<a id="trunkdportswwwwebkit2gtkfilesPR157574patch"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit2-gtk/files/PR-157574.patch (153246 => 153247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/files/PR-157574.patch 2016-09-27 21:59:36 UTC (rev 153246)
+++ trunk/dports/www/webkit2-gtk/files/PR-157574.patch 2016-09-27 22:23:04 UTC (rev 153247)
</span><span class="lines">@@ -1,11 +1,13 @@
</span><del>---- Source/JavaScriptCore/API/WebKitAvailability.h.orig 2016-04-27 23:21:38.000000000 -0700
-+++ Source/JavaScriptCore/API/WebKitAvailability.h 2016-05-12 22:22:28.000000000 -0700
-@@ -27,50 +27,11 @@
</del><ins>+diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h
+index ab53183..1310dec 100644
+--- Source/JavaScriptCore/API/WebKitAvailability.h
++++ Source/JavaScriptCore/API/WebKitAvailability.h
+@@ -27,57 +27,12 @@
</ins><span class="cx"> #define __WebKitAvailability__
</span><span class="cx">
</span><span class="cx"> #if defined(__APPLE__)
</span><span class="cx"> -
</span><del>- #include <AvailabilityMacros.h>
</del><ins>+-#include <AvailabilityMacros.h>
</ins><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> -
</span><span class="cx"> -#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
</span><span class="lines">@@ -23,6 +25,10 @@
</span><span class="cx"> -#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available.
</span><span class="cx"> -#endif
</span><span class="cx"> -
</span><ins>+-#ifndef __NSi_10_12 // Building from trunk rather than SDK.
+-#define __NSi_10_12 introduced=10.0 // Use 10.0 to indicate that everything is available.
+-#endif
+-
</ins><span class="cx"> -#ifndef __AVAILABILITY_INTERNAL__MAC_10_9
</span><span class="cx"> -#define __AVAILABILITY_INTERNAL__MAC_10_9
</span><span class="cx"> -#endif
</span><span class="lines">@@ -44,10 +50,13 @@
</span><span class="cx"> -#if defined(BUILDING_GTK__)
</span><span class="cx"> #undef CF_AVAILABLE
</span><span class="cx"> #define CF_AVAILABLE(_mac, _ios)
</span><ins>+ #undef CF_ENUM_AVAILABLE
+ #define CF_ENUM_AVAILABLE(_mac, _ios)
</ins><span class="cx"> -#endif
</span><span class="cx"> -
</span><span class="cx"> -#else
</span><span class="cx"> -#define CF_AVAILABLE(_mac, _ios)
</span><ins>+-#define CF_ENUM_AVAILABLE(_mac, _ios)
</ins><span class="cx"> -#endif
</span><span class="cx">
</span><span class="cx"> #endif /* __WebKitAvailability__ */
</span></span></pre></div>
<a id="trunkdportswwwwebkit2gtkfilesPR162261patchfromrev153246usersdevansGNOME3stabledportswwwwebkit2gtkfilesPR162261patch"></a>
<div class="copfile"><h4>Copied: trunk/dports/www/webkit2-gtk/files/PR-162261.patch (from rev 153246, users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-162261.patch) (0 => 153247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/files/PR-162261.patch (rev 0)
+++ trunk/dports/www/webkit2-gtk/files/PR-162261.patch 2016-09-27 22:23:04 UTC (rev 153247)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+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>
</ins></span></pre></div>
<a id="trunkdportswwwwebkit2gtkfilesPR162302patchfromrev153246usersdevansGNOME3stabledportswwwwebkit2gtkfilesPR162302patch"></a>
<div class="copfile"><h4>Copied: trunk/dports/www/webkit2-gtk/files/PR-162302.patch (from rev 153246, users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-162302.patch) (0 => 153247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/files/PR-162302.patch (rev 0)
+++ trunk/dports/www/webkit2-gtk/files/PR-162302.patch 2016-09-27 22:23:04 UTC (rev 153247)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+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 {
</ins></span></pre>
</div>
</div>
</body>
</html>