Pullup ticket 1768 - requested by ghen

security update for gimp

Revisions pulled up:
- pkgsrc/graphics/gimp/Makefile			1.143
- pkgsrc/graphics/gimp/PLIST			1.25
- pkgsrc/graphics/gimp/buildlink3.mk		1.13
- pkgsrc/graphics/gimp/distinfo			1.30
- pkgsrc/graphics/gimp/patches/patch-aa		1.16
- pkgsrc/graphics/gimp/patches/patch-ab		1.17
- pkgsrc/graphics/gimp/patches/patch-ac		removed
- pkgsrc/graphics/gimp/patches/patch-ae		removed
- pkgsrc/graphics/gimp/patches/patch-af		removed
- pkgsrc/graphics/gimp/patches/patch-ag		removed
- pkgsrc/graphics/gimp/patches/patch-ah		removed

   Module Name:		pkgsrc
   Committed By:	adam
   Date:		Mon Jul 10 22:06:32 UTC 2006

   Modified Files:
   	pkgsrc/graphics/gimp: Makefile PLIST buildlink3.mk distinfo
   	pkgsrc/graphics/gimp/patches: patch-aa patch-ab
   Removed Files:
   	pkgsrc/graphics/gimp/patches: patch-ae patch-ac patch-af
					patch-ag patch-ah

   Log Message:
   Changes 2.2.12:
   - fixed display problem in the Animation Playback plug-in
   - fixed misbehaviour of the user installation dialog
   - make sure that session-managed windows are mapped completely inside a
     monitor
   - don't use long deprecated libpng API
   - fixed possible segfault when closing image while saving it
   - halt tools when the image mode changes
   - fixed problem in Scale and Resize widgets
   - fixed wrong offset in transform PDB functions
   - fixed bugs in the Dicom load plug-in
   - make sure text widgets get all key events first
   - fixed problems with default values in the PNG save plug-in
   - fixed Save As dialog not displaying the filename
   - fixed compilation problem with gcc 4.1
   - plugged a possible buffer overrun in the XCF parser
   - don't save image parasites twice in XCF files

11 files changed, 25 insertions, 146 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index bd142b958ab..59fd0936f8b 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.140 2006/04/18 20:24:48 tron Exp $
+# $NetBSD: Makefile,v 1.140.2.1 2006/08/01 15:10:50 salo Exp $
 
-DISTNAME=	gimp-2.2.11
-PKGREVISION=	2
+DISTNAME=	gimp-2.2.12
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/v2.2/ \
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index e1d2328bc75..56c09a5599d 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2006/04/17 07:07:20 jlam Exp $
+@comment $NetBSD: PLIST,v 1.23.2.1 2006/08/01 15:10:50 salo Exp $
 bin/gimp
 bin/gimp-2.2
 bin/gimp-remote
@@ -545,7 +545,6 @@ share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-GimpHelpUI.html
 share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-GimpQueryBox.html
 share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-GimpScrolledPreview.html
 share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-GimpStock.html
-share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-GimpStock.html~
 share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-GimpWidgets.html
 share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-cell-renderers.html
 share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-colordisplay.html
@@ -557,6 +556,7 @@ share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-hierarchy.html
 share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-utils.html
 share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-widgets.html
 share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets.devhelp
+share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets.devhelp2
 share/doc/${PKGNAME}/libgimpwidgets/right.png
 share/doc/${PKGNAME}/libgimpwidgets/stock-anchor-16.png
 share/doc/${PKGNAME}/libgimpwidgets/stock-cap-butt-16.png
diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk
index eb7e964f68a..1b24b370409 100644
--- a/graphics/gimp/buildlink3.mk
+++ b/graphics/gimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10.2.1 2006/08/01 15:10:50 salo Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIMP_BUILDLINK3_MK:=	${GIMP_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gimp
 
 .if !empty(GIMP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gimp+=	gimp>=2.2.9nb1
-BUILDLINK_ABI_DEPENDS.gimp?=	gimp>=2.2.11nb1
+BUILDLINK_ABI_DEPENDS.gimp+=	gimp>=2.2.11nb1
 BUILDLINK_PKGSRCDIR.gimp?=	../../graphics/gimp
 .endif	# GIMP_BUILDLINK3_MK
 
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 32db9a8b93d..00962b1e829 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.29 2006/06/26 21:12:53 wiz Exp $
+$NetBSD: distinfo,v 1.29.2.1 2006/08/01 15:10:50 salo Exp $
 
-SHA1 (gimp-2.2.11.tar.bz2) = 11d22fb8448a87968e03cacf7f30cd7f6725d7c3
-RMD160 (gimp-2.2.11.tar.bz2) = 0304a859d53e4e6b7520b5e8634e64e07911eeba
-Size (gimp-2.2.11.tar.bz2) = 12854751 bytes
-SHA1 (patch-aa) = 269ef6f5a7744b8e5ee546140ca0076456df3b97
-SHA1 (patch-ab) = 3709d31062dec70daa09399f05fa61f91ed843b8
-SHA1 (patch-ac) = 796018e782611b71d68c365bf9dc2ab56126c2fa
+SHA1 (gimp-2.2.12.tar.bz2) = f0368b069e0230e0411a18e7cb6f5fcc30325f1a
+RMD160 (gimp-2.2.12.tar.bz2) = 31a4ee1344f799619dd9b38ea78e8748556fe7cb
+Size (gimp-2.2.12.tar.bz2) = 12875447 bytes
+SHA1 (patch-aa) = 027e376c60279a561f55f22e55a8af09b6b3bd67
+SHA1 (patch-ab) = 641bbb1fdc93cd38fcb5250b1a13f7043c2baab9
 SHA1 (patch-ad) = 632c34e0fbeda69139b2b674d9c5ef80db40dcca
-SHA1 (patch-ae) = 680bc442dbcc8ebe7059dcf2e24e3dde2922c3d2
-SHA1 (patch-af) = 8122d4e5669c99c319e7a37dbad11c636967c77e
-SHA1 (patch-ag) = db5a55f6f37820bc2771851d73d36535a508b12c
-SHA1 (patch-ah) = 034eeae7ba6fa199db40dedd70ecc17a30a1ed95
diff --git a/graphics/gimp/patches/patch-aa b/graphics/gimp/patches/patch-aa
index ee869068773..195ff63a098 100644
--- a/graphics/gimp/patches/patch-aa
+++ b/graphics/gimp/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.15 2006/04/14 10:02:31 adam Exp $
+$NetBSD: patch-aa,v 1.15.2.1 2006/08/01 15:10:50 salo Exp $
 
---- etc/Makefile.in.orig	2006-04-13 13:34:47.000000000 +0200
+--- etc/Makefile.in.orig	2006-06-22 12:52:52.000000000 +0200
 +++ etc/Makefile.in
-@@ -368,7 +368,7 @@ exec_prefix = @exec_prefix@
+@@ -366,7 +366,7 @@ exec_prefix = @exec_prefix@
  gimpdatadir = @gimpdatadir@
  gimpdir = @gimpdir@
  gimpplugindir = @gimpplugindir@
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
index 9a6f9c99907..7a487f96ec3 100644
--- a/graphics/gimp/patches/patch-ab
+++ b/graphics/gimp/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.16 2006/04/14 10:02:31 adam Exp $
+$NetBSD: patch-ab,v 1.16.2.1 2006/08/01 15:10:50 salo Exp $
 
---- configure.orig	2006-04-13 13:35:11.000000000 +0200
+--- configure.orig	2006-06-22 12:53:13.000000000 +0200
 +++ configure
-@@ -28438,8 +28438,16 @@ if test "x$enable_altivec" = xyes; then
-   echo "$as_me:$LINENO: checking whether we can compile Altivec code" >&5
- echo $ECHO_N "checking whether we can compile Altivec code... $ECHO_C" >&6
+@@ -30835,8 +30835,16 @@ if test "x$enable_altivec" = xyes; then
+   { echo "$as_me:$LINENO: checking whether we can compile Altivec code" >&5
+ echo $ECHO_N "checking whether we can compile Altivec code... $ECHO_C" >&6; }
  
 +  gimp_save_CFLAGS=$CFLAGS
 +  case `uname` in
@@ -19,17 +19,17 @@ $NetBSD: patch-ab,v 1.16 2006/04/14 10:02:31 adam Exp $
 +asm ("vand v0, v0, v0");
  _ACEOF
  rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28479,7 +28487,7 @@ enable_altivec=no
- echo "${ECHO_T}no" >&6
+ if { (ac_try="$ac_compile"
+@@ -30889,7 +30897,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ echo "${ECHO_T}no" >&6; }
      { echo "$as_me:$LINENO: WARNING: The assembler does not support the Altivec command set." >&5
  echo "$as_me: WARNING: The assembler does not support the Altivec command set." >&2;}
 -
 +    CFLAGS=$gimp_save_CFLAGS
  fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
-@@ -34436,7 +34444,7 @@ fi;
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -37474,7 +37482,7 @@ fi
  
  gimpdatadir="$datadir/$PACKAGE/2.0"
  gimpplugindir="$libdir/$PACKAGE/2.0"
diff --git a/graphics/gimp/patches/patch-ac b/graphics/gimp/patches/patch-ac
deleted file mode 100644
index 8d9961135c8..00000000000
--- a/graphics/gimp/patches/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.12 2006/04/18 20:24:48 tron Exp $
-
---- plug-ins/common/png.c.orig	2004-11-23 14:28:43.000000000 +0000
-+++ plug-ins/common/png.c	2006-04-18 21:20:36.000000000 +0100
-@@ -1012,7 +1012,11 @@
-    * Done with the file...
-    */
- 
-+#if PNG_LIBPNG_VER > 88
-+  png_destroy_read_struct(&pp, &info, NULL);
-+#else
-   png_read_destroy (pp, info, NULL);
-+#endif
- 
-   g_free (pixel);
-   g_free (pixels);
-@@ -1441,7 +1445,11 @@
-     };
- 
-   png_write_end (pp, info);
-+#if PNG_LIBPNG_VER > 88
-+  png_destroy_write_struct(&pp, &info);
-+#else
-   png_write_destroy (pp);
-+#endif
- 
-   g_free (pixel);
-   g_free (pixels);
diff --git a/graphics/gimp/patches/patch-ae b/graphics/gimp/patches/patch-ae
deleted file mode 100644
index fb14aac1f32..00000000000
--- a/graphics/gimp/patches/patch-ae
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2006/06/26 21:12:53 wiz Exp $
-
---- app/composite/gimp-composite-mmx.c.orig	2006-04-13 11:20:13.000000000 +0000
-+++ app/composite/gimp-composite-mmx.c
-@@ -135,6 +135,7 @@ gimp_composite_addition_rgba8_rgba8_rgba
-   asm("emms");
- }
- 
-+#if 0
- void
- gimp_composite_burn_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *_op)
- {
-@@ -250,7 +251,7 @@ gimp_composite_burn_rgba8_rgba8_rgba8_mm
- 
-   asm("emms");
- }
--
-+#endif
- 
- void
- gimp_composite_darken_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *_op)
-@@ -1267,8 +1268,8 @@ gimp_composite_swap_rgba8_rgba8_rgba8_mm
-                     "\tmovq    %%mm3,%0\n"
-                     "\tmovq    %%mm2,%1\n"
-                     : "+m" (*a), "+m" (*b)
--                    : 
--                    : "%mm1", "%mm2", "%mm3", "%mm4");
-+                    :
-+                    : "%mm2", "%mm3");
-       a++;
-       b++;
-     }
-@@ -1281,7 +1282,7 @@ gimp_composite_swap_rgba8_rgba8_rgba8_mm
-                     "\tmovd    %%mm2,%1\n"
-                     : "+m" (*a), "+m" (*b)
-                     :
--                    : "%mm1", "%mm2", "%mm3", "%mm4");
-+                    : "%mm2", "%mm3");
-     }
- 
-   asm("emms");
diff --git a/graphics/gimp/patches/patch-af b/graphics/gimp/patches/patch-af
deleted file mode 100644
index f174fa00974..00000000000
--- a/graphics/gimp/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.3 2006/06/26 21:12:53 wiz Exp $
-
---- app/composite/gimp-composite-sse.c.orig	2005-08-15 10:07:03.000000000 +0000
-+++ app/composite/gimp-composite-sse.c
-@@ -113,7 +113,7 @@ gimp_composite_addition_rgba8_rgba8_rgba
-   asm("emms");
- }
- 
--
-+#if 0
- void
- gimp_composite_burn_rgba8_rgba8_rgba8_sse (GimpCompositeContext *_op)
- {
-@@ -229,7 +229,7 @@ gimp_composite_burn_rgba8_rgba8_rgba8_ss
- 
-   asm("emms");
- }
--
-+#endif
- 
- void
- gimp_composite_darken_rgba8_rgba8_rgba8_sse (GimpCompositeContext *_op)
diff --git a/graphics/gimp/patches/patch-ag b/graphics/gimp/patches/patch-ag
deleted file mode 100644
index 81e507a2bb5..00000000000
--- a/graphics/gimp/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/06/26 21:12:53 wiz Exp $
-
---- app/composite/gimp-composite-mmx-installer.c.orig	2006-04-13 11:20:13.000000000 +0000
-+++ app/composite/gimp-composite-mmx-installer.c
-@@ -25,7 +25,6 @@ static struct install_table {
-  { GIMP_COMPOSITE_SUBTRACT, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_subtract_rgba8_rgba8_rgba8_mmx }, 
-  { GIMP_COMPOSITE_DARKEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_darken_rgba8_rgba8_rgba8_mmx }, 
-  { GIMP_COMPOSITE_LIGHTEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_lighten_rgba8_rgba8_rgba8_mmx }, 
-- { GIMP_COMPOSITE_BURN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_burn_rgba8_rgba8_rgba8_mmx }, 
-  { GIMP_COMPOSITE_GRAIN_EXTRACT, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_grain_extract_rgba8_rgba8_rgba8_mmx }, 
-  { GIMP_COMPOSITE_GRAIN_MERGE, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_grain_merge_rgba8_rgba8_rgba8_mmx }, 
-  { GIMP_COMPOSITE_SWAP, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_swap_rgba8_rgba8_rgba8_mmx }, 
diff --git a/graphics/gimp/patches/patch-ah b/graphics/gimp/patches/patch-ah
deleted file mode 100644
index 720586dd10d..00000000000
--- a/graphics/gimp/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2006/06/26 21:12:53 wiz Exp $
-
---- app/composite/gimp-composite-sse-installer.c.orig	2005-08-15 10:07:03.000000000 +0000
-+++ app/composite/gimp-composite-sse-installer.c
-@@ -25,7 +25,6 @@ static struct install_table {
-  { GIMP_COMPOSITE_SUBTRACT, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_subtract_rgba8_rgba8_rgba8_sse }, 
-  { GIMP_COMPOSITE_DARKEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_darken_rgba8_rgba8_rgba8_sse }, 
-  { GIMP_COMPOSITE_LIGHTEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_lighten_rgba8_rgba8_rgba8_sse }, 
-- { GIMP_COMPOSITE_BURN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_burn_rgba8_rgba8_rgba8_sse }, 
-  { GIMP_COMPOSITE_GRAIN_EXTRACT, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_grain_extract_rgba8_rgba8_rgba8_sse }, 
-  { GIMP_COMPOSITE_GRAIN_MERGE, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_grain_merge_rgba8_rgba8_rgba8_sse }, 
-  { GIMP_COMPOSITE_SWAP, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_swap_rgba8_rgba8_rgba8_sse },