Changes 2.3.19:

- support long layer names in PSD files
- improved EXIF handling in the JPEG file plug-in
- added control for the playback speed in the Animation Playback plug-in
- avoid needless image preview invalidation
- allow to edit the image comment in the Image Properties dialog
- further improved rectangle tools
- made JPEG save parameters user-configurable
- avoid color conversions between identical ICC color profiles
- improved Print plug-in
- improved loading and saving of indexed TGA images
- bug fixes and code cleanup

6 files changed, 22 insertions, 52 deletions

diff --git a/graphics/gimp24/Makefile b/graphics/gimp24/Makefile
index 4ac59eed7d8..a790d90fe45 100644
--- a/graphics/gimp24/Makefile
+++ b/graphics/gimp24/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2007/07/31 13:22:01 gdt Exp $
+# $NetBSD: Makefile,v 1.47 2007/07/31 21:01:16 adam Exp $
 
-DISTNAME=	gimp-2.3.18
-PKGREVISION=	1
+DISTNAME=	gimp-2.3.19
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.3/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/v2.3/ \
diff --git a/graphics/gimp24/distinfo b/graphics/gimp24/distinfo
index 1a93245eae5..8ffcdb6813e 100644
--- a/graphics/gimp24/distinfo
+++ b/graphics/gimp24/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.18 2007/07/04 15:19:51 lkundrak Exp $
+$NetBSD: distinfo,v 1.19 2007/07/31 21:01:16 adam Exp $
 
-SHA1 (gimp-2.3.18.tar.bz2) = 1a34a9d3cbf5fb757fc1ab54b8ed5737f1abe3fc
-RMD160 (gimp-2.3.18.tar.bz2) = 17a0c3ebb3736c5d1dd5c620e5a03bc73151b31b
-Size (gimp-2.3.18.tar.bz2) = 16926421 bytes
-SHA1 (patch-aa) = f405e6cde52e8e85a7be327a47ddbb0cabb15ca5
-SHA1 (patch-ab) = 10e173a95b97666cfb7a4775228fe8722dc22714
-SHA1 (patch-ae) = ccdb74067fd88f6b838b4deee69dad68663c8cc5
-SHA1 (patch-af) = 05f23376a19497710cab08ffcd4dd29d6c82d729
+SHA1 (gimp-2.3.19.tar.bz2) = f04efda774e8ed57ded5058d37091f7a8d7b17b2
+RMD160 (gimp-2.3.19.tar.bz2) = 3ea293372ef0656543912c0a63ab287fd9ae72ca
+Size (gimp-2.3.19.tar.bz2) = 16803491 bytes
+SHA1 (patch-aa) = a9a1435fafdf85494fc0356739b2fca20b826529
+SHA1 (patch-ab) = abdff768841a61b3cfff970abd77b5fc207688ac
+SHA1 (patch-ae) = cb405fcea34a2b1c5758884f595906187c2e2699
diff --git a/graphics/gimp24/patches/patch-aa b/graphics/gimp24/patches/patch-aa
index 9042b3abc7e..20d73ea2d83 100644
--- a/graphics/gimp24/patches/patch-aa
+++ b/graphics/gimp24/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2007/05/28 12:41:50 adam Exp $
+$NetBSD: patch-aa,v 1.13 2007/07/31 21:01:16 adam Exp $
 
---- etc/Makefile.in.orig	2007-05-21 10:58:17.000000000 +0200
+--- etc/Makefile.in.orig	2007-07-24 20:49:27.000000000 +0200
 +++ etc/Makefile.in
-@@ -403,7 +403,7 @@ gimpdatadir = @gimpdatadir@
+@@ -402,7 +402,7 @@ gimpdatadir = @gimpdatadir@
  gimpdir = @gimpdir@
  gimplocaledir = @gimplocaledir@
  gimpplugindir = @gimpplugindir@
diff --git a/graphics/gimp24/patches/patch-ab b/graphics/gimp24/patches/patch-ab
index 34a13df1770..8d555fc4f99 100644
--- a/graphics/gimp24/patches/patch-ab
+++ b/graphics/gimp24/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2007/05/28 12:41:50 adam Exp $
+$NetBSD: patch-ab,v 1.13 2007/07/31 21:01:16 adam Exp $
 
