[146503] trunk/dports/www/webkit2-gtk-devel

[jeremyhu at macports.org]

Revision: 146503
          https://trac.macports.org/changeset/146503
Author:   jeremyhu at macports.org
Date:     2016-03-09 16:29:06 -0800 (Wed, 09 Mar 2016)
Log Message:
-----------
webkit2-gtk-devel: Fix a build issue with gobject-introspection. Disable gtk-doc again because it still fails on ElCap.

Modified Paths:
--------------
    trunk/dports/www/webkit2-gtk-devel/Portfile
    trunk/dports/www/webkit2-gtk-devel/files/PR-152650-1.patch
    trunk/dports/www/webkit2-gtk-devel/files/PR-152650-2.patch

Modified: trunk/dports/www/webkit2-gtk-devel/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/Portfile	2016-03-10 00:28:40 UTC (rev 146502)
+++ trunk/dports/www/webkit2-gtk-devel/Portfile	2016-03-10 00:29:06 UTC (rev 146503)
@@ -14,6 +14,7 @@
 name                webkit2-gtk-devel
 conflicts           webkit2-gtk
 version             2.13.0
+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
@@ -79,14 +80,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: trunk/dports/www/webkit2-gtk-devel/files/PR-152650-1.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-152650-1.patch	2016-03-10 00:28:40 UTC (rev 146502)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-152650-1.patch	2016-03-10 00:29:06 UTC (rev 146503)
@@ -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: trunk/dports/www/webkit2-gtk-devel/files/PR-152650-2.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-152650-2.patch	2016-03-10 00:28:40 UTC (rev 146502)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-152650-2.patch	2016-03-10 00:29:06 UTC (rev 146503)
@@ -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/ccc79c60/attachment.html>