[153247] trunk/dports/www/webkit2-gtk
devans at macports.org
devans at macports.org
Tue Sep 27 15:23:05 PDT 2016
Revision: 153247
https://trac.macports.org/changeset/153247
Author: devans at macports.org
Date: 2016-09-27 15:23:04 -0700 (Tue, 27 Sep 2016)
Log Message:
-----------
webkit2-gtk: update to version 2.14.0.
Modified Paths:
--------------
trunk/dports/www/webkit2-gtk/Portfile
trunk/dports/www/webkit2-gtk/files/PR-157574.patch
Added Paths:
-----------
trunk/dports/www/webkit2-gtk/files/PR-162261.patch
trunk/dports/www/webkit2-gtk/files/PR-162302.patch
Removed Paths:
-------------
trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch
Property Changed:
----------------
trunk/dports/www/webkit2-gtk/
Property changes on: trunk/dports/www/webkit2-gtk
___________________________________________________________________
Modified: svn:mergeinfo
- /users/devans/GNOME-3/stable/dports/www/webkit2-gtk:146462-152438
+ /users/devans/GNOME-3/stable/dports/www/webkit2-gtk:146462-153246
Modified: trunk/dports/www/webkit2-gtk/Portfile
===================================================================
--- 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)
@@ -13,7 +13,7 @@
name webkit2-gtk
conflicts webkit2-gtk-devel
-version 2.12.5
+version 2.14.0
description Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
long_description ${description}
maintainers jeremyhu devans
@@ -28,8 +28,8 @@
dist_subdir webkit-gtk
-checksums rmd160 76bf4e0ae63fe2f5ce7b7440766250df03bbd213 \
- sha256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40
+checksums rmd160 25116c98970867950e5b2e8e3506527aa2a9021c \
+ sha256 0513ad836c624a3d24bdf1a99f4b4aead984ab6684150bc70f16db651590ea0a
# don't overwrite build dependencies provided by cmake portgroup
depends_build-append \
@@ -72,11 +72,15 @@
# PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
# PR-157554.patch: https://bugs.webkit.org/show_bug.cgi?id=157554
# PR-157574.patch: https://bugs.webkit.org/show_bug.cgi?id=157574
+# PR-162261.patch: https://bugs.webkit.org/show_bug.cgi?id=162261
+# PR-162302.patch: https://bugs.webkit.org/show_bug.cgi?id=162302
patchfiles-append \
PR-152650-2.patch \
PR-153138.patch \
PR-157554.patch \
- PR-157574.patch
+ PR-157574.patch \
+ PR-162261.patch \
+ PR-162302.patch
# Build out-of-tree
configure.post_args ../${worksrcdir}
@@ -97,6 +101,9 @@
# <rdar://problem/24031030>
configure.optflags -Os
+# 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
+
pre-configure {
if {![variant_isset quartz] && ![variant_isset x11]} {
error "Either +x11 or +quartz is required"
Deleted: trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch
===================================================================
--- 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)
@@ -1,96 +0,0 @@
-From 729bc3fa9f47114960dd4ab1d2fd2054aa34345c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at 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 at 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
-
Modified: trunk/dports/www/webkit2-gtk/files/PR-157574.patch
===================================================================
--- 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)
@@ -1,11 +1,13 @@
---- 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 @@
+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 @@
#define __WebKitAvailability__
#if defined(__APPLE__)
-
- #include <AvailabilityMacros.h>
+-#include <AvailabilityMacros.h>
#include <CoreFoundation/CoreFoundation.h>
-
-#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
@@ -23,6 +25,10 @@
-#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available.
-#endif
-
+-#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
+-
-#ifndef __AVAILABILITY_INTERNAL__MAC_10_9
-#define __AVAILABILITY_INTERNAL__MAC_10_9
-#endif
@@ -44,10 +50,13 @@
-#if defined(BUILDING_GTK__)
#undef CF_AVAILABLE
#define CF_AVAILABLE(_mac, _ios)
+ #undef CF_ENUM_AVAILABLE
+ #define CF_ENUM_AVAILABLE(_mac, _ios)
-#endif
-
-#else
-#define CF_AVAILABLE(_mac, _ios)
+-#define CF_ENUM_AVAILABLE(_mac, _ios)
-#endif
#endif /* __WebKitAvailability__ */
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)
===================================================================
--- 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)
@@ -0,0 +1,24 @@
+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>
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)
===================================================================
--- 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)
@@ -0,0 +1,12 @@
+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 {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160927/8dec4334/attachment.html>
More information about the macports-changes
mailing list