update to 2.24.0

This switches to the latest stable branch.

7 files changed, 26 insertions, 148 deletions

diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 59a01445310..1568ac3199b 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2011/07/08 11:31:24 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2011/08/30 22:34:13 drochner Exp $
 #
 
-DISTNAME=	gdk-pixbuf-2.22.1
-PKGNAME=	gdk-pixbuf2-2.22.1
-PKGREVISION=	3
+DISTNAME=	gdk-pixbuf-2.24.0
+PKGNAME=	gdk-pixbuf2-2.24.0
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.22/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.24/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.22/
+HOMEPAGE=	ftp://ftp.gnome.org/
 COMMENT=	Image loaders for gtk2
 LICENSE=	gnu-gpl-v2
 
diff --git a/graphics/gdk-pixbuf2/PLIST b/graphics/gdk-pixbuf2/PLIST
index c8910614575..bc024472360 100644
--- a/graphics/gdk-pixbuf2/PLIST
+++ b/graphics/gdk-pixbuf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/11/14 20:11:41 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/08/30 22:34:13 drochner Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -44,22 +44,21 @@ share/gtk-doc/html/gdk-pixbuf/api-index-2-8.html
 share/gtk-doc/html/gdk-pixbuf/api-index-deprecated.html
 share/gtk-doc/html/gdk-pixbuf/api-index-full.html
 share/gtk-doc/html/gdk-pixbuf/composite.png
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Animations.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-File-Loading.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-File-saving.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Image-Data-in-Memory.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Inline-data.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Scaling.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-The-GdkPixbuf-Structure.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Utilities.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-animation.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-creating.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-csource.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-file-loading.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-file-saving.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-from-drawables.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-rendering.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-inline.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-refcounting.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-scaling.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-util.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp2
 share/gtk-doc/html/gdk-pixbuf/home.png
 share/gtk-doc/html/gdk-pixbuf/index.html
@@ -93,6 +92,7 @@ share/locale/da/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/de/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/dz/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/el/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/en@shaw/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/en_CA/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/en_GB/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/eo/LC_MESSAGES/gdk-pixbuf.mo
diff --git a/graphics/gdk-pixbuf2/buildlink3.mk b/graphics/gdk-pixbuf2/buildlink3.mk
index c94773e0034..e58e6cda437 100644
--- a/graphics/gdk-pixbuf2/buildlink3.mk
+++ b/graphics/gdk-pixbuf2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2011/04/22 13:42:26 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2011/08/30 22:34:13 drochner Exp $
 
 BUILDLINK_TREE+=	gdk-pixbuf2
 
@@ -10,6 +10,7 @@ BUILDLINK_ABI_DEPENDS.gdk-pixbuf2?=	gdk-pixbuf2>=2.22.1nb2
 BUILDLINK_PKGSRCDIR.gdk-pixbuf2?=	../../graphics/gdk-pixbuf2
 
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .endif	# GDK_PIXBUF2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gdk-pixbuf2
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
index c1d13e1e7d7..1e26abea004 100644
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.7 2011/07/08 11:31:24 drochner Exp $
+$NetBSD: distinfo,v 1.8 2011/08/30 22:34:13 drochner Exp $
 
-SHA1 (gdk-pixbuf-2.22.1.tar.bz2) = b452208963ddd84f7280865695b50255fcafaa2e
-RMD160 (gdk-pixbuf-2.22.1.tar.bz2) = d05d6642e147281b7dc1dd21657595333f13f6f1
-Size (gdk-pixbuf-2.22.1.tar.bz2) = 1543273 bytes
-SHA1 (patch-aa) = 4ba8d71c089ba1e18ffa42fdb2c9b81b07168411
+SHA1 (gdk-pixbuf-2.24.0.tar.bz2) = 98416b2de3af0dbccc893eb2ada251ef5e60b89b
+RMD160 (gdk-pixbuf-2.24.0.tar.bz2) = 5cd81ae03cc47878e253855d3b5043f734287187
+Size (gdk-pixbuf-2.24.0.tar.bz2) = 1676011 bytes
 SHA1 (patch-ab) = d18a235ce973ef132e9dc777b1cf029b064c02ef
 SHA1 (patch-ac) = f8c8ff3175cee6a88938a0aaa081d3bd832a050d
 SHA1 (patch-ad) = 224ce909009d1d0ac42ba938987877c39b9aa380
 SHA1 (patch-ae) = e13fe0ad5a3e313bc4d6daa3c30f00fb66788534
-SHA1 (patch-af) = 4f7de87f3e840ceb282885ab806648e8dba28cff
-SHA1 (patch-ag) = ac7a5823167eb476c88eb0fe3fde88ccd1b70cf0
+SHA1 (patch-af) = 76ba335564db50762f50987d0c970a01d6463e77
diff --git a/graphics/gdk-pixbuf2/patches/patch-aa b/graphics/gdk-pixbuf2/patches/patch-aa
deleted file mode 100644
index 1206ac7a815..00000000000
--- a/graphics/gdk-pixbuf2/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2011/01/24 12:29:42 wiz Exp $
-
-Unportable test(1) construct.
-https://bugzilla.gnome.org/show_bug.cgi?id=640407
-
---- configure.orig	2010-11-05 23:56:08.000000000 +0000
-+++ configure
-@@ -18594,7 +18594,7 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- 
--if test "x${enable_Bsymbolic}" == "xyes"; then
-+if test "x${enable_Bsymbolic}" = "xyes"; then
-   GDK_PIXBUF_LINK_FLAGS=-Wl,-Bsymbolic-functions
- fi
- 
diff --git a/graphics/gdk-pixbuf2/patches/patch-af b/graphics/gdk-pixbuf2/patches/patch-af
index 3f6a42e0573..7d6937a163c 100644
--- a/graphics/gdk-pixbuf2/patches/patch-af
+++ b/graphics/gdk-pixbuf2/patches/patch-af
@@ -1,50 +1,8 @@
-$NetBSD: patch-af,v 1.2 2011/01/24 12:29:42 wiz Exp $
+$NetBSD: patch-af,v 1.3 2011/08/30 22:34:13 drochner Exp $
 
