[146571] trunk/dports/www/webkit2-gtk-devel
jeremyhu at macports.org
jeremyhu at macports.org
Sat Mar 12 04:01:44 PST 2016
Revision: 146571
https://trac.macports.org/changeset/146571
Author: jeremyhu at macports.org
Date: 2016-03-12 04:01:44 -0800 (Sat, 12 Mar 2016)
Log Message:
-----------
webkit2-gtk-devel: Bump to r198058
Revision Links:
--------------
https://trac.macports.org/changeset/198058
Modified Paths:
--------------
trunk/dports/www/webkit2-gtk-devel/Portfile
Added Paths:
-----------
trunk/dports/www/webkit2-gtk-devel/files/PR-152651.patch
Removed Paths:
-------------
trunk/dports/www/webkit2-gtk-devel/files/PR-152650-1.patch
Modified: trunk/dports/www/webkit2-gtk-devel/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/Portfile 2016-03-12 11:49:12 UTC (rev 146570)
+++ trunk/dports/www/webkit2-gtk-devel/Portfile 2016-03-12 12:01:44 UTC (rev 146571)
@@ -24,7 +24,7 @@
homepage http://webkitgtk.org/
fetch.type svn
-svn.revision 197830
+svn.revision 198058
svn.url https://svn.webkit.org/repository/webkit/trunk
worksrcdir trunk
@@ -65,11 +65,12 @@
port:webp \
port:zlib
-# PR-152650-*.patch: https://bugs.webkit.org/show_bug.cgi?id=152650
+# PR-152650-2.patch: WIP to re-enable gtk-doc support
+# PR-152651.patch: https://bugs.webkit.org/show_bug.cgi?id=152651
# PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
patchfiles-append \
- PR-152650-1.patch \
PR-152650-2.patch \
+ PR-152651.patch \
PR-153138.patch
# Build out-of-tree
@@ -176,14 +177,4 @@
default_variants-append +x11 +gtk2
}
-post-destroot {
- # https://bugs.webkit.org/show_bug.cgi?id=152651
- 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.2.dylib ${destroot}${prefix}/lib
- ln -s libwebkit2gtk-4.0.37.13.2.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.37.dylib
- ln -s libwebkit2gtk-4.0.37.13.2.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.dylib
-}
-
livecheck.type none
Deleted: trunk/dports/www/webkit2-gtk-devel/files/PR-152650-1.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-152650-1.patch 2016-03-12 11:49:12 UTC (rev 146570)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-152650-1.patch 2016-03-12 12:01:44 UTC (rev 146571)
@@ -1,92 +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
-+++ Source/WebKit2/PlatformGTK.cmake
-@@ -888,15 +888,23 @@ add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings)
- 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 ()
-
-@@ -909,7 +917,7 @@ add_custom_command(
- 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}"
-+ ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
- ${INTROSPECTION_SCANNER}
- --quiet
- --warn-all
-@@ -951,7 +959,7 @@ add_custom_command(
- 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}"
-+ ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
- ${INTROSPECTION_SCANNER}
- --quiet
- --warn-all
-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
-
Added: trunk/dports/www/webkit2-gtk-devel/files/PR-152651.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-152651.patch (rev 0)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-152651.patch 2016-03-12 12:01:44 UTC (rev 146571)
@@ -0,0 +1,27 @@
+From 126c22e5f5ab03ed9040964a99d1b96637ce9940 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 12 Mar 2016 02:23:24 -0800
+Subject: [PATCH] Install WebKit2 WebProcess NetworkProcess on OSX when not
+ building the Mac PORT
+
+https://bugs.webkit.org/show_bug.cgi?id=152651
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ Source/WebKit2/CMakeLists.txt | 2 +-
+ Source/WebKit2/ChangeLog | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
+index 544fbbd..636a86a 100644
+--- Source/WebKit2/CMakeLists.txt
++++ Source/WebKit2/CMakeLists.txt
+@@ -853,7 +853,7 @@ endif ()
+ POPULATE_LIBRARY_VERSION(WEBKIT2)
+ set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
+
+-if (NOT APPLE)
++if (NOT PORT STREQUAL "Mac")
+ install(TARGETS WebKit2 WebProcess NetworkProcess
+ LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
+ RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160312/88a45215/attachment.html>
More information about the macports-changes
mailing list