---- configure.orig	2007-05-21 10:58:46.000000000 +0200
+--- configure.orig	2007-07-24 20:49:49.000000000 +0200
 +++ configure
-@@ -30961,6 +30961,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -31212,6 +31212,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
    gimp_ok=yes
  fi
  rm -f conftest*
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.12 2007/05/28 12:41:50 adam Exp $
  
        if test $gimp_ok = yes; then
  
-@@ -30969,7 +30970,6 @@ cat >>confdefs.h <<\_ACEOF
+@@ -31220,7 +31221,6 @@ cat >>confdefs.h <<\_ACEOF
  _ACEOF
  
        fi
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.12 2007/05/28 12:41:50 adam Exp $
    { echo "$as_me:$LINENO: result: $gimp_ok" >&5
  echo "${ECHO_T}$gimp_ok" >&6; }
    if test $gimp_ok = no; then
-@@ -33587,7 +33587,7 @@ if test "x$with_print" != xno; then
+@@ -33727,7 +33727,7 @@ if test "x$with_print" != xno; then
  fi
  
  
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.12 2007/05/28 12:41:50 adam Exp $
    BUILD_PRINT_TRUE=
    BUILD_PRINT_FALSE='#'
  else
-@@ -36512,7 +36512,7 @@ fi
+@@ -36652,7 +36652,7 @@ fi
  
  gimpdatadir="$datadir/$PACKAGE/2.0"
  gimpplugindir="$libdir/$PACKAGE/2.0"
diff --git a/graphics/gimp24/patches/patch-ae b/graphics/gimp24/patches/patch-ae
index 7ae74553d90..8d68746c4a2 100644
--- a/graphics/gimp24/patches/patch-ae
+++ b/graphics/gimp24/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2007/03/11 20:50:28 adam Exp $
+$NetBSD: patch-ae,v 1.6 2007/07/31 21:01:16 adam Exp $
 
---- plug-ins/common/png.c.orig	2007-03-08 10:53:54.000000000 +0100
+--- plug-ins/common/png.c.orig	2007-07-24 20:45:44.000000000 +0200
 +++ plug-ins/common/png.c
-@@ -1094,8 +1094,6 @@ load_image (const gchar *filename,
+@@ -1090,8 +1090,6 @@ load_image (const gchar *filename,
  
    g_free (pixel);
    g_free (pixels);
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.5 2007/03/11 20:50:28 adam Exp $
  
    fclose (fp);
  
-@@ -1553,9 +1551,6 @@ save_image (const gchar *filename,
+@@ -1549,9 +1547,6 @@ save_image (const gchar *filename,
        g_free (text);
      }
  
diff --git a/graphics/gimp24/patches/patch-af b/graphics/gimp24/patches/patch-af
deleted file mode 100644
index 2663feef6ac..00000000000
--- a/graphics/gimp24/patches/patch-af
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/07/04 15:19:51 lkundrak Exp $
-
-Fix for CVE-2007-2949 heap overflow from upstream.
-
---- plug-ins/common/psd-load.c.orig	2007-07-04 17:08:32.000000000 +0200
-+++ plug-ins/common/psd-load.c
-@@ -1291,7 +1291,7 @@ seek_to_and_unpack_pixeldata (FILE *fd,
-                               gint  layeri,
-                               gint  channeli)
- {
--  int         width, height;
-+  gint        width, height;
-   guchar     *tmpline;
-   gint        compression;
-   guint32     offset = 0;
-@@ -1305,6 +1305,12 @@ seek_to_and_unpack_pixeldata (FILE *fd,
-   width  = channel->width;
-   height = channel->height;
- 
-+  if (width > G_MAXINT16 || height > G_MAXINT16)
-+    {
-+      g_message ("Error: Invalid channel dimensions");
-+      gimp_quit ();
-+    }
-+
-   IFDBG
-     {
-       printf ("\t\t\tLayer (%d) Channel (%d:%d) Compression: %d (%s)\n",