[144915] trunk/dports/www/webkit2-gtk
jeremyhu at macports.org
jeremyhu at macports.org
Wed Jan 20 15:46:02 PST 2016
Revision: 144915
https://trac.macports.org/changeset/144915
Author: jeremyhu at macports.org
Date: 2016-01-20 15:46:02 -0800 (Wed, 20 Jan 2016)
Log Message:
-----------
webkit2-gtk: Update to 2.11.4
Modified Paths:
--------------
trunk/dports/www/webkit2-gtk/Portfile
Removed Paths:
-------------
trunk/dports/www/webkit2-gtk/files/PR-152720.patch
trunk/dports/www/webkit2-gtk/files/PR-153117.patch
trunk/dports/www/webkit2-gtk/files/PR-153120.patch
Modified: trunk/dports/www/webkit2-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk/Portfile 2016-01-20 23:36:57 UTC (rev 144914)
+++ trunk/dports/www/webkit2-gtk/Portfile 2016-01-20 23:46:02 UTC (rev 144915)
@@ -11,8 +11,7 @@
PortGroup cmake 1.0
name webkit2-gtk
-version 2.11.3
-revision 5
+version 2.11.4
description Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
long_description ${description}
maintainers jeremyhu devans
@@ -27,8 +26,8 @@
dist_subdir webkit-gtk
-checksums rmd160 9b478b93f0853bd049949249a4078774ad31a09b \
- sha256 728b54364f067029b8c6106476c2cd874c68999a1d09eb1cdabe60fa5e38562a
+checksums rmd160 16b3b304cf7fad5c06583a57456d105ed3b81adb \
+ sha256 47631d5d66967ebda2683c065706d5d91d4d886fc11f382eecd39451c71dfe3c
# don't overwrite build dependencies provided by cmake portgroup
depends_build-append \
@@ -83,14 +82,8 @@
default_variants-append +llvm37
}
-# PR-152720.patch: https://bugs.webkit.org/show_bug.cgi?id=152720
-# PR-153117.patch: https://bugs.webkit.org/show_bug.cgi?id=153117
-# PR-153120.patch: https://bugs.webkit.org/show_bug.cgi?id=153120
# PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
patchfiles-append \
- PR-152720.patch \
- PR-153117.patch \
- PR-153120.patch \
PR-153138.patch
# Build out-of-tree
@@ -209,9 +202,9 @@
xinstall -m 755 ${build.dir}/bin/LLIntOffsetsExtractor ${destroot}${prefix}/libexec/webkit2gtk-4.0
xinstall -m 755 ${build.dir}/bin/WebKitWebProcess ${destroot}${prefix}/libexec/webkit2gtk-4.0
xinstall -m 755 ${build.dir}/bin/WebKitNetworkProcess ${destroot}${prefix}/libexec/webkit2gtk-4.0
- xinstall -m 755 ${build.dir}/lib/libwebkit2gtk-4.0.37.13.0.dylib ${destroot}${prefix}/lib
- ln -s libwebkit2gtk-4.0.37.13.0.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.37.dylib
- ln -s libwebkit2gtk-4.0.37.13.0.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.dylib
+ xinstall -m 755 ${build.dir}/lib/libwebkit2gtk-4.0.37.13.1.dylib ${destroot}${prefix}/lib
+ ln -s libwebkit2gtk-4.0.37.13.1.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.37.dylib
+ ln -s libwebkit2gtk-4.0.37.13.1.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.dylib
}
livecheck.type regex
Deleted: trunk/dports/www/webkit2-gtk/files/PR-152720.patch
===================================================================
--- trunk/dports/www/webkit2-gtk/files/PR-152720.patch 2016-01-20 23:36:57 UTC (rev 144914)
+++ trunk/dports/www/webkit2-gtk/files/PR-152720.patch 2016-01-20 23:46:02 UTC (rev 144915)
@@ -1,40 +0,0 @@
-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
-
Deleted: trunk/dports/www/webkit2-gtk/files/PR-153117.patch
===================================================================
--- trunk/dports/www/webkit2-gtk/files/PR-153117.patch 2016-01-20 23:36:57 UTC (rev 144914)
+++ trunk/dports/www/webkit2-gtk/files/PR-153117.patch 2016-01-20 23:46:02 UTC (rev 144915)
@@ -1,34 +0,0 @@
-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
-
Deleted: trunk/dports/www/webkit2-gtk/files/PR-153120.patch
===================================================================
--- trunk/dports/www/webkit2-gtk/files/PR-153120.patch 2016-01-20 23:36:57 UTC (rev 144914)
+++ trunk/dports/www/webkit2-gtk/files/PR-153120.patch 2016-01-20 23:46:02 UTC (rev 144915)
@@ -1,11 +0,0 @@
---- Source/WebCore/CMakeLists.txt.orig 2016-01-15 15:10:27.000000000 -0800
-+++ Source/WebCore/CMakeLists.txt 2016-01-15 15:11:11.000000000 -0800
-@@ -3278,6 +3278,8 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/timing/RestrictVertexShaderTiming.cpp
-
-+ ${THIRDPARTY_DIR}/ANGLE/src/libANGLE/Platform.cpp
-+
- ${THIRDPARTY_DIR}/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp
- )
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160120/c83ccebc/attachment.html>
More information about the macports-changes
mailing list