<!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>[114581] trunk/dports/graphics/gimp2-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/114581">114581</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2013-12-10 10:02:36 -0800 (Tue, 10 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>gimp2-devel: new development version of gimp2 based on a snapshort of recent git master.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsgimp2develPortfile">trunk/dports/graphics/gimp2-devel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/graphics/gimp2-devel/files/</li>
<li><a href="#trunkdportsgraphicsgimp2develfilespatchetcgimprcdiff">trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2develfilespatchpluginstwaintw_maccdiff">trunk/dports/graphics/gimp2-devel/files/patch-plug-ins-twain-tw_mac.c.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2develfilespatchrevertcommit7ef45be8902a4b7403d1d1736ca4f7c95b6449a8diff">trunk/dports/graphics/gimp2-devel/files/patch-revert-commit-7ef45be8902a4b7403d1d1736ca4f7c95b6449a8.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsgimp2develPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp2-devel/Portfile (114580 => 114581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2-devel/Portfile 2013-12-10 17:47:56 UTC (rev 114580)
+++ trunk/dports/graphics/gimp2-devel/Portfile 2013-12-10 18:02:36 UTC (rev 114581)
</span><span class="lines">@@ -2,16 +2,17 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup compiler_blacklist_versions 1.0
</ins><span class="cx">
</span><span class="cx"> name gimp2-devel
</span><del>-version 2.7.5
-
-replaced_by gimp2
-
-license {GPL-3 LGPL}
</del><ins>+set git_name gimp
+set git_commit 8707701bee03db9a67350685adfe1ec85211aef7
+conflicts gimp2 gimp3-devel
+version 2.9.1
+revision 20131209
+license GPL-3+
</ins><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans
</span><del>-homepage http://www.gimp.org/
</del><span class="cx"> platforms darwin
</span><span class="cx">
</span><span class="cx"> description The GNU Image Manipulation Program
</span><span class="lines">@@ -19,15 +20,199 @@
</span><span class="cx"> The GNU Image Manipulation Program (GIMP) is a powerful \
</span><span class="cx"> tool for the preparation and manipulation of digital images. \
</span><span class="cx"> The GIMP provides the user with a wide variety of image \
</span><del>- manipulation, painting, processing, and rendering tools.
</del><ins>+ manipulation, painting, processing, and rendering tools. \
+ This is the development version leading to a future 2.10 release \
+ branch based on a recent snapshot of upstream git master.
</ins><span class="cx">
</span><del>-distfiles
-universal_variant no
</del><ins>+homepage http://www.gimp.org/
+master_sites https://git.gnome.org/browse/${git_name}/snapshot/
</ins><span class="cx">
</span><ins>+distname ${git_name}-${git_commit}
+
+checksums rmd160 638c80952b7d9e698a452dd4a9caa8431ce67357 \
+ sha256 4c292476972f3ec4afa5a044e3b95d1793f4ad2d416932e59e06b43472f8b4af
+
+depends_build port:pkgconfig \
+ port:autoconf \
+ port:automake \
+ port:libtool \
+ port:intltool \
+ port:gtk-doc
+
+depends_lib port:desktop-file-utils \
+ port:iso-codes \
+ port:babl-devel \
+ port:gegl-devel \
+ port:atk \
+ port:gtk2 \
+ port:fontconfig \
+ port:freetype \
+ port:tiff \
+ port:jpeg \
+ port:zlib \
+ port:bzip2 \
+ port:ghostscript \
+ port:libpng \
+ port:libmng \
+ port:gexiv2 \
+ port:aalib \
+ port:xpm \
+ port:librsvg \
+ port:poppler \
+ port:curl \
+ port:libwmf \
+ port:jasper \
+ port:lcms \
+ port:dbus-glib \
+ port:libxml2 \
+ port:libxslt \
+ port:xorg-libXcursor \
+ port:xorg-libXmu \
+ port:xorg-libXext \
+ port:xorg-libXfixes
+
+depends_run path:share/gimp/2.0/help:gimp-help-en
+
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+}
+
+patchfiles patch-etc-gimprc.diff \
+ patch-plug-ins-twain-tw_mac.c.diff \
+ patch-revert-commit-7ef45be8902a4b7403d1d1736ca4f7c95b6449a8.diff
+
+platform darwin 9 {
+ post-patch {
+ reinplace "s|-export-symbols-regex.*||g" ${worksrcpath}/plug-ins/pygimp/Makefile.am
+ reinplace "s|-export-symbols-regex.*||g" ${worksrcpath}/plug-ins/pygimp/Makefile.in
+ }
+}
+
+compiler.blacklist-append {gcc-4.2 >= 5646}
+
</ins><span class="cx"> pre-configure {
</span><del>- ui_error "The GIMP 2.8 branch has been released and there is, as yet, no new development release available."
- ui_error "Consequently this port has been temporarily replaced by port 'gimp2'. Please install that port instead."
- return -code error
</del><ins>+ if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
+ set gtk_not_quartz [catch {exec grep -q GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
+ set gtk_not_x11 [catch {exec grep -q GDK_WINDOWING_X11 ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
+ if {[variant_isset quartz] && ${gtk_not_quartz}} {
+ error "+quartz variant selected, but gtk2+x11 is installed. Install gtk2+quartz."
+ } elseif {![variant_isset quartz] && ${gtk_not_x11}} {
+ error "+quartz variant is not selected, but gtk2+quartz is installed. Install gtk2+x11."
+ }
+ } else {
+ error "Cannot find gdkconfig.h"
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+configure.cmd ./autogen.sh
+
+configure.args --build=${configure.build_arch}-apple-${os.platform}${os.version} \
+ --enable-mp \
+ --with-pdbgen \
+ --with-x \
+ --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib \
+ --disable-silent-rules \
+ --without-alsa \
+ --without-gvfs \
+ --without-gudev \
+ --without-webkit \
+ --without-mac-twain
+
+# --without-mac-twain:
+# Leopard's 64bit Carbon is missing QuitApplicationEventLoop
+# It doesn't build any more anyways:
+# https://trac.macports.org/ticket/35168
+
+variant python26 conflicts no_python python27 description {Use python 2.6} {
+ configure.python ${prefix}/bin/python2.6
+ depends_lib-append port:py26-pygtk
+ set python_framework ${frameworks_dir}/Python.framework/Versions/2.6
+ configure.pkg_config_path ${python_framework}/lib/pkgconfig
+ configure.env PATH=${python_framework}/bin:$env(PATH)
+}
+
+variant python27 conflicts no_python python26 description {Use python 2.7} {
+ configure.python ${prefix}/bin/python2.7
+ depends_lib-append port:py27-pygtk
+ set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
+ configure.pkg_config_path ${python_framework}/lib/pkgconfig
+ configure.env PATH=${python_framework}/bin:$env(PATH)
+}
+
+variant no_python description {Disable Python scripts and filters} {
+ configure.args-append --disable-python
+}
+
+if {![variant_isset no_python] && ![variant_isset python26]} {
+ default_variants +python27
+}
+
+variant gvfs description {Enable GIO/gvfs support} {
+ depends_lib-append port:gvfs
+ configure.args-delete --without-gvfs
+}
+
+variant remote description {Enable building of obsolete gimp-remote helper app} {
+ configure.args-append --enable-gimp-remote
+}
+
+variant debug description {Enable debugging} {
+ configure.args-append --enable-debug
+}
+
+variant quartz {
+ depends_lib-delete port:xorg-libXcursor \
+ port:xorg-libXmu \
+ port:xorg-libXext \
+ port:xorg-libXfixes \
+ port:xpm
+ depends_lib-append port:gtk-osx-application
+ configure.args-delete --with-x \
+ --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib
+ configure.args-append --without-x
+ configure.ldflags-append -framework Carbon
+
+#
+# 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
+ }
+}
+
+#
+# set default variants
+#
+
+variant help_browser description {Enable Gimp help browser} {
+ configure.args-delete --without-webkit
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ } else {
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ }
+}
+
+default_variants +help_browser
+
+post-activate {
+ system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+}
+
</ins><span class="cx"> livecheck.type none
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp2develfilespatchetcgimprcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff (0 => 114581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff (rev 0)
+++ trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff 2013-12-10 18:02:36 UTC (rev 114581)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- etc/gimprc.orig 2012-04-02 16:28:33.000000000 -0700
++++ etc/gimprc 2012-07-10 08:55:00.000000000 -0700
+@@ -689,6 +689,8 @@
+ #
+ # (dock-window-hint utility)
+
++(dock-window-hint utility)
++
+ # Sets the pixel format to use for mouse pointers. Possible values are
+ # bitmap and pixbuf.
+ #
</ins></span></pre></div>
<a id="trunkdportsgraphicsgimp2develfilespatchpluginstwaintw_maccdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/gimp2-devel/files/patch-plug-ins-twain-tw_mac.c.diff (0 => 114581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2-devel/files/patch-plug-ins-twain-tw_mac.c.diff (rev 0)
+++ trunk/dports/graphics/gimp2-devel/files/patch-plug-ins-twain-tw_mac.c.diff 2013-12-10 18:02:36 UTC (rev 114581)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- plug-ins/twain/tw_mac.c.orig 2012-03-12 12:18:11.000000000 -0700
++++ plug-ins/twain/tw_mac.c 2012-07-10 08:57:29.000000000 -0700
+@@ -192,10 +192,12 @@
+
+ /* Voodoo magic fix inspired by java_swt launcher */
+ /* Without this the icon setting doesn't work about half the time. */
++#ifndef __LP64__
+ CGrafPtr p = BeginQDContextForApplicationDockTile();
+ EndQDContextForApplicationDockTile(p);
+
+ SetApplicationDockTileImage (icon);
++#endif
+ }
+
+ int
</ins></span></pre></div>
<a id="trunkdportsgraphicsgimp2develfilespatchrevertcommit7ef45be8902a4b7403d1d1736ca4f7c95b6449a8diff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/gimp2-devel/files/patch-revert-commit-7ef45be8902a4b7403d1d1736ca4f7c95b6449a8.diff (0 => 114581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2-devel/files/patch-revert-commit-7ef45be8902a4b7403d1d1736ca4f7c95b6449a8.diff (rev 0)
+++ trunk/dports/graphics/gimp2-devel/files/patch-revert-commit-7ef45be8902a4b7403d1d1736ca4f7c95b6449a8.diff 2013-12-10 18:02:36 UTC (rev 114581)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+--- app/core/gimp-user-install.c.orig 2013-12-06 12:09:34.000000000 -0800
++++ app/core/gimp-user-install.c 2013-12-06 12:10:57.000000000 -0800
+@@ -34,10 +34,6 @@
+ #include <unistd.h>
+ #endif
+
+-#ifdef PLATFORM_OSX
+-#include <AppKit/AppKit.h>
+-#endif
+-
+ #include <gio/gio.h>
+ #include <glib/gstdio.h>
+
+@@ -152,35 +148,6 @@
+
+ user_install_detect_old (install, gimp_directory ());
+
+-#ifdef PLATFORM_OSX
+- /* The config path on OSX has for a very short time frame (2.8.2 only)
+- been "~/Library/GIMP". It changed to "~/Library/Application Support"
+- in 2.8.4 and was in the home folder (as was other UNIX) before. */
+-
+- if (! install->old_dir)
+- {
+- gchar *dir;
+- NSAutoreleasePool *pool;
+- NSArray *path;
+- NSString *library_dir;
+-
+- pool = [[NSAutoreleasePool alloc] init];
+-
+- path = NSSearchPathForDirectoriesInDomains (NSLibraryDirectory,
+- NSUserDomainMask, YES);
+- library_dir = [path objectAtIndex:0];
+-
+- dir = g_build_filename ([library_dir UTF8String],
+- GIMPDIR, GIMP_USER_VERSION, NULL);
+-
+- [pool drain];
+-
+- user_install_detect_old (install, dir);
+- g_free (dir);
+- }
+-
+-#endif
+-
+ if (! install->old_dir)
+ {
+ /* if the default XDG-style config directory was not found, try
</ins></span></pre>
</div>
</div>
</body>
</html>