Changes 2.3.14:

- added actions to control brush spacing
- polished appearance of image window
- scale the brush's spacing when scaling the brush
- save tool presets when they are changed
- improved handling of vectors in the Python bindings
- allow for auto-cropping the result of the transform tools
- added GimpRatioEntry widget and use it in the rectangle tool options
- added functions to transform between preview and image coordinates
- added PDB functions to validate display, drawable, image and vectors IDs
- added HSL color model to Decompose and Compose plug-ins
- further improved status bar messages for tools
- on systems with D-Bus build gimp-remote functionality into gimp executable
- bug fixes and code cleanup

7 files changed, 36 insertions, 45 deletions

diff --git a/graphics/gimp24/Makefile b/graphics/gimp24/Makefile
index a416adba2b7..2776c72757b 100644
--- a/graphics/gimp24/Makefile
+++ b/graphics/gimp24/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2007/01/24 19:48:30 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2007/02/05 19:49:06 adam Exp $
 
-DISTNAME=	gimp-2.3.13
-PKGREVISION=	3
+DISTNAME=	gimp-2.3.14
 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 5f6c547601c..ddd7057f0ef 100644
--- a/graphics/gimp24/PLIST
+++ b/graphics/gimp24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2007/01/24 19:48:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2007/02/05 19:49:06 adam Exp $
 bin/gimp-2.3
 bin/gimp-console-2.3
 ${REMOTE}bin/gimp-remote-2.3
@@ -193,6 +193,7 @@ include/gimp-2.0/libgimpwidgets/gimppreview.h
 include/gimp-2.0/libgimpwidgets/gimppreviewarea.h
 include/gimp-2.0/libgimpwidgets/gimppropwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpquerybox.h
+include/gimp-2.0/libgimpwidgets/gimpratioentry.h
 include/gimp-2.0/libgimpwidgets/gimpresolutionentry.h
 include/gimp-2.0/libgimpwidgets/gimpscrolledpreview.h
 include/gimp-2.0/libgimpwidgets/gimpsizeentry.h
@@ -1001,7 +1002,6 @@ share/gtk-doc/html/libgimp/GimpProcBrowserDialog.html
 share/gtk-doc/html/libgimp/GimpProgressBar.html
 share/gtk-doc/html/libgimp/GimpSelectButton.html
 share/gtk-doc/html/libgimp/GimpZoomPreview.html
-share/gtk-doc/html/libgimp/gimpdefinitions.html
 share/gtk-doc/html/libgimp/home.png
 share/gtk-doc/html/libgimp/index.html
 share/gtk-doc/html/libgimp/index.sgml
@@ -1239,6 +1239,7 @@ share/gtk-doc/html/libgimpwidgets/GimpPickButton.html
 share/gtk-doc/html/libgimpwidgets/GimpPixmap.html
 share/gtk-doc/html/libgimpwidgets/GimpPreview.html
 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/GimpUnitMenu.html
@@ -1263,6 +1264,7 @@ share/gtk-doc/html/libgimpwidgets/gimp-page-selector.png
 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-unit-menu.png
 share/gtk-doc/html/libgimpwidgets/home.png
 share/gtk-doc/html/libgimpwidgets/index.html
@@ -1458,8 +1460,8 @@ share/gtk-doc/html/libgimpwidgets/stock-portrait-22.png
 share/gtk-doc/html/libgimpwidgets/stock-print-resolution-16.png
 share/gtk-doc/html/libgimpwidgets/stock-print-resolution-24.png
 share/gtk-doc/html/libgimpwidgets/stock-question-64.png
-share/gtk-doc/html/libgimpwidgets/stock-quick-mask-off-16.png
-share/gtk-doc/html/libgimpwidgets/stock-quick-mask-on-16.png
+share/gtk-doc/html/libgimpwidgets/stock-quick-mask-off-12.png
+share/gtk-doc/html/libgimpwidgets/stock-quick-mask-on-12.png
 share/gtk-doc/html/libgimpwidgets/stock-reset-16.png
 share/gtk-doc/html/libgimpwidgets/stock-reshow-filter-16.png
 share/gtk-doc/html/libgimpwidgets/stock-resize-16.png
@@ -1672,6 +1674,12 @@ share/locale/en_GB/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/en_GB/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/en_GB/LC_MESSAGES/gimp20-tips.mo
 share/locale/en_GB/LC_MESSAGES/gimp20.mo
+share/locale/eo/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/eo/LC_MESSAGES/gimp20-python.mo
+share/locale/eo/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/eo/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/eo/LC_MESSAGES/gimp20-tips.mo
+share/locale/eo/LC_MESSAGES/gimp20.mo
 share/locale/es/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/es/LC_MESSAGES/gimp20-python.mo
 share/locale/es/LC_MESSAGES/gimp20-script-fu.mo
diff --git a/graphics/gimp24/distinfo b/graphics/gimp24/distinfo
index d96fe3cd0b9..78a55f3591a 100644
--- a/graphics/gimp24/distinfo
+++ b/graphics/gimp24/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.12 2006/12/06 15:42:30 minskim Exp $
+$NetBSD: distinfo,v 1.13 2007/02/05 19:49:06 adam Exp $
 
