Revision: 133279 https://trac.macports.org/changeset/133279 Author: devans@macports.org Date: 2015-02-24 10:15:52 -0800 (Tue, 24 Feb 2015) Log Message: ----------- gimp2-devel: update to version 2.91 git master of 20150223, remove outdated patch files. Modified Paths: -------------- trunk/dports/graphics/gimp2-devel/Portfile trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff Removed Paths: ------------- trunk/dports/graphics/gimp2-devel/files/patch-automake-1.15.diff trunk/dports/graphics/gimp2-devel/files/patch-plug-ins-twain-tw_mac.c.diff Modified: trunk/dports/graphics/gimp2-devel/Portfile =================================================================== --- trunk/dports/graphics/gimp2-devel/Portfile 2015-02-24 18:15:27 UTC (rev 133278) +++ trunk/dports/graphics/gimp2-devel/Portfile 2015-02-24 18:15:52 UTC (rev 133279) @@ -7,8 +7,8 @@ name gimp2-devel conflicts gimp2 gimp3-devel set git_name gimp -set git_commit 51c35d4c78afd7f3f1cd784a7be1360bbc01d85c -set git_date 20141031 +set git_commit 1d5bffd1c288425214c01025807ecda8e0227c69 +set git_date 20150223 version 2.9.1-${git_date} license GPL-3+ categories graphics @@ -28,8 +28,8 @@ distname ${git_name}-${git_commit} -checksums rmd160 503660dbe4ea93bcd3d0b44cc5c6dc2a939c7041 \ - sha256 2ebcbeba179f81cff78e07a8306c68c9ec0cb88daf097f0342f800278e34dc0d +checksums rmd160 450f9577947b8c5392a3eb5ac9beee707cd1fcb6 \ + sha256 d6197cf9410d06d7d1248837cfd2bf395edc723bef86a73973fe93bfb75e861d depends_build port:pkgconfig \ port:autoconf \ @@ -74,9 +74,7 @@ use_parallel_build no -patchfiles patch-automake-1.15.diff \ - patch-etc-gimprc.diff \ - patch-plug-ins-twain-tw_mac.c.diff +patchfiles patch-etc-gimprc.diff # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm' compiler.blacklist-append gcc-3.3 gcc-4.0 gcc-4.2 apple-gcc-4.2 Deleted: trunk/dports/graphics/gimp2-devel/files/patch-automake-1.15.diff =================================================================== --- trunk/dports/graphics/gimp2-devel/files/patch-automake-1.15.diff 2015-02-24 18:15:27 UTC (rev 133278) +++ trunk/dports/graphics/gimp2-devel/files/patch-automake-1.15.diff 2015-02-24 18:15:52 UTC (rev 133279) @@ -1,12 +0,0 @@ ---- autogen.sh.orig 2015-02-15 08:56:17.000000000 -0800 -+++ autogen.sh 2015-02-15 08:57:50.000000000 -0800 -@@ -157,6 +157,9 @@ - if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=$AUTOMAKE - ACLOCAL=$ACLOCAL -+elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then -+ AUTOMAKE=automake-1.15 -+ ACLOCAL=aclocal-1.15 - elif (automake-1.14 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.14 - ACLOCAL=aclocal-1.14 Modified: trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff =================================================================== --- trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff 2015-02-24 18:15:27 UTC (rev 133278) +++ trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff 2015-02-24 18:15:52 UTC (rev 133279) @@ -1,5 +1,5 @@ ---- etc/gimprc.orig 2014-11-01 07:00:08.000000000 -0700 -+++ etc/gimprc 2014-11-01 09:28:58.000000000 -0700 +--- etc/gimprc.orig 2015-02-23 15:12:33.000000000 -0800 ++++ etc/gimprc 2015-02-23 18:09:38.000000000 -0800 @@ -705,6 +705,8 @@ # # (dock-window-hint utility) Deleted: trunk/dports/graphics/gimp2-devel/files/patch-plug-ins-twain-tw_mac.c.diff =================================================================== --- trunk/dports/graphics/gimp2-devel/files/patch-plug-ins-twain-tw_mac.c.diff 2015-02-24 18:15:27 UTC (rev 133278) +++ trunk/dports/graphics/gimp2-devel/files/patch-plug-ins-twain-tw_mac.c.diff 2015-02-24 18:15:52 UTC (rev 133279) @@ -1,15 +0,0 @@ ---- 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