summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam>2010-10-25 19:06:10 +0000
committeradam <adam>2010-10-25 19:06:10 +0000
commit3c42603151c14081c227181514c2ed45667c141f (patch)
tree9dd95afd6aa876e77acd3eb8c25041b4aaa99e38
parent0e4c55d08fec751b4da1adf84637de02798cc01e (diff)
downloadpkgsrc-3c42603151c14081c227181514c2ed45667c141f.tar.gz
Fixed buildling on MacOSX
-rw-r--r--graphics/gimp/Makefile3
-rw-r--r--graphics/gimp/PLIST4
-rw-r--r--graphics/gimp/distinfo3
-rw-r--r--graphics/gimp/patches/patch-ad19
4 files changed, 26 insertions, 3 deletions
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 0849fa4ff0f..39210613f3f 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.197 2010/10/16 09:54:37 adam Exp $
+# $NetBSD: Makefile,v 1.198 2010/10/25 19:06:10 adam Exp $
DISTNAME= gimp-2.6.11
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v2.6/ \
${MASTER_SITE_GNU:=gimp/v2.6/} \
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index ad9292eb493..245e4baf91d 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2010/10/16 09:54:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.46 2010/10/25 19:06:10 adam Exp $
bin/gimp
bin/gimp-2.6
bin/gimp-console
@@ -382,6 +382,7 @@ lib/gimp/2.0/plug-ins/tile-glass
lib/gimp/2.0/plug-ins/tile-paper
lib/gimp/2.0/plug-ins/tile-seamless
lib/gimp/2.0/plug-ins/tile-small
+${PLIST.twain}lib/gimp/2.0/plug-ins/twain
lib/gimp/2.0/plug-ins/unit-editor
lib/gimp/2.0/plug-ins/unsharp-mask
lib/gimp/2.0/plug-ins/value-invert
@@ -990,6 +991,7 @@ share/gimp/2.0/themes/Default/images/stock-question-64.png
share/gimp/2.0/themes/Default/images/stock-warning-64.png
share/gimp/2.0/themes/Small/gtkrc
share/gimp/2.0/tips/gimp-tips.xml
+${PLIST.twain}share/gimp/2.0/twain/gimp-twain.png
share/gtk-doc/html/libgimp/GimpAspectPreview.html
share/gtk-doc/html/libgimp/GimpBrushSelectButton.html
share/gtk-doc/html/libgimp/GimpDrawablePreview.html
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 3018c0f8f70..03de705644f 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2010/10/16 09:54:37 adam Exp $
+$NetBSD: distinfo,v 1.57 2010/10/25 19:06:10 adam Exp $
SHA1 (gimp-2.6.11.tar.bz2) = 2f9d596e727bdbf304fa78257c1731d9faf3934c
RMD160 (gimp-2.6.11.tar.bz2) = a116377499e58dc2bfe231ab3c057d0be94091ff
@@ -6,3 +6,4 @@ Size (gimp-2.6.11.tar.bz2) = 16473561 bytes
SHA1 (patch-aa) = 0775c8037748bfc27eb610f3667ddaa92d710681
SHA1 (patch-ab) = 80e7235178e53e873efa0b16098b74fa0b981f76
SHA1 (patch-ac) = 42f44b45640bdde305c1e52b95ee633360ebccb8
+SHA1 (patch-ad) = 4e2ce2f7d8729fb760eac1bad89cfe09fef499b0
diff --git a/graphics/gimp/patches/patch-ad b/graphics/gimp/patches/patch-ad
new file mode 100644
index 00000000000..947016f0cf0
--- /dev/null
+++ b/graphics/gimp/patches/patch-ad
@@ -0,0 +1,19 @@
+$NetBSD: patch-ad,v 1.11 2010/10/25 19:06:11 adam Exp $
+
+Disable API deprecated in Mac OS X v10.5 or not available for 64-bit.
+
+--- plug-ins/twain/tw_mac.c.orig 2010-10-25 18:48:00.000000000 +0000
++++ plug-ins/twain/tw_mac.c
+@@ -193,10 +193,12 @@ static void twainSetupMacUI()
+
+ /* Voodoo magic fix inspired by java_swt launcher */
+ /* Without this the icon setting doesn't work about half the time. */
++ /*
+ CGrafPtr p = BeginQDContextForApplicationDockTile();
+ EndQDContextForApplicationDockTile(p);
+
+ SetApplicationDockTileImage (icon);
++ */
+ }
+
+ int