Changes 2.2.15:

- fixed parsing of GFig files with CRLF line endings
- guard against a possible stack overflow in the Sunras loader
- fixed definition of datarootdir in gimptool-2.0
- fixed Perspective tool crash on Mac OS X
- fixed area resizing in the Image Map plug-in
- added missing library in gimptool-2.0 --libs output
- added new localizations: Occitan and Persian

5 files changed, 17 insertions, 62 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index ccfb451e4cb..0293bd3d41b 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.154 2007/05/26 15:00:22 tron Exp $
+# $NetBSD: Makefile,v 1.155 2007/05/28 12:20:42 adam Exp $
 
-DISTNAME=	gimp-2.2.14
-PKGREVISION=	1
+DISTNAME=	gimp-2.2.15
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/v2.2/ \
@@ -58,6 +57,7 @@ PLIST_SUBST+=		TWAIN="@comment "
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/aalib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index 76bbe76f73b..862003a153b 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2007/04/30 12:03:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.30 2007/05/28 12:20:42 adam Exp $
 bin/gimp
 bin/gimp-2.2
 bin/gimp-remote
@@ -1698,6 +1698,10 @@ share/locale/eu/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/eu/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/eu/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/eu/LC_MESSAGES/gimp20.mo
+share/locale/fa/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/fa/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/fa/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/fa/LC_MESSAGES/gimp20.mo
 share/locale/fi/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/fi/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/fi/LC_MESSAGES/gimp20-std-plug-ins.mo
@@ -1762,6 +1766,10 @@ share/locale/nl/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/nl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/nl/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/nl/LC_MESSAGES/gimp20.mo
+share/locale/oc/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/oc/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/oc/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/oc/LC_MESSAGES/gimp20.mo
 share/locale/pa/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/pa/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/pa/LC_MESSAGES/gimp20-std-plug-ins.mo
diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk
index 18b4b365a40..eb73883e0fe 100644
--- a/graphics/gimp/buildlink3.mk
+++ b/graphics/gimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2007/03/21 12:05:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2007/05/28 12:20:42 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIMP_BUILDLINK3_MK:=	${GIMP_BUILDLINK3_MK}+
@@ -9,7 +9,6 @@ BUILDLINK_DEPENDS+=	gimp
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngimp}
 BUILDLINK_PACKAGES+=	gimp
-
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gimp
 
 .if !empty(GIMP_BUILDLINK3_MK:M+)
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 9af4dc6c578..de72821b755 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.33 2007/05/26 15:00:23 tron Exp $
+$NetBSD: distinfo,v 1.34 2007/05/28 12:20:42 adam Exp $
 
-SHA1 (gimp-2.2.14.tar.bz2) = cf0926b9f0ca910b31219bafa8188a8b7ebabe10
-RMD160 (gimp-2.2.14.tar.bz2) = cf43fb0436a6086a0bc85fd4a33b009bee557aa0
-Size (gimp-2.2.14.tar.bz2) = 12836732 bytes
+SHA1 (gimp-2.2.15.tar.bz2) = ce2357139179e67f361e3ce1b1fb82d1dd5c08e4
+RMD160 (gimp-2.2.15.tar.bz2) = 322b5c07de9e6cc9b206d944278d58d8d6cd1e2f
+Size (gimp-2.2.15.tar.bz2) = 13097438 bytes
 SHA1 (patch-aa) = 6a25d14a018e02d353e6f10364384e9df7a30ebd
 SHA1 (patch-ab) = 461467b76c45e53042da8e3aee4bb9f556730792
-SHA1 (patch-ac) = 48fbb6a3b486db6f05ac210c2915f9a06c9f6795
 SHA1 (patch-ad) = 632c34e0fbeda69139b2b674d9c5ef80db40dcca
diff --git a/graphics/gimp/patches/patch-ac b/graphics/gimp/patches/patch-ac
deleted file mode 100644
index cf388eb9eab..00000000000
--- a/graphics/gimp/patches/patch-ac
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ac,v 1.14 2007/05/26 15:00:23 tron Exp $
-
---- plug-ins/common/sunras.c.orig	2007-04-17 22:11:23.000000000 +0100
-+++ plug-ins/common/sunras.c	2007-05-26 15:40:09.000000000 +0100
-@@ -102,8 +102,7 @@
-                           gint32            image_ID,
-                           gint32            drawable_ID);
- 
--static void set_color_table (gint32, L_SUNFILEHEADER *, unsigned char *);
--
-+static void   set_color_table  (gint32, L_SUNFILEHEADER *, const guchar *);
- static gint32 create_new_image (const gchar   *filename,
-                                 guint          width,
-                                 guint          height,
-@@ -865,19 +864,20 @@
- static void
- set_color_table (gint32           image_ID,
- 		 L_SUNFILEHEADER *sunhdr,
--		 guchar          *suncolmap)
-+		 const guchar    *suncolmap)
- {
--  int ncols, j;
--  guchar ColorMap[256*3];
-+  guchar ColorMap[256 * 3];
-+  gint   ncols, j;
- 
-   ncols = sunhdr->l_ras_maplength / 3;
--  if (ncols <= 0) return;
-+  if (ncols <= 0)
-+    return;
- 
--  for (j = 0; j < ncols; j++)
-+  for (j = 0; j < MIN (ncols, 256); j++)
-     {
--      ColorMap[j*3]   = suncolmap[j];
--      ColorMap[j*3+1] = suncolmap[j+ncols];
--      ColorMap[j*3+2] = suncolmap[j+2*ncols];
-+      ColorMap[j * 3 + 0] = suncolmap[j];
-+      ColorMap[j * 3 + 1] = suncolmap[j + ncols];
-+      ColorMap[j * 3 + 2] = suncolmap[j + 2 * ncols];
-     }
- 
- #ifdef DEBUG
-@@ -886,6 +886,7 @@
-     printf ("%3d: 0x%02x 0x%02x 0x%02x\n", j,
- 	    ColorMap[j*3], ColorMap[j*3+1], ColorMap[j*3+2]);
- #endif
-+
-   gimp_image_set_colormap (image_ID, ColorMap, ncols);
- }
-