-Fix build with png-1.5.
-https://bugzilla.gnome.org/show_bug.cgi?id=640404
-
---- gdk-pixbuf/io-png.c.orig	2010-07-10 00:54:35.000000000 +0000
+--- gdk-pixbuf/io-png.c.orig	2011-03-04 00:04:14.000000000 +0000
 +++ gdk-pixbuf/io-png.c
-@@ -183,7 +183,11 @@ png_simple_error_callback(png_structp pn
-                              error_msg);
-         }
- 
-+#if (PNG_LIBPNG_VER < 10500)
-         longjmp (png_save_ptr->jmpbuf, 1);
-+#else
-+        png_longjmp (png_save_ptr, 1);
-+#endif
- }
- 
- static void
-@@ -287,7 +291,7 @@ gdk_pixbuf__png_image_load (FILE *f, GEr
- 		return NULL;
- 	}
- 
--	if (setjmp (png_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(png_ptr))) {
- 	    	g_free (rows);
- 
- 		if (pixbuf)
-@@ -459,7 +463,7 @@ gdk_pixbuf__png_image_begin_load (GdkPix
-                 return NULL;
-         }
-         
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
- 		if (lc->png_info_ptr)
- 			png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
-                 g_free(lc);
-@@ -531,7 +535,7 @@ gdk_pixbuf__png_image_load_increment(gpo
-         lc->error = error;
-         
-         /* Invokes our callbacks as needed */
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
-                 lc->error = NULL;
- 		return FALSE;
- 	} else {
-@@ -654,7 +658,7 @@ png_info_callback   (png_structp png_rea
+@@ -654,7 +654,7 @@ png_info_callback   (png_structp png_rea
                                       GDK_PIXBUF_ERROR,
                                       GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
                                       _("Insufficient memory to store a %ld by %ld image; try exiting some applications to reduce memory usage"),
@@ -53,24 +11,3 @@ https://bugzilla.gnome.org/show_bug.cgi?id=640404
                  }
                  return;
          }
-@@ -769,7 +773,11 @@ png_error_callback(png_structp png_read_
-                              error_msg);
-         }
- 
-+#if (PNG_LIBPNG_VER < 10500)
-         longjmp (png_read_ptr->jmpbuf, 1);
-+#else
-+        png_longjmp (png_read_ptr, 1);
-+#endif
- }
- 
- static void
-@@ -978,7 +986,7 @@ static gboolean real_save_png (GdkPixbuf
- 	       success = FALSE;
- 	       goto cleanup;
-        }
--       if (setjmp (png_ptr->jmpbuf)) {
-+       if (setjmp (png_jmpbuf(png_ptr))) {
- 	       success = FALSE;
- 	       goto cleanup;
-        }
diff --git a/graphics/gdk-pixbuf2/patches/patch-ag b/graphics/gdk-pixbuf2/patches/patch-ag
deleted file mode 100644
index 79fcff2da4c..00000000000
--- a/graphics/gdk-pixbuf2/patches/patch-ag
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2011/07/08 11:31:24 drochner Exp $
-
-CVE-2011-2485
-
---- gdk-pixbuf/io-gif.c.orig	2010-07-10 00:54:13.000000000 +0000
-+++ gdk-pixbuf/io-gif.c
-@@ -1455,6 +1455,7 @@ gdk_pixbuf__gif_image_load (FILE *file, 
- {
- 	GifContext *context;
- 	GdkPixbuf *pixbuf;
-+        gint retval;
- 
- 	g_return_val_if_fail (file != NULL, NULL);
- 
-@@ -1472,19 +1473,25 @@ gdk_pixbuf__gif_image_load (FILE *file, 
-         context->error = error;
-         context->stop_after_first_frame = TRUE;
- 
--	if (gif_main_loop (context) == -1 || context->animation->frames == NULL) {
-+        retval = gif_main_loop (context);
-+	if (retval == -1 || context->animation->frames == NULL) {
-                 if (context->error && *(context->error) == NULL)
-                         g_set_error_literal (context->error,
-                                              GDK_PIXBUF_ERROR,
-                                              GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-                                              _("GIF file was missing some data (perhaps it was truncated somehow?)"));
-         }
-+        else if (retval == -2) {
-+                pixbuf = NULL;
-+                goto out;
-+        }
-         
-         pixbuf = gdk_pixbuf_animation_get_static_image (GDK_PIXBUF_ANIMATION (context->animation));
- 
-         if (pixbuf)
-                 g_object_ref (pixbuf);
- 
-+out:
-         g_object_unref (context->animation);
-         
-         g_free (context->buf);