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

[devans at macports.org]

Revision: 146507
          https://trac.macports.org/changeset/146507
Author:   devans at macports.org
Date:     2016-03-09 17:32:34 -0800 (Wed, 09 Mar 2016)
Log Message:
-----------
GNOME-3/stable: webkit2-gtk, merge r146502 from trunk.

Revision Links:
--------------
    https://trac.macports.org/changeset/146502

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/www/webkit2-gtk/Portfile
    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-2.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-146481
   + /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

Modified: users/devans/GNOME-3/stable/dports/www/webkit2-gtk/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk/Portfile	2016-03-10 01:26:09 UTC (rev 146506)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk/Portfile	2016-03-10 01:32:34 UTC (rev 146507)
@@ -14,7 +14,7 @@
 name                webkit2-gtk
 conflicts           webkit2-gtk-devel
 version             2.11.91
-revision            1
+revision            2
 description         Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
 long_description    ${description}
 maintainers         jeremyhu devans
@@ -84,14 +84,13 @@
 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
-build.env-append DYLD_LIBRARY_PATH=${build.dir}/lib
+# TODO: File a bug about this not working
+configure.args-append -DENABLE_GTKDOC=OFF
 
 # <rdar://problem/24031030>
 configure.optflags  -Os

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-10 01:26:09 UTC (rev 146506)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-152650-1.patch	2016-03-10 01:32:34 UTC (rev 146507)
@@ -54,6 +54,15 @@
          ${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

Modified: users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-152650-2.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-152650-2.patch	2016-03-10 01:26:09 UTC (rev 146506)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-152650-2.patch	2016-03-10 01:32:34 UTC (rev 146507)
@@ -41,6 +41,22 @@
  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)
+diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
+index 4c8237b..a628ae0 100644
+--- Tools/gtk/gtkdoc.py
++++ Tools/gtk/gtkdoc.py
+@@ -322,6 +322,11 @@ class GTKDoc(object):
+                 env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
+             else:
+                 env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
++            current_dyld_library_path = env.get('DYLD_LIBRARY_PATH')
++            if current_ld_library_path:
++                env['RUN'] = 'DYLD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_dyld_library_path)
++            else:
++                env['RUN'] = 'DYLD_LIBRARY_PATH="%s" ' % self.library_path
+ 
+         if ldflags:
+             env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
 -- 
 2.7.2
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160309/51e28258/attachment.html>