Changes 2.3.15:

- added keyboard control to rectangle tools and improved their tool options
- improved console handling on Win32
- support large XCF files (> 2GB) on Win32 also
- cleanup of the internal undo system
- ask before overwriting files, not only for image files
- added "Revert Zoom" functionality
- added GimpStringComboBox widget to libgimpwidgets
- added HAL support for hotplug of Linux Input devices
- added support for shaped windows to the Screenshot plug-in
- improved handling of incomplete PNG files
- categorize contributors into active and inactive
- added controller module for DirectInput controllers on Win32
- speed up transform tools
- improved tool cancellation framework
- fixed Select -> Border behaviour and added option for 'sticky image edges'
- bug fixes and code cleanup

6 files changed, 27 insertions, 35 deletions

diff --git a/graphics/gimp24/Makefile b/graphics/gimp24/Makefile
index 2776c72757b..0fabdd61836 100644
--- a/graphics/gimp24/Makefile
+++ b/graphics/gimp24/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2007/02/05 19:49:06 adam Exp $
+# $NetBSD: Makefile,v 1.37 2007/03/11 20:50:27 adam Exp $
 
-DISTNAME=	gimp-2.3.14
+DISTNAME=	gimp-2.3.15
 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/PLIST b/graphics/gimp24/PLIST
index ddd7057f0ef..d85f964fb01 100644
--- a/graphics/gimp24/PLIST
+++ b/graphics/gimp24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2007/02/05 19:49:06 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2007/03/11 20:50:27 adam Exp $
 bin/gimp-2.3
 bin/gimp-console-2.3
 ${REMOTE}bin/gimp-remote-2.3
@@ -198,6 +198,7 @@ include/gimp-2.0/libgimpwidgets/gimpresolutionentry.h
 include/gimp-2.0/libgimpwidgets/gimpscrolledpreview.h
 include/gimp-2.0/libgimpwidgets/gimpsizeentry.h
 include/gimp-2.0/libgimpwidgets/gimpstock.h
+include/gimp-2.0/libgimpwidgets/gimpstringcombobox.h
 include/gimp-2.0/libgimpwidgets/gimpunitmenu.h
 include/gimp-2.0/libgimpwidgets/gimpwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetsenums.h
@@ -912,13 +913,11 @@ share/gimp/2.0/scripts/starscape-logo.scm
 share/gimp/2.0/scripts/swirltile.scm
 share/gimp/2.0/scripts/swirly-pattern.scm
 share/gimp/2.0/scripts/t-o-p-logo.scm
-share/gimp/2.0/scripts/test-sphere.scm
 share/gimp/2.0/scripts/text-circle.scm
 share/gimp/2.0/scripts/textured-logo.scm
 share/gimp/2.0/scripts/tileblur.scm
 share/gimp/2.0/scripts/title-header.scm
 share/gimp/2.0/scripts/truchet.scm
-share/gimp/2.0/scripts/ts-helloworld.scm
 share/gimp/2.0/scripts/unsharp-mask.scm
 share/gimp/2.0/scripts/waves-anim.scm
 share/gimp/2.0/scripts/weave.scm
@@ -1242,6 +1241,7 @@ share/gtk-doc/html/libgimpwidgets/GimpPreviewArea.html
 share/gtk-doc/html/libgimpwidgets/GimpRatioEntry.html
 share/gtk-doc/html/libgimpwidgets/GimpScrolledPreview.html
 share/gtk-doc/html/libgimpwidgets/GimpSizeEntry.html
+share/gtk-doc/html/libgimpwidgets/GimpStringComboBox.html
 share/gtk-doc/html/libgimpwidgets/GimpUnitMenu.html
 share/gtk-doc/html/libgimpwidgets/gimp-browser.png
 share/gtk-doc/html/libgimpwidgets/gimp-button.png
@@ -1265,6 +1265,7 @@ share/gtk-doc/html/libgimpwidgets/gimp-path-editor.png
 share/gtk-doc/html/libgimpwidgets/gimp-pick-button.png
 share/gtk-doc/html/libgimpwidgets/gimp-preview-area.png
 share/gtk-doc/html/libgimpwidgets/gimp-ratio-entry.png
+share/gtk-doc/html/libgimpwidgets/gimp-string-combo-box.png
 share/gtk-doc/html/libgimpwidgets/gimp-unit-menu.png
 share/gtk-doc/html/libgimpwidgets/home.png
 share/gtk-doc/html/libgimpwidgets/index.html
diff --git a/graphics/gimp24/distinfo b/graphics/gimp24/distinfo
index 78a55f3591a..ca708bd9446 100644
--- a/graphics/gimp24/distinfo
+++ b/graphics/gimp24/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2007/02/05 19:49:06 adam Exp $
+$NetBSD: distinfo,v 1.14 2007/03/11 20:50:27 adam Exp $
 
