Changes 2.8.8:

Core:
 - Make sure indexed images always have a colormap
 - Fix language selection via preferences on Windows
 - Don't crash on setting a large text size

GUI:
 - Keep the same image active when switching between MWM and SWM
 - Make sure all dockables are properly resizable (particularly shrinkable)
 - Add links to jump directly to Save/Export from the Export/Save
   file extension warning dialogs

Libgimp:
 - Fix GimpPickButton on OSX

Plug-ins:
 - Properly document plug-in-autocrop-layer's PDB interface
 - Fix importing of indexed BMPs

General:
 - Fix lots of places to use GIO to get proper file sizes and times on windows
 - Add an AppData file for GIMP
 - Backport lcms2 support from master, because lcms1 is not getting
   bug fixes any longer
 - Lots of bug fixes
 - Lots of translation updates

9 files changed, 23 insertions, 72 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 2df8f714b76..7aa7ff3affd 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.239 2013/10/10 14:41:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.240 2013/11/06 20:32:45 adam Exp $
 
-DISTNAME=	gimp-2.8.6
-PKGREVISION=	5
+DISTNAME=	gimp-2.8.8
 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 9ce834f169a..39150fdb4dd 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.75 2013/10/09 17:39:01 wiz Exp $
+$NetBSD: distinfo,v 1.76 2013/11/06 20:32:45 adam Exp $
 
-SHA1 (gimp-2.8.6.tar.bz2) = 5f94e39b05a0b892f6d4f8b2d773d97d8ea95731
-RMD160 (gimp-2.8.6.tar.bz2) = 573da746b242c9c3f47bb5ed7fa1c5b475d7d700
-Size (gimp-2.8.6.tar.bz2) = 20306442 bytes
-SHA1 (patch-aa) = 8107200cc3007e6ae4b9064ee05e5c9a00cca2ef
-SHA1 (patch-ab) = d2450afa1efb60d6094827e6336b8266eea0bb12
+SHA1 (gimp-2.8.8.tar.bz2) = a97b93d608a8b0cccd0d97da63bee48d40cc4b35
+RMD160 (gimp-2.8.8.tar.bz2) = e8f06db6af449594fcee3ab1249ba59149c8509e
+Size (gimp-2.8.8.tar.bz2) = 20345808 bytes
+SHA1 (patch-aa) = bc998a9510458e1f296c44ae26c8ee3900ce49ab
+SHA1 (patch-ab) = 4fb20b3f77349fb57eb06a2b67a8f0c045055213
 SHA1 (patch-ad) = 7863678d59ccf54e2ce61a4ac4b883fb9eb5fb82
-SHA1 (patch-app_Makefile.in) = 14fe1a47ddfd7b7b22d3eb920759928bfd81aa70
-SHA1 (patch-app_base_base-utils.c) = 18dfa09c1d63530ff79cd4c3515d9f1077182d64
-SHA1 (patch-app_config_Makefile.in) = a2fcebd994831fbe0f911efb84c1fecdf2e59198
-SHA1 (patch-devel-docs_app_Makefile.in) = 1eb97f779d5151b9e89b4ae47afb44d1bb3b6a48
+SHA1 (patch-app_Makefile.in) = 1677fa436f76d0b83bf048447fc025584a255e68
+SHA1 (patch-app_config_Makefile.in) = c5376f98649255b163cf9af448b5931d7675526c
+SHA1 (patch-devel-docs_app_Makefile.in) = 89aec477783899cc6a5ac765d567d73f79474d5e
 SHA1 (patch-plug-ins_common_file-mng.c) = 8ed244997cdef7125e1aa5da4d0fac5068ad5159
 SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = c424b1a8e345ec3d0763ac2cf1f8535da9e10797
-SHA1 (patch-tools_gimptool.c) = ffaf0734e09acfc90e3d9e4a7fa6d6d1deaaab45
diff --git a/graphics/gimp/patches/patch-aa b/graphics/gimp/patches/patch-aa
index 2d700b91146..5c44087f43a 100644
--- a/graphics/gimp/patches/patch-aa
+++ b/graphics/gimp/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.28 2012/05/07 08:40:08 adam Exp $
+$NetBSD: patch-aa,v 1.29 2013/11/06 20:32:45 adam Exp $
 
 --- etc/Makefile.in.orig	2010-06-21 20:00:58.000000000 +0000
 +++ etc/Makefile.in
-@@ -398,7 +398,7 @@ gimpdatadir = @gimpdatadir@
+@@ -436,7 +436,7 @@ gimpdatadir = @gimpdatadir@
  gimpdir = @gimpdir@
  gimplocaledir = @gimplocaledir@
  gimpplugindir = @gimpplugindir@
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
index b6cddc1450a..f5a1584d732 100644
--- a/graphics/gimp/patches/patch-ab
+++ b/graphics/gimp/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.36 2013/02/16 19:43:03 adam Exp $
+$NetBSD: patch-ab,v 1.37 2013/11/06 20:32:45 adam Exp $
 
---- configure.orig	2013-02-05 19:06:40.000000000 +0000
+--- configure.orig	2013-11-03 17:00:19.000000000 +0000
 +++ configure
-@@ -19106,13 +19106,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -19153,13 +19153,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
    gimp_ok=yes
  fi
  rm -f conftest*
