<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[146502] trunk/dports/www/webkit2-gtk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/146502">146502</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-03-09 16:28:40 -0800 (Wed, 09 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkit2-gtk: Fix a build issue with gobject-introspection. Disable gtk-doc again because it still fails on ElCap.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkit2gtkPortfile">trunk/dports/www/webkit2-gtk/Portfile</a></li>
<li><a href="#trunkdportswwwwebkit2gtkfilesPR1526501patch">trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch</a></li>
<li><a href="#trunkdportswwwwebkit2gtkfilesPR1526502patch">trunk/dports/www/webkit2-gtk/files/PR-152650-2.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwwebkit2gtkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit2-gtk/Portfile (146501 => 146502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/Portfile 2016-03-09 22:40:28 UTC (rev 146501)
+++ trunk/dports/www/webkit2-gtk/Portfile 2016-03-10 00:28:40 UTC (rev 146502)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> name webkit2-gtk
</span><span class="cx"> conflicts webkit2-gtk-devel
</span><span class="cx"> version 2.11.91
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> description Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
</span><span class="cx"> long_description ${description}
</span><span class="cx"> maintainers jeremyhu devans
</span><span class="lines">@@ -84,14 +84,13 @@
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -DPORT=GTK \
</span><span class="cx"> -DUSE_SYSTEM_MALLOC=ON \
</span><del>- -DENABLE_GTKDOC=ON \
</del><span class="cx"> -DENABLE_INTROSPECTION=ON \
</span><span class="cx"> -DENABLE_MINIBROWSER=OFF \
</span><span class="cx"> -DENABLE_PLUGIN_PROCESS_GTK2=OFF \
</span><span class="cx"> -DENABLE_VIDEO=ON
</span><span class="cx">
</span><del>-# https://bugs.webkit.org/show_bug.cgi?id=152650
-build.env-append DYLD_LIBRARY_PATH=${build.dir}/lib
</del><ins>+# TODO: File a bug about this not working
+configure.args-append -DENABLE_GTKDOC=OFF
</ins><span class="cx">
</span><span class="cx"> # <rdar://problem/24031030>
</span><span class="cx"> configure.optflags -Os
</span></span></pre></div>
<a id="trunkdportswwwwebkit2gtkfilesPR1526501patch"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch (146501 => 146502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch 2016-03-09 22:40:28 UTC (rev 146501)
+++ trunk/dports/www/webkit2-gtk/files/PR-152650-1.patch 2016-03-10 00:28:40 UTC (rev 146502)
</span><span class="lines">@@ -54,6 +54,15 @@
</span><span class="cx"> ${INTROSPECTION_SCANNER}
</span><span class="cx"> --quiet
</span><span class="cx"> --warn-all
</span><ins>+@@ -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
</ins><span class="cx"> diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
</span><span class="cx"> index 54671fe..6b01f1a 100644
</span><span class="cx"> --- Source/cmake/OptionsGTK.cmake
</span></span></pre></div>
<a id="trunkdportswwwwebkit2gtkfilesPR1526502patch"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit2-gtk/files/PR-152650-2.patch (146501 => 146502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/files/PR-152650-2.patch 2016-03-09 22:40:28 UTC (rev 146501)
+++ trunk/dports/www/webkit2-gtk/files/PR-152650-2.patch 2016-03-10 00:28:40 UTC (rev 146502)
</span><span class="lines">@@ -41,6 +41,22 @@
</span><span class="cx"> set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
</span><span class="cx"> set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
</span><span class="cx"> set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
</span><ins>+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', ''))
</ins><span class="cx"> --
</span><span class="cx"> 2.7.2
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>