<!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>[138254] trunk/dports/graphics/gimp3-devel</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/138254">138254</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-07-03 06:42:48 -0700 (Fri, 03 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gimp3-devel: update to git branch gtk3-port as of 20150609, build +quartz using gtk-osx-application-gtk3, now supports lcms2, remove outdated +gvfs variant, disable +help_browser when building +quartz due to build problems with webkit-gtk +quartz (#47936).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsgimp3develPortfile">trunk/dports/graphics/gimp3-devel/Portfile</a></li>
<li><a href="#trunkdportsgraphicsgimp3develfilespatchconfigureacdiff">trunk/dports/graphics/gimp3-devel/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp3develfilespatchetcgimprcdiff">trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsgimp3develPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp3-devel/Portfile (138253 => 138254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp3-devel/Portfile 2015-07-03 12:36:31 UTC (rev 138253)
+++ trunk/dports/graphics/gimp3-devel/Portfile 2015-07-03 13:42:48 UTC (rev 138254)
</span><span class="lines">@@ -7,10 +7,9 @@
</span><span class="cx"> name gimp3-devel
</span><span class="cx"> conflicts gimp2 gimp2-devel
</span><span class="cx"> set git_name gimp
</span><del>-set git_commit 3eff2ebc4b583a63dcb46c71b92f86da1e5cede5
-set git_date 20150208
</del><ins>+set git_commit 061b0ccd03a89b85f6ceea6878e323844695bcf6
+set git_date 20150609
</ins><span class="cx"> version 2.99.0-${git_date}
</span><del>-revision 1
</del><span class="cx"> license GPL-3+
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans
</span><span class="lines">@@ -18,9 +17,9 @@
</span><span class="cx">
</span><span class="cx"> description The GNU Image Manipulation Program
</span><span class="cx"> long_description The GNU Image Manipulation Program (GIMP) is a powerful \
</span><del>- tool for the preparation and manipulation of digital images. \
- The GIMP provides the user with a wide variety of image \
- manipulation, painting, processing, and rendering tools. \
</del><ins>+ tool for the preparation and manipulation of digital images. \
+ The GIMP provides the user with a wide variety of image \
+ manipulation, painting, processing, and rendering tools. \
</ins><span class="cx"> This is the experimental GTK3 based development version leading \
</span><span class="cx"> to a future 3.0 release branch based on a recent snapshot of \
</span><span class="cx"> the GTK3 git development branch.
</span><span class="lines">@@ -30,15 +29,15 @@
</span><span class="cx">
</span><span class="cx"> distname ${git_name}-${git_commit}
</span><span class="cx">
</span><del>-checksums rmd160 d7184955226ef247bd4bdef97d43152fd6e47acf \
- sha256 5858eaad766527e2d5739474fba8db509aef35f79cdd449648f710366158c746
</del><ins>+checksums rmd160 4af85ef167c2aae03e0fd1e57945f8145c8b4062 \
+ sha256 c076be0ad227e30c88c5fe76a33ffa0fc6f0f7010737752cae1bc59daa2a4e1c
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><ins>+ port:intltool \
+ port:gtk-doc \
</ins><span class="cx"> port:autoconf \
</span><span class="cx"> port:automake \
</span><del>- port:libtool \
- port:intltool \
- port:gtk-doc
</del><ins>+ port:libtool
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:iso-codes \
</span><span class="lines">@@ -63,7 +62,7 @@
</span><span class="cx"> port:curl \
</span><span class="cx"> port:libwmf \
</span><span class="cx"> port:jasper \
</span><del>- port:lcms \
</del><ins>+ port:lcms2 \
</ins><span class="cx"> port:dbus-glib \
</span><span class="cx"> port:libxml2 \
</span><span class="cx"> port:libxslt \
</span><span class="lines">@@ -72,17 +71,12 @@
</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
-
-use_parallel_build no
-
-patchfiles patch-configure.ac.diff \
- patch-etc-gimprc.diff \
- patch-plug-ins-twain-tw_mac.c.diff
-
</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><ins>+patchfiles patch-configure.ac.diff \
+ patch-etc-gimprc.diff
+
</ins><span class="cx"> pre-configure {
</span><span class="cx"> if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
</span><span class="cx"> set gtk_not_quartz [catch {exec grep -q GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
</span><span class="lines">@@ -108,16 +102,17 @@
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-python \
</span><span class="cx"> --without-alsa \
</span><del>- --without-gvfs \
</del><span class="cx"> --without-gudev \
</span><del>- --without-webkit \
- --without-mac-twain
</del><ins>+ --without-webkit
</ins><span class="cx">
</span><span class="cx"> # --without-mac-twain:
</span><span class="cx"> # Leopard's 64bit Carbon is missing QuitApplicationEventLoop
</span><del>-# It doesn't build any more anyways:
</del><ins>+# It doesn't build any more anyway:
</ins><span class="cx"> # https://trac.macports.org/ticket/35168
</span><span class="cx">
</span><ins>+configure.args-append \
+ --without-mac-twain
+
</ins><span class="cx"> variant python27 description {Build with python plugin support using python 2.7} {
</span><span class="cx"> configure.args-delete --disable-python
</span><span class="cx"> configure.python ${prefix}/bin/python2.7
</span><span class="lines">@@ -127,10 +122,6 @@
</span><span class="cx"> configure.env PATH=${python_framework}/bin:$env(PATH)
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant gvfs description {Enable GIO/gvfs support} {
- depends_lib-append port:gvfs
- configure.args-delete --without-gvfs
-}
</del><span class="cx">
</span><span class="cx"> variant remote description {Enable building of obsolete gimp-remote helper app} {
</span><span class="cx"> configure.args-append --enable-gimp-remote
</span><span class="lines">@@ -140,29 +131,22 @@
</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 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-gtk3
</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="cx"> configure.args-append --without-x
</span><span class="cx"> configure.ldflags-append -framework Carbon
</span><del>-
-#
-# if variant is +quartz lcms plugin uses 32 bit only Carbon API
-#
-
- if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
- configure.args-append --without-lcms
- }
</del><span class="cx"> }
</span><span class="cx">
</span><del>-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">@@ -176,9 +160,13 @@
</span><span class="cx"> # set default variants
</span><span class="cx"> #
</span><span class="cx">
</span><del>-default_variants +help_browser +gvfs
</del><ins>+# help browser uses webkit-gtk which currently doesn't build +quartz (#47936)
</ins><span class="cx">
</span><del>-default_variants +python27
</del><ins>+if {[variant_isset quartz]} {
+ default_variants -help_browser +python27
+} else {
+ default_variants +help_browser +python27
+}
</ins><span class="cx">
</span><span class="cx"> # create unversioned symbolic link to versioned executable for compatibility with gimp-app
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp3develfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp3-devel/files/patch-configure.ac.diff (138253 => 138254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp3-devel/files/patch-configure.ac.diff 2015-07-03 12:36:31 UTC (rev 138253)
+++ trunk/dports/graphics/gimp3-devel/files/patch-configure.ac.diff 2015-07-03 13:42:48 UTC (rev 138254)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.ac.orig 2015-02-08 09:38:37.000000000 -0800
-+++ configure.ac 2015-02-24 07:43:03.000000000 -0800
-@@ -1117,7 +1117,7 @@
</del><ins>+--- configure.ac.orig 2015-06-09 14:59:40.000000000 -0700
++++ configure.ac 2015-07-01 12:08:41.000000000 -0700
+@@ -1126,7 +1126,7 @@
</ins><span class="cx"> GTK_CHECK_BACKEND([x11], [gtk_required_version],
</span><span class="cx"> [have_gtk_x11=yes], [have_gtk_x11=no])
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp3develfilespatchetcgimprcdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff (138253 => 138254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff 2015-07-03 12:36:31 UTC (rev 138253)
+++ trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff 2015-07-03 13:42:48 UTC (rev 138254)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- etc/gimprc.orig 2014-11-01 07:00:08.000000000 -0700
-+++ etc/gimprc 2014-11-01 09:28:58.000000000 -0700
-@@ -705,6 +705,8 @@
</del><ins>+--- etc/gimprc.orig 2015-06-09 14:59:40.000000000 -0700
++++ etc/gimprc 2015-07-01 12:08:41.000000000 -0700
+@@ -718,6 +718,8 @@
</ins><span class="cx"> #
</span><span class="cx"> # (dock-window-hint utility)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>