[147847] trunk/dports/www/webkit2-gtk-devel

jeremyhu at macports.org jeremyhu at macports.org
Sun Apr 17 17:12:16 PDT 2016


Revision: 147847
          https://trac.macports.org/changeset/147847
Author:   jeremyhu at macports.org
Date:     2016-04-17 17:12:16 -0700 (Sun, 17 Apr 2016)
Log Message:
-----------
webkit2-gtk-devel: Update to current trunk

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

Added Paths:
-----------
    trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch
    trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch

Modified: trunk/dports/www/webkit2-gtk-devel/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/Portfile	2016-04-17 22:54:40 UTC (rev 147846)
+++ trunk/dports/www/webkit2-gtk-devel/Portfile	2016-04-18 00:12:16 UTC (rev 147847)
@@ -10,11 +10,12 @@
 PortGroup           cmake 1.0
 PortGroup           compiler_blacklist_versions 1.0
 PortGroup           cxx11 1.0
+PortGroup           github 1.0
 
 name                webkit2-gtk-devel
 conflicts           webkit2-gtk
 version             2.13.0
-revision            2
+revision            3
 description         Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
 long_description    ${description}
 maintainers         jeremyhu devans
@@ -23,17 +24,10 @@
 license             LGPL-2+ BSD
 homepage            http://webkitgtk.org/
 
-fetch.type          svn
-svn.revision        198900
-#bad  svn.revision        198930 # libANGLESupport failing?
-#bad  svn.revision        198940 # libANGLESupport failing?
-#bad  svn.revision        198950 # DatabaseProcess.dir issue
-#bad  svn.revision        199000 # DatabaseProcess.dir issue
-#bad  svn.revision        199100 # DatabaseProcess.dir issue
-#bad  svn.revision        199202 # DatabaseProcess.dir issue
-#bad  svn.revision        199571 # https://bugs.webkit.org/show_bug.cgi?id=156616
-svn.url             https://svn.webkit.org/repository/webkit/trunk
-worksrcdir          trunk
+# r199646
+github.setup        WebKit webkit d0ff398ccfa56a630f7bdf457cd0689f1d3b0e6d
+checksums           rmd160  8d411ccf4b6892f3deaa377d9ec9ba1c30bdb2eb \
+                    sha256  5f4fbbf4c3e94fc6c81aa0f2c95857334ccbd94ccf5224126c6983b5bf9a29b4
 
 # don't overwrite build dependencies provided by cmake portgroup
 depends_build-append \
@@ -74,9 +68,13 @@
 
 # PR-152650-2.patch: WIP to re-enable gtk-doc support
 # PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
+# PR-156679.patch: https://bugs.webkit.org/show_bug.cgi?id=156679
+# PR-156683.patch: https://bugs.webkit.org/show_bug.cgi?id=156683
 patchfiles-append \
     PR-152650-2.patch \
-    PR-153138.patch
+    PR-153138.patch \
+    PR-156679.patch \
+    PR-156683.patch
 
 # Build out-of-tree
 configure.post_args     ../${worksrcdir}

Added: trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch	                        (rev 0)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch	2016-04-18 00:12:16 UTC (rev 147847)
@@ -0,0 +1,75 @@
+From fa22d6be82c69535d6bca1a90a62b7e4cf9d7d13 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sun, 17 Apr 2016 14:00:01 -0700
+Subject: [PATCH] Fix incorrect assumption that APPLE implies Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=156679
+
+Addresses build failure introduced in r198947
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ Source/WebKit2/CMakeLists.txt |  6 +++---
+ Source/WebKit2/ChangeLog      | 11 +++++++++++
+ Tools/CMakeLists.txt          | 10 ++++------
+ Tools/ChangeLog               | 11 +++++++++++
+ 4 files changed, 29 insertions(+), 9 deletions(-)
+
+diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
+index 1b172bd..97fe019 100644
+--- Source/WebKit2/CMakeLists.txt
++++ Source/WebKit2/CMakeLists.txt
+@@ -868,7 +868,7 @@ if (WebKit2_NetworkProcess_OUTPUT_NAME)
+     set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
+ endif ()
+ 
+-if (ENABLE_PLUGIN_PROCESS AND NOT APPLE)
++if (ENABLE_PLUGIN_PROCESS AND NOT "${PORT}" STREQUAL "Mac")
+     add_definitions(-DENABLE_PLUGIN_PROCESS=1)
+     add_executable(PluginProcess ${PluginProcess_SOURCES})
+     add_webkit2_prefix_header(PluginProcess)
+@@ -880,7 +880,7 @@ if (ENABLE_PLUGIN_PROCESS AND NOT APPLE)
+     endif ()
+ endif ()
+ 
+-if (ENABLE_DATABASE_PROCESS AND NOT APPLE)
++if (ENABLE_DATABASE_PROCESS AND NOT "${PORT}" STREQUAL "Mac")
+     add_definitions(-DENABLE_DATABASE_PROCESS=1)
+     add_executable(DatabaseProcess ${DatabaseProcess_SOURCES})
+     add_webkit2_prefix_header(DatabaseProcess)
+@@ -892,7 +892,7 @@ if (ENABLE_DATABASE_PROCESS AND NOT APPLE)
+     endif ()
+ endif ()
+ 
+-if (APPLE)
++if ("${PORT}" STREQUAL "Mac")
+     set(_web_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.WebContent.Development.xpc/Contents)
+     make_directory(${_web_xpc_dir}/MacOS)
+     make_directory(${_web_xpc_dir}/Resources)
+diff --git a/Tools/CMakeLists.txt b/Tools/CMakeLists.txt
+index fae8b61..a9e79df 100644
+--- Tools/CMakeLists.txt
++++ Tools/CMakeLists.txt
+@@ -27,6 +27,10 @@ elseif ("${PORT}" STREQUAL "GTK")
+     if (ENABLE_MINIBROWSER)
+         add_subdirectory(MiniBrowser/gtk)
+     endif ()
++elseif ("${PORT}" STREQUAL "Mac")
++    add_subdirectory(DumpRenderTree)
++    add_subdirectory(WebKitTestRunner)
++    add_subdirectory(MiniBrowser/mac)
+ endif ()
+ 
+ if (WIN32)
+@@ -35,12 +39,6 @@ if (WIN32)
+     add_subdirectory(MiniBrowser/win)
+ endif ()
+ 
+-if (APPLE)
+-    add_subdirectory(DumpRenderTree)
+-    add_subdirectory(WebKitTestRunner)
+-    add_subdirectory(MiniBrowser/mac)
+-endif ()
+-
+ if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)
+     add_subdirectory(TestWebKitAPI)
+ endif ()

Added: trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch	                        (rev 0)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch	2016-04-18 00:12:16 UTC (rev 147847)
@@ -0,0 +1,13 @@
+diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
+index ee67f89..44739c7 100644
+--- Source/JavaScriptCore/CMakeLists.txt
++++ Source/JavaScriptCore/CMakeLists.txt
+@@ -1329,7 +1329,7 @@ add_subdirectory(shell)
+ WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
+ WEBKIT_FRAMEWORK(JavaScriptCore)
+ 
+-if (NOT APPLE)
++if (NOT "${PORT}" STREQUAL "Mac")
+     if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
+         POPULATE_LIBRARY_VERSION(JAVASCRIPTCORE)
+         set_target_properties(JavaScriptCore PROPERTIES VERSION ${JAVASCRIPTCORE_VERSION} SOVERSION ${JAVASCRIPTCORE_VERSION_MAJOR})
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160417/2477b3d0/attachment.html>


More information about the macports-changes mailing list