[148240] trunk/dports/www/webkit2-gtk-devel
jeremyhu at macports.org
jeremyhu at macports.org
Sat Apr 30 17:17:29 PDT 2016
Revision: 148240
https://trac.macports.org/changeset/148240
Author: jeremyhu at macports.org
Date: 2016-04-30 17:17:28 -0700 (Sat, 30 Apr 2016)
Log Message:
-----------
webkit2-gtk-devel: Bump to r200069
Revision Links:
--------------
https://trac.macports.org/changeset/200069
Modified Paths:
--------------
trunk/dports/www/webkit2-gtk-devel/Portfile
Added Paths:
-----------
trunk/dports/www/webkit2-gtk-devel/files/PR-157182.patch
Removed 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-30 23:56:37 UTC (rev 148239)
+++ trunk/dports/www/webkit2-gtk-devel/Portfile 2016-05-01 00:17:28 UTC (rev 148240)
@@ -15,7 +15,7 @@
name webkit2-gtk-devel
conflicts webkit2-gtk
version 2.13.0
-revision 3
+revision 9
description Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
long_description ${description}
maintainers jeremyhu devans
@@ -24,11 +24,16 @@
license LGPL-2+ BSD
homepage http://webkitgtk.org/
-# r199646
-github.setup WebKit webkit d0ff398ccfa56a630f7bdf457cd0689f1d3b0e6d
-checksums rmd160 8d411ccf4b6892f3deaa377d9ec9ba1c30bdb2eb \
- sha256 5f4fbbf4c3e94fc6c81aa0f2c95857334ccbd94ccf5224126c6983b5bf9a29b4
+# r200216 -- has issue with m_font (https://bugs.webkit.org/show_bug.cgi?id=157167)
+#github.setup WebKit webkit 999e572d853fe32b9fb11955bc1a8f7ed97632c7
+#checksums rmd160 761d51bd5f7878efe08b3f7e586fcbd0444fd9fa \
+# sha256 f5772d6fb4609d0cf335704fe40eacb15b5e3fe7e267f00a8ffa24c444ea3aa2
+# r200069
+github.setup WebKit webkit 20484cc465bfbd872275a774549560cb16fb4997
+checksums rmd160 67364a2406d722a7fcebda0110cc6c0821316163 \
+ sha256 d670bed23113423ccb01cf8bedc5580068ccd4dc65b704e1821257f817adef38
+
# don't overwrite build dependencies provided by cmake portgroup
depends_build-append \
port:gperf \
@@ -68,13 +73,11 @@
# 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
+# PR-157182.patch: https://bugs.webkit.org/show_bug.cgi?id=157182
patchfiles-append \
PR-152650-2.patch \
PR-153138.patch \
- PR-156679.patch \
- PR-156683.patch
+ PR-157182.patch
# Build out-of-tree
configure.post_args ../${worksrcdir}
Deleted: trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch 2016-04-30 23:56:37 UTC (rev 148239)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-156679.patch 2016-05-01 00:17:28 UTC (rev 148240)
@@ -1,75 +0,0 @@
-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 ()
Deleted: trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch 2016-04-30 23:56:37 UTC (rev 148239)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-156683.patch 2016-05-01 00:17:28 UTC (rev 148240)
@@ -1,13 +0,0 @@
-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})
Added: trunk/dports/www/webkit2-gtk-devel/files/PR-157182.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-157182.patch (rev 0)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-157182.patch 2016-05-01 00:17:28 UTC (rev 148240)
@@ -0,0 +1,38 @@
+commit 9d9a9921add35954bc436b0d8f9adfd732698e77
+Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Fri Apr 29 09:47:21 2016 -0700
+
+ [GTK] Fix build failure introduced by r199738
+
+ https://bugs.webkit.org/show_bug.cgi?id=157182
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+
+diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
+index 8248f6a..78a0b1f 100644
+--- Source/WebCore/CMakeLists.txt
++++ Source/WebCore/CMakeLists.txt
+@@ -3274,6 +3274,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/PruneEmptyDeclarations.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RecordConstantPrecision.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RegenerateStructNames.cpp
++ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveDynamicIndexing.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemovePow.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveSwitchFallThrough.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RewriteDoWhile.cpp
+@@ -3281,6 +3282,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SearchSymbol.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateArrayInitialization.cpp
++ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateExpressionsReturningArrays.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateDeclarations.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ShaderLang.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ShaderVars.cpp
+@@ -3291,6 +3293,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/TranslatorHLSL.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Types.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UnfoldShortCircuitAST.cpp
++ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UnfoldShortCircuitToIf.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UniformHLSL.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/util.cpp
+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UtilsHLSL.cpp
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160430/69f098eb/attachment-0001.html>
More information about the macports-changes
mailing list