-SHA1 (gimp-2.3.14.tar.bz2) = c1564d1c56bfc0d4472cd9f7ff8d35888a6d3c4e
-RMD160 (gimp-2.3.14.tar.bz2) = 53aab8b6e0a3f1d1249b6f4c363d76fa7a5e20b0
-Size (gimp-2.3.14.tar.bz2) = 16035467 bytes
-SHA1 (patch-aa) = 4510be57cd44a8c42bfd718225d5b85a09c799c8
-SHA1 (patch-ab) = ded403a4dd7df5247f06aef74385c5cb5d1f58ec
-SHA1 (patch-ae) = ba2ed491e0808214814a63748678f84bce8e36f3
+SHA1 (gimp-2.3.15.tar.bz2) = 7447afd00d2940e2dd02edfc92575715d3a52936
+RMD160 (gimp-2.3.15.tar.bz2) = 8c2017dccf188fe2b76e8a15acdc91c338c3457a
+Size (gimp-2.3.15.tar.bz2) = 16080133 bytes
+SHA1 (patch-aa) = d65bd51eabf3fb97693adf52a182642fd5d39f39
+SHA1 (patch-ab) = e09119776d661097efe9cc8eec4ed6ef2b0c3fcb
+SHA1 (patch-ae) = ccdb74067fd88f6b838b4deee69dad68663c8cc5
diff --git a/graphics/gimp24/patches/patch-aa b/graphics/gimp24/patches/patch-aa
index 7190b60090a..884ba772931 100644
--- a/graphics/gimp24/patches/patch-aa
+++ b/graphics/gimp24/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2007/02/05 19:49:06 adam Exp $
+$NetBSD: patch-aa,v 1.10 2007/03/11 20:50:28 adam Exp $
 
---- etc/Makefile.in.orig	2007-01-23 11:49:02.000000000 +0100
+--- etc/Makefile.in.orig	2007-03-08 10:55:17.000000000 +0100
 +++ etc/Makefile.in
-@@ -396,7 +396,7 @@ gimpdatadir = @gimpdatadir@
+@@ -400,7 +400,7 @@ gimpdatadir = @gimpdatadir@
  gimpdir = @gimpdir@
  gimplocaledir = @gimplocaledir@
  gimpplugindir = @gimpplugindir@
diff --git a/graphics/gimp24/patches/patch-ab b/graphics/gimp24/patches/patch-ab
index a461d3bc23b..a38487f078f 100644
--- a/graphics/gimp24/patches/patch-ab
+++ b/graphics/gimp24/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2007/02/05 19:49:06 adam Exp $
+$NetBSD: patch-ab,v 1.10 2007/03/11 20:50:28 adam Exp $
 
---- configure.orig	2007-01-23 11:49:24.000000000 +0100
+--- configure.orig	2007-03-08 10:55:51.000000000 +0100
 +++ configure
-@@ -30969,6 +30969,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -30978,6 +30978,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.9 2007/02/05 19:49:06 adam Exp $
  
        if test $gimp_ok = yes; then
  
-@@ -30977,7 +30978,6 @@ cat >>confdefs.h <<\_ACEOF
+@@ -30986,7 +30987,6 @@ cat >>confdefs.h <<\_ACEOF
  _ACEOF
  
        fi
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.9 2007/02/05 19:49:06 adam Exp $
    { echo "$as_me:$LINENO: result: $gimp_ok" >&5
  echo "${ECHO_T}$gimp_ok" >&6; }
    if test $gimp_ok = no; then
-@@ -32806,7 +32806,7 @@ echo $ECHO_N "checking if libexif is ver
+@@ -32940,7 +32940,7 @@ echo $ECHO_N "checking if libexif is ver
    fi
    { echo "$as_me:$LINENO: result: $have_exif_0_6" >&5
  echo "${ECHO_T}$have_exif_0_6" >&6; }
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.9 2007/02/05 19:49:06 adam Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_EXIF_0_6 1
-@@ -33561,7 +33561,7 @@ else
+@@ -33695,7 +33695,7 @@ else
  fi
  
  
@@ -36,16 +36,7 @@ $NetBSD: patch-ab,v 1.9 2007/02/05 19:49:06 adam Exp $
    BUILD_PRINT_TRUE=
    BUILD_PRINT_FALSE='#'
  else
-@@ -35639,7 +35639,7 @@ else
- fi
- 
- 
--if test "x$have_script_fu" == "xyes"; then
-+if test "x$have_script_fu" = "xyes"; then
-   BUILD_SCRIPT_FU_TRUE=
-   BUILD_SCRIPT_FU_FALSE='#'
- else
-@@ -36042,7 +36042,7 @@ fi
+@@ -36523,7 +36523,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 ceb4b565872..7ae74553d90 100644
--- a/graphics/gimp24/patches/patch-ae
+++ b/graphics/gimp24/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2007/02/05 19:49:06 adam Exp $
+$NetBSD: patch-ae,v 1.5 2007/03/11 20:50:28 adam Exp $
 
---- plug-ins/common/png.c.orig	2007-01-23 11:16:01.000000000 +0100
+--- plug-ins/common/png.c.orig	2007-03-08 10:53:54.000000000 +0100
 +++ plug-ins/common/png.c
-@@ -1019,8 +1019,6 @@ load_image (const gchar *filename,
+@@ -1094,8 +1094,6 @@ load_image (const gchar *filename,
  
    g_free (pixel);
    g_free (pixels);
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.4 2007/02/05 19:49:06 adam Exp $
  
    fclose (fp);
  
-@@ -1478,9 +1476,6 @@ save_image (const gchar *filename,
+@@ -1553,9 +1551,6 @@ save_image (const gchar *filename,
        g_free (text);
      }