[144682] trunk/dports/www/webkit2-gtk

[jeremyhu at macports.org]

Revision: 144682
          https://trac.macports.org/changeset/144682
Author:   jeremyhu at macports.org
Date:     2016-01-15 01:26:19 -0800 (Fri, 15 Jan 2016)
Log Message:
-----------
webkit2-gtk: Update to include missing symbols and potentially fix build failure on Mavericks (#50334, #50335)

Modified Paths:
--------------
    trunk/dports/www/webkit2-gtk/Portfile

Added Paths:
-----------
    trunk/dports/www/webkit2-gtk/files/PR-152720.patch
    trunk/dports/www/webkit2-gtk/files/PR-153117.patch

Modified: trunk/dports/www/webkit2-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk/Portfile	2016-01-15 08:12:57 UTC (rev 144681)
+++ trunk/dports/www/webkit2-gtk/Portfile	2016-01-15 09:26:19 UTC (rev 144682)
@@ -12,6 +12,7 @@
 
 name                webkit2-gtk
 version             2.11.3
+revision            1
 description         Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
 long_description    ${description}
 maintainers         jeremyhu devans
@@ -76,8 +77,12 @@
 }
 
 # PR-152641.patch: https://bugs.webkit.org/show_bug.cgi?id=152641
+# PR-152720.patch: https://bugs.webkit.org/show_bug.cgi?id=152720
+# PR-153117.patch: https://bugs.webkit.org/show_bug.cgi?id=153117
 patchfiles-append \
-    PR-152641.patch
+    PR-152641.patch \
+    PR-152720.patch \
+    PR-153117.patch
 
 conflicts_build     google-test
 
@@ -91,6 +96,9 @@
 # https://bugs.webkit.org/show_bug.cgi?id=152650
 configure.args-append -DENABLE_INTROSPECTION=OFF
 
+# https://bugs.webkit.org/show_bug.cgi?id=153120
+configure.args-append -DENABLE_OPENGL=OFF
+
 # <rdar://problem/24031030>
 configure.optflags  -Os
 

Added: trunk/dports/www/webkit2-gtk/files/PR-152720.patch
===================================================================
--- trunk/dports/www/webkit2-gtk/files/PR-152720.patch	                        (rev 0)
+++ trunk/dports/www/webkit2-gtk/files/PR-152720.patch	2016-01-15 09:26:19 UTC (rev 144682)
@@ -0,0 +1,40 @@
+From 8cc961974887e4b6e51feb21e0fda0bfcba44096 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Thu, 14 Jan 2016 23:28:03 -0800
+Subject: [PATCH] Ensure CF_AVAILABLE is undefined
+
+https://bugs.webkit.org/show_bug.cgi?id=152720
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ Source/JavaScriptCore/API/WebKitAvailability.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h
+index 28b3af4..a9bb276 100644
+--- Source/JavaScriptCore/API/WebKitAvailability.h
++++ Source/JavaScriptCore/API/WebKitAvailability.h
+@@ -26,7 +26,7 @@
+ #ifndef __WebKitAvailability__
+ #define __WebKitAvailability__
+ 
+-#if defined(__APPLE__) && !defined(BUILDING_GTK__)
++#if defined(__APPLE__)
+ 
+ #include <AvailabilityMacros.h>
+ #include <CoreFoundation/CoreFoundation.h>
+@@ -64,6 +64,11 @@
+ 
+ #endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */
+ 
++#if defined(BUILDING_GTK__)
++#undef CF_AVAILABLE
++#define CF_AVAILABLE(_mac, _ios)
++#endif
++
+ #else
+ #define CF_AVAILABLE(_mac, _ios)
+ #endif
+-- 
+2.7.0
+

Added: trunk/dports/www/webkit2-gtk/files/PR-153117.patch
===================================================================
--- trunk/dports/www/webkit2-gtk/files/PR-153117.patch	                        (rev 0)
+++ trunk/dports/www/webkit2-gtk/files/PR-153117.patch	2016-01-15 09:26:19 UTC (rev 144682)
@@ -0,0 +1,34 @@
+From d88f798c7719a3f72366a0f8aca3a556907fbb3e Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Thu, 14 Jan 2016 23:24:26 -0800
+Subject: [PATCH 1/2] Fix linking on darwin
+
+https://bugs.webkit.org/show_bug.cgi?id=153117
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ Source/cmake/OptionsGTK.cmake | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
+index ebb525a..d3e67ea 100644
+--- Source/cmake/OptionsGTK.cmake
++++ Source/cmake/OptionsGTK.cmake
+@@ -471,10 +471,11 @@ endmacro()
+ # CMake does not automatically add --whole-archive when building shared objects from
+ # a list of convenience libraries. This can lead to missing symbols in the final output.
+ # We add --whole-archive to all libraries manually to prevent the linker from trimming
+-# symbols that we actually need later. (--whole-archive isn't an option on XCode's
+-# linker, though.)
++# symbols that we actually need later. With ld64 on darwin, we use -all_load instead.
+ macro(ADD_WHOLE_ARCHIVE_TO_LIBRARIES _list_name)
+-    if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
++    if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
++        list(APPEND ${_list_name} -Wl,-all_load)
++    else ()
+         foreach (library IN LISTS ${_list_name})
+           list(APPEND ${_list_name}_TMP -Wl,--whole-archive ${library} -Wl,--no-whole-archive)
+         endforeach ()
+-- 
+2.7.0
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160115/3318687b/attachment.html>