<!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>[138244] trunk/dports/graphics/gimp2/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/138244">138244</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-07-02 15:30:06 -0700 (Thu, 02 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gimp2: build +quartz using gtk-osx-application-gtk2, increment revision, disable +gvfs +help_browser when building +quartz due to build problems with webkit-gtk +quartz (#47936).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsgimp2Portfile">trunk/dports/graphics/gimp2/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsgimp2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp2/Portfile (138243 => 138244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/Portfile 2015-07-02 22:17:40 UTC (rev 138243)
+++ trunk/dports/graphics/gimp2/Portfile 2015-07-02 22:30:06 UTC (rev 138244)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> conflicts gimp2-devel gimp3-devel
</span><span class="cx"> # please remember to update the gimp metapackage to match
</span><span class="cx"> version 2.8.14
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> license GPL-3+
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans
</span><span class="lines">@@ -70,8 +70,6 @@
</span><span class="cx"> port:xorg-libXext \
</span><span class="cx"> port:xorg-libXfixes
</span><span class="cx">
</span><del>-depends_run path:share/gimp/2.0/help:gimp-help-en
-
</del><span class="cx"> # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'
</span><span class="cx"> compiler.blacklist-append gcc-3.3 gcc-4.0 gcc-4.2 apple-gcc-4.2
</span><span class="cx">
</span><span class="lines">@@ -130,9 +128,7 @@
</span><span class="cx"> configure.env PATH=${python_framework}/bin:$env(PATH)
</span><span class="cx"> }
</span><span class="cx">
</span><del>-default_variants +python27
-
-variant gvfs description {Enable GIO/gvfs support} {
</del><ins>+variant gvfs conflicts quartz description {Enable GIO/gvfs support} {
</ins><span class="cx"> depends_lib-append port:gvfs
</span><span class="cx"> configure.args-delete --without-gvfs
</span><span class="cx"> }
</span><span class="lines">@@ -145,13 +141,13 @@
</span><span class="cx"> configure.args-append --enable-debug
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant quartz {
</del><ins>+variant quartz conflicts gvfs help_browser {
</ins><span class="cx"> depends_lib-delete port:xorg-libXcursor \
</span><span class="cx"> port:xorg-libXmu \
</span><span class="cx"> port:xorg-libXext \
</span><span class="cx"> port:xorg-libXfixes \
</span><span class="cx"> port:xpm
</span><del>- depends_lib-append port:gtk-osx-application
</del><ins>+ depends_lib-append port:gtk-osx-application-gtk2
</ins><span class="cx"> configure.args-delete --with-x \
</span><span class="cx"> --x-includes=${prefix}/include \
</span><span class="cx"> --x-libraries=${prefix}/lib
</span><span class="lines">@@ -167,11 +163,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#
-# set default variants
-#
-
-variant help_browser description {Enable Gimp help browser} {
</del><ins>+variant help_browser conflicts quartz description {Enable Gimp help browser} {
+ depends_run path:share/gimp/2.0/help:gimp-help-en
</ins><span class="cx"> configure.args-delete --without-webkit
</span><span class="cx">
</span><span class="cx"> if {${configure.cxx_stdlib} eq "libstdc++"} {
</span><span class="lines">@@ -181,8 +174,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-default_variants +help_browser
</del><ins>+#
+# set default variants
+#
</ins><span class="cx">
</span><ins>+# help browser uses webkit-gtk which currently doesn't build +quartz (#47936)
+
+if {[variant_isset quartz]} {
+ default_variants -gvfs -help_browser +python27
+} else {
+ default_variants +help_browser +python27
+}
+
</ins><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span class="cx"> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span></span></pre>
</div>
</div>
</body>
</html>