@@ -17,16 +17,7 @@ $NetBSD: patch-ab,v 1.36 2013/02/16 19:43:03 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
-@@ -22894,7 +22894,7 @@ fi
-     have_xvfb_run="no (not found)"
-   fi
- fi
-- if test "x$have_xvfb_run" == "xyes"; then
-+ if test "x$have_xvfb_run" = "xyes"; then
-   HAVE_XVFB_RUN_TRUE=
-   HAVE_XVFB_RUN_FALSE='#'
- else
-@@ -23317,7 +23317,7 @@ fi
+@@ -23499,7 +23499,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 667dc1b8c08..d7e99bd4c02 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.3 2013/02/16 19:43:03 adam Exp $
+$NetBSD: patch-app_Makefile.in,v 1.4 2013/11/06 20:32:45 adam Exp $
 
 --- app/Makefile.in.orig	2012-05-02 08:56:34.000000000 +0000
 +++ app/Makefile.in
-@@ -639,33 +639,33 @@ INCLUDES = \
+@@ -702,33 +702,33 @@ INCLUDES = \
  
  # FIXME: core should not depend on xcf
  workaround_that_core_depends_on_xcf = \
diff --git a/graphics/gimp/patches/patch-app_base_base-utils.c b/graphics/gimp/patches/patch-app_base_base-utils.c
deleted file mode 100644
index da5aaf764a9..00000000000
--- a/graphics/gimp/patches/patch-app_base_base-utils.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-app_base_base-utils.c,v 1.1 2012/05/07 08:40:08 adam Exp $
-
---- app/base/base-utils.c.orig	2012-05-07 07:50:39.000000000 +0000
-+++ app/base/base-utils.c
-@@ -33,8 +33,10 @@
- /* For get_backtrace() */
- #include <stdlib.h>
- #include <string.h>
-+#ifdef __linux__
- #include <execinfo.h>
- #endif
-+#endif
- 
- #include "base-utils.h"
- 
-@@ -112,7 +114,7 @@ get_physical_memory_size (void)
- char *
- get_backtrace (void)
- {
--#ifdef G_OS_UNIX
-+#ifdef __linux__
-   void     *functions[MAX_FUNC];
-   char    **function_names;
-   int       n_functions;
diff --git a/graphics/gimp/patches/patch-app_config_Makefile.in b/graphics/gimp/patches/patch-app_config_Makefile.in
index 21a81d79b67..6a7cefb8c91 100644
--- a/graphics/gimp/patches/patch-app_config_Makefile.in
+++ b/graphics/gimp/patches/patch-app_config_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-app_config_Makefile.in,v 1.2 2012/05/07 08:40:08 adam Exp $
+$NetBSD: patch-app_config_Makefile.in,v 1.3 2013/11/06 20:32:45 adam Exp $
 
 --- app/config/Makefile.in.orig	2012-05-02 08:56:34.000000000 +0000
 +++ app/config/Makefile.in
-@@ -522,15 +522,15 @@ test_config_DEPENDENCIES = $(gimpconfig_
+@@ -783,15 +783,15 @@ test_config_DEPENDENCIES = $(gimpconfig_
  # We need this due to circular dependencies, see more detailed
  # comments about it in app/Makefile.am
  test_config_LDFLAGS = \
diff --git a/graphics/gimp/patches/patch-devel-docs_app_Makefile.in b/graphics/gimp/patches/patch-devel-docs_app_Makefile.in
index 2d02d2bcd2b..ff627116b2d 100644
--- a/graphics/gimp/patches/patch-devel-docs_app_Makefile.in
+++ b/graphics/gimp/patches/patch-devel-docs_app_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-devel-docs_app_Makefile.in,v 1.2 2012/05/07 08:40:08 adam Exp $
+$NetBSD: patch-devel-docs_app_Makefile.in,v 1.3 2013/11/06 20:32:45 adam Exp $
 
 --- devel-docs/app/Makefile.in.orig	2012-04-27 17:59:56.000000000 +0000
 +++ devel-docs/app/Makefile.in
-@@ -473,10 +473,10 @@ GTKDOC_CFLAGS = \
+@@ -511,10 +511,10 @@ GTKDOC_CFLAGS = \
  	-UGTK_DISABLE_SINGLE_INCLUDES
  
  GTKDOC_LIBS = \
diff --git a/graphics/gimp/patches/patch-tools_gimptool.c b/graphics/gimp/patches/patch-tools_gimptool.c
deleted file mode 100644
index 96e041f9809..00000000000
--- a/graphics/gimp/patches/patch-tools_gimptool.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-tools_gimptool.c,v 1.1 2013/09/10 14:19:46 joerg Exp $
-
---- tools/gimptool.c.orig	2013-09-10 10:01:04.000000000 +0000
-+++ tools/gimptool.c
-@@ -263,7 +263,7 @@ find_out_env_flags (void)
-   else
-     env_cc = CC;
- 
--  if (g_ascii_strncasecmp (env_cc, "cl", 2) == 0)
-+  if (g_ascii_strncasecmp (env_cc, "cl", 2) == 0 && !g_ascii_strncasecmp (env_cc, "clang", 5) == 0)
-     msvc_syntax = TRUE;
- 
-   if ((p = getenv ("CFLAGS")) != NULL)