[146568] users/devans/GNOME-3/stable/dports/www/webkit2-gtk

[devans at macports.org]

Revision: 146568
          https://trac.macports.org/changeset/146568
Author:   devans at macports.org
Date:     2016-03-12 03:18:49 -0800 (Sat, 12 Mar 2016)
Log Message:
-----------
GNOME-3/stable: webkit2-gtk, fix build failure on El Capitan caused by SIP interference with DYLD_LIBRARY_PATH.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-152650-1.patch

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/www/webkit2-gtk/


Property changes on: users/devans/GNOME-3/stable/dports/www/webkit2-gtk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/www/webkit2-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit2-gtk:146461-146506
   + /branches/mld-qt-481/dports/www/webkit2-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit2-gtk:146461-146567

Modified: users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-152650-1.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-152650-1.patch	2016-03-12 11:13:38 UTC (rev 146567)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-152650-1.patch	2016-03-12 11:18:49 UTC (rev 146568)
@@ -16,9 +16,9 @@
 
 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)
+--- Source/WebKit2/PlatformGTK.cmake.orig	2016-02-29 23:34:20.000000000 -0800
++++ Source/WebKit2/PlatformGTK.cmake	2016-03-11 14:48:17.000000000 -0800
+@@ -888,15 +888,23 @@
  add_webkit2_prefix_header(webkit2gtkinjectedbundle)
  target_link_libraries(webkit2gtkinjectedbundle WebKit2)
  
@@ -45,24 +45,28 @@
      )
  endif ()
  
-@@ -909,7 +917,7 @@ add_custom_command(
+@@ -908,8 +916,8 @@
      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}"
+-        ${INTROSPECTION_SCANNER}
 +        ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
-         ${INTROSPECTION_SCANNER}
++        ${PYTHON_EXECUTABLE} ${INTROSPECTION_SCANNER}
          --quiet
          --warn-all
-@@ -951,7 +959,7 @@ add_custom_command(
+         --symbol-prefix=webkit
+@@ -950,8 +958,8 @@
      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}"
+-        ${INTROSPECTION_SCANNER}
 +        ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
-         ${INTROSPECTION_SCANNER}
++        ${PYTHON_EXECUTABLE} ${INTROSPECTION_SCANNER}
          --quiet
          --warn-all
+         --symbol-prefix=webkit
 diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
 index 54671fe..6b01f1a 100644
 --- Source/cmake/OptionsGTK.cmake
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160312/1f2ec119/attachment.html>