GIMP 2.8.4

Core:
 - Move the OSX gimpdir to "~/Library/Application Support"

GUI:
 - Better names for the default filters in save and export
 - Make tool drawing (esp. the brush outline) much more responsive
 - Remember the "maximized" state across sessions
 - Simplify the splash image code a lot, makes it appear immediately again
 - Allow the text tool to start on an image without layers
 - Various fixes for text style attribute handling
 - Set unconfigured input devices to eraser if GTK+ says they are erasers
 - Make language selectable in Preferences on OSX

Libgimp:
 - Make libgimp drawable combo boxes aware of layer groups
 - Make sure plug-in windows appear on top on OSX
 - Fix item width in GimpPageSelector (used e.g. in PDF import)

Plug-ins:
 - Better default values in the Drop Shadow script
 - Fix a whole bunch of bugs in the BMP plug-in
 - On OSX, use the system's screenshot utility

Installer:
 - Add Brazilian-Portuguese translation to the Windows installer

Source and build system:
 - Many improvements to the OSX bundle build system
 - Support automake 1.13

General:
 - Lots of bug fixes
 - Lots of translation updates

6 files changed, 18 insertions, 184 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index b9f250688e1..d95cbe4d2d4 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.228 2013/02/16 11:18:12 wiz Exp $
+# $NetBSD: Makefile,v 1.229 2013/02/16 19:43:02 adam Exp $
 
-DISTNAME=	gimp-2.8.2
-PKGREVISION=	9
+DISTNAME=	gimp-2.8.4
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/ \
 		${MASTER_SITE_GNU:=gimp/v${PKGVERSION_NOREV:R}/} \
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 89be1fa6679..f9393c35b04 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.71 2012/11/27 11:13:48 drochner Exp $
+$NetBSD: distinfo,v 1.72 2013/02/16 19:43:02 adam Exp $
 
-SHA1 (gimp-2.8.2.tar.bz2) = 64ad90cedc5e8e348310b6eb6b7821ec110c0886
-RMD160 (gimp-2.8.2.tar.bz2) = 353cf862302417c35df902618a3ba05ac0b3af41
-Size (gimp-2.8.2.tar.bz2) = 20161424 bytes
+SHA1 (gimp-2.8.4.tar.bz2) = dc472fc3ecfadd70002c2bb3aa959172e812796e
+RMD160 (gimp-2.8.4.tar.bz2) = 75cd2eded1949edefc1f6717d4785090c29a50f9
+Size (gimp-2.8.4.tar.bz2) = 20214383 bytes
 SHA1 (patch-aa) = 8107200cc3007e6ae4b9064ee05e5c9a00cca2ef
-SHA1 (patch-ab) = 609c6488768f9d628e6f09ede216fef7db99721c
+SHA1 (patch-ab) = d2450afa1efb60d6094827e6336b8266eea0bb12
 SHA1 (patch-ad) = 7863678d59ccf54e2ce61a4ac4b883fb9eb5fb82
-SHA1 (patch-app_Makefile.in) = efbd9e592cdbc154e5a6402279c7d54f3946c65c
+SHA1 (patch-app_Makefile.in) = 14fe1a47ddfd7b7b22d3eb920759928bfd81aa70
 SHA1 (patch-app_base_base-utils.c) = 18dfa09c1d63530ff79cd4c3515d9f1077182d64
 SHA1 (patch-app_config_Makefile.in) = a2fcebd994831fbe0f911efb84c1fecdf2e59198
-SHA1 (patch-bug687392) = 5cc488323c8761521cb3880f2a0d7376d6acd136
 SHA1 (patch-devel-docs_app_Makefile.in) = 1eb97f779d5151b9e89b4ae47afb44d1bb3b6a48
-SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = 4932d82711c8010cf7b1ff5bfb12031946273c2b
+SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = c424b1a8e345ec3d0763ac2cf1f8535da9e10797
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
index aa72f819a7c..b6cddc1450a 100644
--- a/graphics/gimp/patches/patch-ab
+++ b/graphics/gimp/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.35 2012/09/07 19:16:45 adam Exp $
+$NetBSD: patch-ab,v 1.36 2013/02/16 19:43:03 adam Exp $
 
---- configure.orig	2012-08-23 18:41:09.000000000 +0000
+--- configure.orig	2013-02-05 19:06:40.000000000 +0000
 +++ configure
-@@ -19098,13 +19098,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -19106,13 +19106,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
    gimp_ok=yes
  fi
  rm -f conftest*
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.35 2012/09/07 19:16:45 adam Exp $
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gimp_ok" >&5
  $as_echo "$gimp_ok" >&6; }
    if test "x$gimp_ok" = xno; then
-@@ -22886,7 +22886,7 @@ fi
+@@ -22894,7 +22894,7 @@ fi
      have_xvfb_run="no (not found)"
    fi
  fi
@@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.35 2012/09/07 19:16:45 adam Exp $
    HAVE_XVFB_RUN_TRUE=
    HAVE_XVFB_RUN_FALSE='#'
  else