-SHA1 (gimp-2.3.13.tar.bz2) = 6f222f1a851a21e603f34ec925ddd15b7ad848c2
-RMD160 (gimp-2.3.13.tar.bz2) = a12f99ceca3c55af03b04b6b16ef1266f31b1b02
-Size (gimp-2.3.13.tar.bz2) = 15855459 bytes
-SHA1 (patch-aa) = a0b231711000429af0838d3e2c535227d201af34
-SHA1 (patch-ab) = c4f4aa170f9453fd92a54858c3440b0402c61809
-SHA1 (patch-ac) = b0f595fe75685d9202c634661c45e033a43715b8
-SHA1 (patch-ae) = 62edb4f0849e9baed7f10e39a1f2e87c551fca6f
+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
diff --git a/graphics/gimp24/patches/patch-aa b/graphics/gimp24/patches/patch-aa
index 28cb71a355d..7190b60090a 100644
--- a/graphics/gimp24/patches/patch-aa
+++ b/graphics/gimp24/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2006/11/30 23:41:35 adam Exp $
+$NetBSD: patch-aa,v 1.9 2007/02/05 19:49:06 adam Exp $
 
---- etc/Makefile.in.orig	2006-11-23 21:16:32.000000000 +0100
+--- etc/Makefile.in.orig	2007-01-23 11:49:02.000000000 +0100
 +++ etc/Makefile.in
-@@ -392,7 +392,7 @@ gimpdatadir = @gimpdatadir@
+@@ -396,7 +396,7 @@ gimpdatadir = @gimpdatadir@
  gimpdir = @gimpdir@
  gimplocaledir = @gimplocaledir@
  gimpplugindir = @gimpplugindir@
diff --git a/graphics/gimp24/patches/patch-ab b/graphics/gimp24/patches/patch-ab
index 1278636b9cc..a461d3bc23b 100644
--- a/graphics/gimp24/patches/patch-ab
+++ b/graphics/gimp24/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2006/11/30 23:41:35 adam Exp $
+$NetBSD: patch-ab,v 1.9 2007/02/05 19:49:06 adam Exp $
 
---- configure.orig	2006-11-23 21:16:53.000000000 +0100
+--- configure.orig	2007-01-23 11:49:24.000000000 +0100
 +++ configure
-@@ -33110,6 +33110,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -30969,6 +30969,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.8 2006/11/30 23:41:35 adam Exp $
  
        if test $gimp_ok = yes; then
  
-@@ -33118,7 +33119,6 @@ cat >>confdefs.h <<\_ACEOF
+@@ -30977,7 +30978,6 @@ cat >>confdefs.h <<\_ACEOF
  _ACEOF
  
        fi
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.8 2006/11/30 23:41:35 adam Exp $
    { echo "$as_me:$LINENO: result: $gimp_ok" >&5
  echo "${ECHO_T}$gimp_ok" >&6; }
    if test $gimp_ok = no; then
-@@ -35211,7 +35211,7 @@ echo $ECHO_N "checking if libexif is ver
+@@ -32806,7 +32806,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.8 2006/11/30 23:41:35 adam Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_EXIF_0_6 1
-@@ -36034,7 +36034,7 @@ else
+@@ -33561,7 +33561,7 @@ else
  fi
  
  
@@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.8 2006/11/30 23:41:35 adam Exp $
    BUILD_PRINT_TRUE=
    BUILD_PRINT_FALSE='#'
  else
-@@ -38106,7 +38106,7 @@ else
+@@ -35639,7 +35639,7 @@ else
  fi
  
  
@@ -45,7 +45,7 @@ $NetBSD: patch-ab,v 1.8 2006/11/30 23:41:35 adam Exp $
    BUILD_SCRIPT_FU_TRUE=
    BUILD_SCRIPT_FU_FALSE='#'
  else
-@@ -38516,7 +38516,7 @@ fi
+@@ -36042,7 +36042,7 @@ fi
  
  gimpdatadir="$datadir/$PACKAGE/2.0"
  gimpplugindir="$libdir/$PACKAGE/2.0"
diff --git a/graphics/gimp24/patches/patch-ac b/graphics/gimp24/patches/patch-ac
deleted file mode 100644
index f0591d282a3..00000000000
--- a/graphics/gimp24/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2006/12/06 15:42:30 minskim Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=382929
-
---- plug-ins/common/xpm.c.orig	2006-05-19 01:56:59.000000000 -0700
-+++ plug-ins/common/xpm.c
-@@ -49,7 +49,7 @@ Previous...Inherited code from Ray Lehti
- 
- #include <gdkconfig.h>		/* For GDK_WINDOWING_WIN32 */
- 
--#ifdef GDK_WINDOWING_WIN32
-+#ifndef GDK_WINDOWING_X11
- #ifndef XPM_NO_X
- #define XPM_NO_X
- #endif
diff --git a/graphics/gimp24/patches/patch-ae b/graphics/gimp24/patches/patch-ae
index 9b86905b58e..ceb4b565872 100644
--- a/graphics/gimp24/patches/patch-ae
+++ b/graphics/gimp24/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2006/09/10 22:59:16 adam Exp $
+$NetBSD: patch-ae,v 1.4 2007/02/05 19:49:06 adam Exp $
 
---- plug-ins/common/png.c.orig	2006-09-01 13:14:34.000000000 +0200
+--- plug-ins/common/png.c.orig	2007-01-23 11:16:01.000000000 +0100
 +++ plug-ins/common/png.c
-@@ -1017,8 +1017,6 @@ load_image (const gchar *filename,
+@@ -1019,8 +1019,6 @@ load_image (const gchar *filename,
  
    g_free (pixel);
    g_free (pixels);
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.3 2006/09/10 22:59:16 adam Exp $
  
    fclose (fp);
  
-@@ -1476,9 +1474,6 @@ save_image (const gchar *filename,
+@@ -1478,9 +1476,6 @@ save_image (const gchar *filename,
        g_free (text);
      }