<!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>[144819] trunk/dports/www/webkit2-gtk/Portfile</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/144819">144819</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-01-18 23:20:49 -0800 (Mon, 18 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkit2-gtk: Fixup +quartz</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkit2gtkPortfile">trunk/dports/www/webkit2-gtk/Portfile</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 (144818 => 144819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/Portfile 2016-01-19 06:13:19 UTC (rev 144818)
+++ trunk/dports/www/webkit2-gtk/Portfile 2016-01-19 07:20:49 UTC (rev 144819)
</span><span class="lines">@@ -63,10 +63,8 @@
</span><span class="cx"> port:libsoup \
</span><span class="cx"> port:libxml2 \
</span><span class="cx"> port:libxslt \
</span><del>- port:mesa \
</del><span class="cx"> port:sqlite3 \
</span><span class="cx"> port:webp \
</span><del>- port:xorg-libXt \
</del><span class="cx"> port:zlib
</span><span class="cx">
</span><span class="cx"> variant llvm37 conflicts llvm38 llvm39 description {Use llvm-3.7} {
</span><span class="lines">@@ -102,8 +100,6 @@
</span><span class="cx">
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -DPORT=GTK \
</span><del>- -DENABLE_X11_TARGET=ON \
- -DENABLE_QUARTZ_TARGET=OFF \
</del><span class="cx"> -DUSE_SYSTEM_MALLOC=ON \
</span><span class="cx"> -DENABLE_MINIBROWSER=OFF \
</span><span class="cx"> -DENABLE_PLUGIN_PROCESS_GTK2=OFF \
</span><span class="lines">@@ -115,6 +111,12 @@
</span><span class="cx"> # <rdar://problem/24031030>
</span><span class="cx"> configure.optflags -Os
</span><span class="cx">
</span><ins>+pre-configure {
+ if {![variant_isset quartz] && ![variant_isset x11]} {
+ error "Either +x11 or +quartz is required"
+ }
+}
+
</ins><span class="cx"> post-configure {
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=153176
</span><span class="cx"> reinplace {s|\.\./\.\./lib/libWTFGTK\.a||} \
</span><span class="lines">@@ -127,19 +129,24 @@
</span><span class="cx"> ${build.dir}/Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \
</span><span class="cx"> ${build.dir}/Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \
</span><span class="cx"> ${build.dir}/Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \
</span><del>- ${build.dir}/Source/WebKit2/CMakeFiles/PluginProcess.dir/link.txt \
</del><span class="cx"> ${build.dir}/Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \
</span><span class="cx"> ${build.dir}/Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt
</span><ins>+ if {[variant_isset x11]} {
+ # ENABLE_PLUGIN_PROCESS is only enabled with +x11
+ reinplace {s|[\./]*\.\./lib/lib[^\.]*\.a||g} \
+ ${build.dir}/Source/WebKit2/CMakeFiles/PluginProcess.dir/link.txt
+
+ if {[variant_isset gtk2]} {
+ reinplace {s|\.\./\.\./lib/libWTFGTK\.a||} \
+ ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
+ reinplace {s|-Wl,-all_load||g} \
+ ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
+ }
+ }
</ins><span class="cx"> if {[variant_isset minibrowser]} {
</span><span class="cx"> reinplace {s|[\./]*\.\./lib/lib[^\.]*\.a||g} \
</span><span class="cx"> ${build.dir}/Tools/MiniBrowser/gtk/CMakeFiles/MiniBrowser.dir/link.txt
</span><span class="cx"> }
</span><del>- if {[variant_isset gtk2]} {
- reinplace {s|\.\./\.\./lib/libWTFGTK\.a||} \
- ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
- reinplace {s|-Wl,-all_load||g} \
- ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
- }
</del><span class="cx">
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=153192
</span><span class="cx"> reinplace {s|\.\./\.\./lib/libWTFGTK\.a|-Wl,-all_load ../../lib/libWTFGTK.a|} \
</span><span class="lines">@@ -164,19 +171,20 @@
</span><span class="cx"> configure.cflags-append -ftemplate-depth=256
</span><span class="cx"> configure.cxxflags-append -ftemplate-depth=256
</span><span class="cx">
</span><del>-# see bug #24622
-variant quartz {
- configure.args-delete \
- -DENABLE_QUARTZ_TARGET=OFF \
- -DENABLE_X11_TARGET=ON
-
</del><ins>+variant quartz conflicts x11 gtk2 {
</ins><span class="cx"> configure.args-append \
</span><span class="cx"> -DENABLE_QUARTZ_TARGET=ON \
</span><span class="cx"> -DENABLE_X11_TARGET=OFF \
</span><span class="cx"> -DENABLE_OPENGL=OFF
</span><ins>+}
</ins><span class="cx">
</span><del>- # TODO: See if this will build with OpenGL.framework
- depends_lib-delete \
</del><ins>+variant x11 conflicts quartz {
+ configure.args-append \
+ -DENABLE_QUARTZ_TARGET=OFF \
+ -DENABLE_X11_TARGET=ON \
+ -DENABLE_OPENGL=ON
+
+ depends_lib-append \
</ins><span class="cx"> port:mesa \
</span><span class="cx"> port:xorg-libXt
</span><span class="cx"> }
</span><span class="lines">@@ -186,13 +194,15 @@
</span><span class="cx"> configure.args-append -DENABLE_MINIBROWSER=ON
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant gtk2 description {Enable support for GTK+2 plugins} {
</del><ins>+variant gtk2 conflicts quartz description {Enable support for GTK+2 plugins} {
</ins><span class="cx"> depends_lib-append port:gtk2
</span><span class="cx"> configure.args-delete -DENABLE_PLUGIN_PROCESS_GTK2=OFF
</span><span class="cx"> configure.args-append -DENABLE_PLUGIN_PROCESS_GTK2=ON
</span><span class="cx"> }
</span><span class="cx">
</span><del>-default_variants +gtk2
</del><ins>+if {![variant_isset quartz]} {
+ default_variants-append +x11 +gtk2
+}
</ins><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=152651
</span></span></pre>
</div>
</div>
</body>
</html>