Changes 2.2.6:

- reverted change to the print plug-in

Changes 2.2.5:
- fixed double-click behaviour of GimpButton
- properly handle 302 redirect output from wget in URL plug-in
- fixed loading of layer masks in PSD plug-in
- fixed bugs in PSD save plug-in
- fixed Reset in Scale and Resize dialogs
- fixed filename encoding issues when loading Script-Fu scripts
- fixed i18n build quirks
- improve autoscrolling with tablets in Windows
- fixed setup of size entries in tool-options
- when opening images as layers, do it interactively
- fixed precondition checks in gimp_drawable_transform_scale
- fixed handling of resolution unit in Print Size dialog
- disable "gtk-alternative-button-order" setting because our code
  doesn't honor it
- fixed behaviour of selection tool when dragging from top-right
- speed up conversion of grayscale images to indexed colors
- fixed bug in grayscale to indexed color conversion
- don't offer empty palettes for conversion to indexed color
- disable search in container tree-views since it interferes with global
  accelerators
- corrected mousewheel section of default controllerrc
- fixed build on amd64/gcc-4.0
- unset Keep Transparency from Color to Alpha plug-in.
- fixed crash caused by Histogram dockable in RGB mode
- fixed statusbar display for negative moves
- fixed a couple of problems in the BMP plug-in
- fixed bug in Resize dialog if previews are turned off
- fixed disappearing previews in Rotate Colormap plug-in
- fixed deletion of fractals in Fractal Explorer plug-in
- fixed preview in Deinterlace plug-in
- fixed crashes on exit in some locales
- fixed installation directories for message catalogs
- handle deletion of layers and channels that have a floating selection
  attached
- plugged some smaller memory leaks
- fixed preview in Gaussian Blur plug-in for zero radii
- fixed a couple of problems in the Winicon plug-in
- fixed bug in GIF loader that was triggered with a broken GIF
- fixed crash in Ink tool
- let the text tool remember the last-used font
- quote the print command used in the Print plug-in

4 files changed, 13 insertions, 12 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index e3989730b98..9815eefb7cb 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.115 2005/03/16 19:06:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.116 2005/04/11 09:32:45 adam Exp $
 
-DISTNAME=	gimp-2.2.4
+DISTNAME=	gimp-2.2.6
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/v2.2/ \
@@ -18,11 +18,11 @@ BUILD_USES_MSGFMT=	yes
 CONFLICTS+=		gimp<=1.2.3
 
 USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
-USE_GNU_TOOLS+=		make
 
 PKG_SYSCONFSUBDIR=	gimp/2.0
 
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index 27a48344d12..0806c8061be 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2005/02/23 14:16:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2005/04/11 09:32:45 adam Exp $
 bin/gimp
 bin/gimp-2.2
 bin/gimp-remote
@@ -829,6 +829,7 @@ share/doc/html/${PKGNAME}/libgimpwidgets/stock-wilber-48.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-wilber-64.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-wilber-eek-64.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-zoom-follow-window-12.png
+share/doc/html/${PKGNAME}/libgimpwidgets/style.css
 share/doc/html/${PKGNAME}/libgimpwidgets/up.png
 share/examples/gimp-2.0/controllerrc
 share/examples/gimp-2.0/gimprc
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 773707639f2..2aeb4d59f31 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2005/02/23 14:16:15 adam Exp $
+$NetBSD: distinfo,v 1.22 2005/04/11 09:32:45 adam Exp $
 
-SHA1 (gimp-2.2.4.tar.bz2) = fea1d8e0c7e0bdadccda237ffac7919d210fc0a7
-RMD160 (gimp-2.2.4.tar.bz2) = 06ec9dff1ca8cafd52a3d927dbe944f06d8bd871
-Size (gimp-2.2.4.tar.bz2) = 13986435 bytes
+SHA1 (gimp-2.2.6.tar.bz2) = ea6565a29a9021e965630811ebbb2515a4efec9e
+RMD160 (gimp-2.2.6.tar.bz2) = dad86a24499034f5428e29b4b925b5d316b9ac9d
+Size (gimp-2.2.6.tar.bz2) = 13990261 bytes
 SHA1 (patch-aa) = 3d9c05114c37a129e1760ea1fec0a9696278d55b
-SHA1 (patch-ab) = 5c7e74516d6670ed85758b2049ad040cb61a8be3
+SHA1 (patch-ab) = 2a4830d7b63424bd265d0ea1071b29b762f3028c
 SHA1 (patch-ad) = 632c34e0fbeda69139b2b674d9c5ef80db40dcca
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
index 74eb24357e8..6ec9c77937c 100644
--- a/graphics/gimp/patches/patch-ab
+++ b/graphics/gimp/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.13 2005/02/23 14:16:15 adam Exp $
+$NetBSD: patch-ab,v 1.14 2005/04/11 09:32:45 adam Exp $
 
---- configure.orig	2005-02-22 22:11:23.000000000 +0000
+--- configure.orig	2005-04-09 23:56:50.000000000 +0000
 +++ configure
 @@ -27859,8 +27859,16 @@ if test "x$enable_altivec" = xyes; then
    echo "$as_me:$LINENO: checking whether we can compile Altivec code" >&5
@@ -36,5 +36,5 @@ $NetBSD: patch-ab,v 1.13 2005/02/23 14:16:15 adam Exp $
 -gimpsysconfdir="$sysconfdir/$PACKAGE/2.0"
 +gimpsysconfdir="$sysconfdir"
  
- localedir='${prefix}/${DATADIRNAME}/locale'
+