Changes 2.0.6:

- fixed gimp_file_load_thumbnail()
- fixed gimp_displays_reconnect() (#154638)
- initialize tool options with default values before deserializiation (#120832)
- let the BMP loader deal better with broken BMP files (#15540)
- fixed help-browser crashes on missing images (#138275)
- fixed opacity handling in grid plug-in (#156750)
- fixed text tool crashes with Pango 1.2 (#154144)

4 files changed, 16 insertions, 17 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 9e3d85bd54b..3c882739a7f 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.106 2004/10/30 00:59:02 minskim Exp $
+# $NetBSD: Makefile,v 1.107 2004/11/03 13:29:46 adam Exp $
 
-DISTNAME=	gimp-2.0.5
-PKGREVISION=	2
+DISTNAME=	gimp-2.0.6
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.0/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/v2.0/ \
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 9e9732e24ce..ca491b36834 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2004/09/27 11:19:57 adam Exp $
+$NetBSD: distinfo,v 1.17 2004/11/03 13:29:46 adam Exp $
 
-SHA1 (gimp-2.0.5.tar.bz2) = 9b13f3a8375a615f2a6c6113809e768efe7303c1
-Size (gimp-2.0.5.tar.bz2) = 14107082 bytes
-SHA1 (patch-aa) = b233a944fa69481685770aa4d5b24a07f127afcf
-SHA1 (patch-ab) = fdd87f7a9f59f686061405b2ead691900dd3f3e9
+SHA1 (gimp-2.0.6.tar.bz2) = 0cc4b5ccf277983c67eec5d41d1e2213e983a2f4
+Size (gimp-2.0.6.tar.bz2) = 14097124 bytes
+SHA1 (patch-aa) = 1deb4760ae6b430a8954ca8aacdac75dbf7090f6
+SHA1 (patch-ab) = 92c0bad9401638ceea5da479b023d16b2aed190f
 SHA1 (patch-ad) = 632c34e0fbeda69139b2b674d9c5ef80db40dcca
diff --git a/graphics/gimp/patches/patch-aa b/graphics/gimp/patches/patch-aa
index 5e500b10cf4..ada55da5aa4 100644
--- a/graphics/gimp/patches/patch-aa
+++ b/graphics/gimp/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2004/03/29 22:16:09 xtraeme Exp $
+$NetBSD: patch-aa,v 1.11 2004/11/03 13:29:46 adam Exp $
 
---- etc/Makefile.in.orig	2004-03-24 09:11:27.000000000 +0100
-+++ etc/Makefile.in	2004-03-24 09:12:17.000000000 +0100
-@@ -323,7 +323,7 @@
+--- etc/Makefile.in.orig	2004-11-02 19:04:35.000000000 +0000
++++ etc/Makefile.in
+@@ -326,7 +326,7 @@ exec_prefix = @exec_prefix@
  gimpdatadir = @gimpdatadir@
  gimpdir = @gimpdir@
  gimpplugindir = @gimpplugindir@
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
index 0d13ec80448..5bd4050c99e 100644
--- a/graphics/gimp/patches/patch-ab
+++ b/graphics/gimp/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2004/08/06 10:35:57 adam Exp $
+$NetBSD: patch-ab,v 1.11 2004/11/03 13:29:47 adam Exp $
 
---- configure.orig	2004-08-05 18:49:36.000000000 +0000
+--- configure.orig	2004-11-02 19:04:51.000000000 +0000
 +++ configure
-@@ -27355,8 +27355,16 @@ if test "x$enable_altivec" = xyes; then
+@@ -27530,8 +27530,16 @@ if test "x$enable_altivec" = xyes; then
    echo "$as_me:$LINENO: checking whether we can compile Altivec code" >&5
  echo $ECHO_N "checking whether we can compile Altivec code... $ECHO_C" >&6
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.10 2004/08/06 10:35:57 adam Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -27396,7 +27404,7 @@ enable_altivec=no
+@@ -27571,7 +27579,7 @@ enable_altivec=no
  echo "${ECHO_T}no" >&6
      { echo "$as_me:$LINENO: WARNING: The assembler does not support the Altivec command set." >&5
  echo "$as_me: WARNING: The assembler does not support the Altivec command set." >&2;}
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.10 2004/08/06 10:35:57 adam Exp $
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
-@@ -32719,7 +32727,7 @@ fi;
+@@ -32894,7 +32902,7 @@ fi;
  
  gimpdatadir="$datadir/$PACKAGE/2.0"
  gimpplugindir="$libdir/$PACKAGE/2.0"