[146463] trunk/dports/www/webkit2-gtk
jeremyhu at macports.org
jeremyhu at macports.org
Tue Mar 8 19:03:01 PST 2016
Revision: 146463
https://trac.macports.org/changeset/146463
Author: jeremyhu at macports.org
Date: 2016-03-08 19:03:01 -0800 (Tue, 08 Mar 2016)
Log Message:
-----------
webkit2-gtk: Enable gobject-introspection and gtk-doc
Modified Paths:
--------------
trunk/dports/www/webkit2-gtk/Portfile
Added Paths:
-----------
trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch
trunk/dports/www/webkit2-gtk/files/PR-152650-2.patch
Modified: trunk/dports/www/webkit2-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk/Portfile 2016-03-08 21:16:04 UTC (rev 146462)
+++ trunk/dports/www/webkit2-gtk/Portfile 2016-03-09 03:03:01 UTC (rev 146463)
@@ -14,6 +14,7 @@
name webkit2-gtk
conflicts webkit2-gtk-devel
version 2.11.91
+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
@@ -68,8 +69,11 @@
port:webp \
port:zlib
+# PR-152650-*.patch: https://bugs.webkit.org/show_bug.cgi?id=152650
# PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
patchfiles-append \
+ PR-152650-1.patch \
+ PR-152650-2.patch \
PR-153138.patch
# Build out-of-tree
@@ -80,12 +84,14 @@
configure.args-append \
-DPORT=GTK \
-DUSE_SYSTEM_MALLOC=ON \
+ -DENABLE_GTKDOC=ON \
+ -DENABLE_INTROSPECTION=ON \
-DENABLE_MINIBROWSER=OFF \
-DENABLE_PLUGIN_PROCESS_GTK2=OFF \
-DENABLE_VIDEO=ON
# https://bugs.webkit.org/show_bug.cgi?id=152650
-configure.args-append -DENABLE_INTROSPECTION=OFF
+build.env-append DYLD_LIBRARY_PATH=${build.dir}/lib
# <rdar://problem/24031030>
configure.optflags -Os
Added: trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch
===================================================================
--- trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch (rev 0)
+++ trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch 2016-03-09 03:03:01 UTC (rev 146463)
@@ -0,0 +1,83 @@
+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
+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/files/PR-152650-2.patch
===================================================================
--- trunk/dports/www/webkit2-gtk/files/PR-152650-2.patch (rev 0)
+++ trunk/dports/www/webkit2-gtk/files/PR-152650-2.patch 2016-03-09 03:03:01 UTC (rev 146463)
@@ -0,0 +1,46 @@
+From 4607ea0a569b3c527ae8dce341ab55eb0d69d8f7 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Tue, 8 Mar 2016 17:26:23 -0800
+Subject: [PATCH 2/2] [GTK][Mac] Enable support for gtk-doc on Mac
+
+https://bugs.webkit.org/show_bug.cgi?id=152650
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ ChangeLog | 10 ++++++++++
+ Source/PlatformGTK.cmake | 2 +-
+ Source/cmake/OptionsGTK.cmake | 5 -----
+ 3 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
+index af4d2e3..0b11b56 100644
+--- Source/PlatformGTK.cmake
++++ Source/PlatformGTK.cmake
+@@ -34,7 +34,7 @@ endmacro()
+ add_gtkdoc_generator("docs-build.stamp" "")
+ if (ENABLE_GTKDOC)
+ add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
+-elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE)
++elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING)
+ add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
+
+ # Add a default build step which check that documentation does not have any warnings
+diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
+index 6b01f1a..b443d10 100644
+--- Source/cmake/OptionsGTK.cmake
++++ Source/cmake/OptionsGTK.cmake
+@@ -424,11 +424,6 @@ if (CMAKE_CROSSCOMPILING)
+ 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
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160308/a2c246b6/attachment.html>
More information about the macports-changes
mailing list