-@@ -23309,7 +23309,7 @@ fi
+@@ -23317,7 +23317,7 @@ fi
  
  gimpdatadir="$datadir/$PACKAGE/2.0"
  gimpplugindir="$libdir/$PACKAGE/2.0"
diff --git a/graphics/gimp/patches/patch-app_Makefile.in b/graphics/gimp/patches/patch-app_Makefile.in
index c35ae3ddc3b..667dc1b8c08 100644
--- a/graphics/gimp/patches/patch-app_Makefile.in
+++ b/graphics/gimp/patches/patch-app_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-app_Makefile.in,v 1.2 2012/05/07 08:40:08 adam Exp $
+$NetBSD: patch-app_Makefile.in,v 1.3 2013/02/16 19:43:03 adam Exp $
 
 --- app/Makefile.in.orig	2012-05-02 08:56:34.000000000 +0000
 +++ app/Makefile.in
-@@ -638,33 +638,33 @@ INCLUDES = \
+@@ -639,33 +639,33 @@ INCLUDES = \
  
  # FIXME: core should not depend on xcf
  workaround_that_core_depends_on_xcf = \
diff --git a/graphics/gimp/patches/patch-bug687392 b/graphics/gimp/patches/patch-bug687392
deleted file mode 100644
index 6890390ac36..00000000000
--- a/graphics/gimp/patches/patch-bug687392
+++ /dev/null
@@ -1,164 +0,0 @@
-$NetBSD: patch-bug687392,v 1.2 2012/11/27 11:13:49 drochner Exp $
-
-CVE-2012-5576
-
---- plug-ins/common/file-xwd.c.orig	2012-03-12 19:18:10.000000000 +0000
-+++ plug-ins/common/file-xwd.c
-@@ -186,11 +186,13 @@ static gint32 load_xwd_f2_d16_b16 (const
- static gint32 load_xwd_f2_d24_b32 (const gchar *,
-                                    FILE *,
-                                    L_XWDFILEHEADER *,
--                                   L_XWDCOLOR *);
-+                                   L_XWDCOLOR *,
-+                                   GError **);
- static gint32 load_xwd_f1_d24_b1  (const gchar *,
-                                    FILE *,
-                                    L_XWDFILEHEADER *,
--                                   L_XWDCOLOR *);
-+                                   L_XWDCOLOR *,
-+                                   GError **);
- 
- static L_CARD32 read_card32  (FILE *,
-                               gint *);
-@@ -540,7 +542,8 @@ load_image (const gchar  *filename,
-     case 1:    /* Single plane pixmap */
-       if ((depth <= 24) && (bpp == 1))
-         {
--          image_ID = load_xwd_f1_d24_b1 (filename, ifp, &xwdhdr, xwdcolmap);
-+          image_ID = load_xwd_f1_d24_b1 (filename, ifp, &xwdhdr, xwdcolmap,
-+                                         error);
-         }
-       break;
- 
-@@ -559,7 +562,8 @@ load_image (const gchar  *filename,
-         }
-       else if ((depth <= 24) && ((bpp == 24) || (bpp == 32)))
-         {
--          image_ID = load_xwd_f2_d24_b32 (filename, ifp, &xwdhdr, xwdcolmap);
-+          image_ID = load_xwd_f2_d24_b32 (filename, ifp, &xwdhdr, xwdcolmap,
-+                                          error);
-         }
-       break;
-     }
-@@ -570,7 +574,7 @@ load_image (const gchar  *filename,
-   if (xwdcolmap)
-     g_free (xwdcolmap);
- 
--  if (image_ID == -1)
-+  if (image_ID == -1 && ! (error && *error))
-     g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                  _("XWD-file %s has format %d, depth %d and bits per pixel %d. "
-                    "Currently this is not supported."),
-@@ -1624,10 +1628,11 @@ load_xwd_f2_d16_b16 (const gchar     *fi
- /* Load XWD with pixmap_format 2, pixmap_depth up to 24, bits_per_pixel 24/32 */
- 
- static gint32
--load_xwd_f2_d24_b32 (const gchar     *filename,
--                     FILE            *ifp,
--                     L_XWDFILEHEADER *xwdhdr,
--                     L_XWDCOLOR      *xwdcolmap)
-+load_xwd_f2_d24_b32 (const gchar      *filename,
-+                     FILE             *ifp,
-+                     L_XWDFILEHEADER  *xwdhdr,
-+                     L_XWDCOLOR       *xwdcolmap,
-+                     GError          **error)
- {
-   register guchar *dest, lsbyte_first;
-   gint             width, height, linepad, i, j, c0, c1, c2, c3;
-@@ -1652,12 +1657,6 @@ load_xwd_f2_d24_b32 (const gchar     *fi
-   width  = xwdhdr->l_pixmap_width;
-   height = xwdhdr->l_pixmap_height;
- 
--  image_ID = create_new_image (filename, width, height, GIMP_RGB,
--                               &layer_ID, &drawable, &pixel_rgn);
--
--  tile_height = gimp_tile_height ();
--  data = g_malloc (tile_height * width * 3);
--
-   redmask   = xwdhdr->l_red_mask;
-   greenmask = xwdhdr->l_green_mask;
-   bluemask  = xwdhdr->l_blue_mask;
-@@ -1685,6 +1684,22 @@ load_xwd_f2_d24_b32 (const gchar     *fi
-   maxblue = 0; while (bluemask >> (blueshift + maxblue)) maxblue++;
-   maxblue = (1 << maxblue) - 1;
- 
-+  if (maxred   > sizeof (redmap)   ||
-+      maxgreen > sizeof (greenmap) ||
-+      maxblue  > sizeof (bluemap))
-+    {
-+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+                   _("XWD-file %s is corrupt."),
-+                   gimp_filename_to_utf8 (filename));
-+      return -1;
-+    }
-+
-+  image_ID = create_new_image (filename, width, height, GIMP_RGB,
-+                               &layer_ID, &drawable, &pixel_rgn);
-+
-+  tile_height = gimp_tile_height ();
-+  data = g_malloc (tile_height * width * 3);
-+
-   /* Set map-arrays for red, green, blue */
-   for (red = 0; red <= maxred; red++)
-     redmap[red] = (red * 255) / maxred;
-@@ -1825,10 +1840,11 @@ load_xwd_f2_d24_b32 (const gchar     *fi
- /* Load XWD with pixmap_format 1, pixmap_depth up to 24, bits_per_pixel 1 */
- 
- static gint32
--load_xwd_f1_d24_b1 (const gchar     *filename,
--                    FILE            *ifp,
--                    L_XWDFILEHEADER *xwdhdr,
--                    L_XWDCOLOR      *xwdcolmap)
-+load_xwd_f1_d24_b1 (const gchar      *filename,
-+                    FILE             *ifp,
-+                    L_XWDFILEHEADER  *xwdhdr,
-+                    L_XWDCOLOR       *xwdcolmap,
-+                    GError          **error)
- {
-   register guchar *dest, outmask, inmask, do_reverse;
-   gint             width, height, i, j, plane, fromright;
-@@ -1863,13 +1879,6 @@ load_xwd_f1_d24_b1 (const gchar     *fil
-   indexed         = (xwdhdr->l_pixmap_depth <= 8);
-   bytes_per_pixel = (indexed ? 1 : 3);
- 
--  image_ID = create_new_image (filename, width, height,
--                               indexed ? GIMP_INDEXED : GIMP_RGB,
--                               &layer_ID, &drawable, &pixel_rgn);
--
--  tile_height = gimp_tile_height ();
--  data = g_malloc (tile_height * width * bytes_per_pixel);
--
-   for (j = 0; j < 256; j++)   /* Create an array for reversing bits */
-     {
-       inmask = 0;
-@@ -1913,6 +1922,16 @@ load_xwd_f1_d24_b1 (const gchar     *fil
-       maxblue = 0; while (bluemask >> (blueshift + maxblue)) maxblue++;
-       maxblue = (1 << maxblue) - 1;
- 
-+      if (maxred   > sizeof (redmap)   ||
-+          maxgreen > sizeof (greenmap) ||
-+          maxblue  > sizeof (bluemap))
-+        {
-+          g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+                       _("XWD-file %s is corrupt."),
-+                       gimp_filename_to_utf8 (filename));
-+          return -1;
-+        }
-+
-       /* Set map-arrays for red, green, blue */
-       for (red = 0; red <= maxred; red++)
-         redmap[red] = (red * 255) / maxred;
-@@ -1922,6 +1941,13 @@ load_xwd_f1_d24_b1 (const gchar     *fil
-         bluemap[blue] = (blue * 255) / maxblue;
-     }
- 
-+  image_ID = create_new_image (filename, width, height,
-+                               indexed ? GIMP_INDEXED : GIMP_RGB,
-+                               &layer_ID, &drawable, &pixel_rgn);
-+
-+  tile_height = gimp_tile_height ();
-+  data = g_malloc (tile_height * width * bytes_per_pixel);
-+
-   ncols = xwdhdr->l_colormap_entries;
-   if (xwdhdr->l_ncolors < ncols)
-     ncols = xwdhdr->l_ncolors;
diff --git a/graphics/gimp/patches/patch-plug-ins_script-fu_script-fu-server.c b/graphics/gimp/patches/patch-plug-ins_script-fu_script-fu-server.c
index 7750c483902..0e70a870f44 100644
--- a/graphics/gimp/patches/patch-plug-ins_script-fu_script-fu-server.c
+++ b/graphics/gimp/patches/patch-plug-ins_script-fu_script-fu-server.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-plug-ins_script-fu_script-fu-server.c,v 1.2 2012/05/07 08:40:08 adam Exp $
+$NetBSD: patch-plug-ins_script-fu_script-fu-server.c,v 1.3 2013/02/16 19:43:03 adam Exp $
 
 AI_ADDRCONFIG is not defined on some platforms.
 
 --- plug-ins/script-fu/script-fu-server.c.orig	2012-02-04 18:42:45.000000000 +0000
 +++ plug-ins/script-fu/script-fu-server.c
-@@ -456,7 +456,11 @@ server_start (gint         port,
+@@ -460,7 +460,11 @@ server_start (gint         port,
    const gchar     *progress;
  
    memset (&hints, 0, sizeof (hints));