Changes 2.26.4

* Make tiff loader threadsafe
* Support saving ICC profiles in jpeg
* Add some missing annotations
* Documentation improvements
* Translation updates

6 files changed, 22 insertions, 35 deletions

diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index a2f8d68a74d..15d9cbd9299 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2012/09/15 10:04:51 obache Exp $
-#
+# $NetBSD: Makefile,v 1.19 2012/10/03 14:36:10 adam Exp $
 
-DISTNAME=	gdk-pixbuf-2.26.3
-PKGNAME=	gdk-pixbuf2-2.26.3
-PKGREVISION=	1
+DISTNAME=	gdk-pixbuf-2.26.4
+PKGNAME=	${DISTNAME:S/pixbuf/pixbuf2/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.26/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/graphics/gdk-pixbuf2/PLIST b/graphics/gdk-pixbuf2/PLIST
index 13f129c12ae..223697c143b 100644
--- a/graphics/gdk-pixbuf2/PLIST
+++ b/graphics/gdk-pixbuf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/08/10 15:23:42 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/10/03 14:36:10 adam Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-pixdata
 bin/gdk-pixbuf-query-loaders
@@ -37,7 +37,6 @@ man/man1/gdk-pixbuf-query-loaders.1
 share/gir-1.0/GdkPixbuf-2.0.gir
 share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html
 share/gtk-doc/html/gdk-pixbuf/annotation-glossary.html
-share/gtk-doc/html/gdk-pixbuf/api-index-2-10.html
 share/gtk-doc/html/gdk-pixbuf/api-index-2-12.html
 share/gtk-doc/html/gdk-pixbuf/api-index-2-14.html
 share/gtk-doc/html/gdk-pixbuf/api-index-2-2.html
@@ -59,7 +58,11 @@ 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-X-Drawables-to-Pixbufs.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Xlib-Rendering.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-XlibRGB.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-csource.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.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-query-loaders.html
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
index 63558f36d8b..77080870e63 100644
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.13 2012/08/23 14:28:42 drochner Exp $
+$NetBSD: distinfo,v 1.14 2012/10/03 14:36:10 adam Exp $
 
-SHA1 (gdk-pixbuf-2.26.3.tar.xz) = 8035170ecc8ae77d088c9c6e403b54f20c02bca0
-RMD160 (gdk-pixbuf-2.26.3.tar.xz) = ea809a6c05f0fcedbc51dd1345b885005b63edbb
-Size (gdk-pixbuf-2.26.3.tar.xz) = 1175376 bytes
-SHA1 (patch-ab) = 4edf5042b355f73c69586a48d21998e483ed1b81
-SHA1 (patch-ac) = f8c8ff3175cee6a88938a0aaa081d3bd832a050d
-SHA1 (patch-af) = 76ba335564db50762f50987d0c970a01d6463e77
+SHA1 (gdk-pixbuf-2.26.4.tar.xz) = 434dfac552fff8bc77bc2dca0e6ed8c268f8880d
+RMD160 (gdk-pixbuf-2.26.4.tar.xz) = ab24345b3f9bbedf5f708071a2ee06ac3202bcb5
+Size (gdk-pixbuf-2.26.4.tar.xz) = 1181640 bytes
+SHA1 (patch-ab) = a64a1c9a4dd4c51d918e3409d40d76fd63146150
+SHA1 (patch-ac) = c55b59e380cf58ae7e94c760dc0dbb32b6b5fb69
 SHA1 (patch-gdk-pixbuf_io-xbm.c) = eebc5a4c92b44517cf461ed74e6134c756a319ae
diff --git a/graphics/gdk-pixbuf2/patches/patch-ab b/graphics/gdk-pixbuf2/patches/patch-ab
index 06ee62c182d..d6200868911 100644
--- a/graphics/gdk-pixbuf2/patches/patch-ab
+++ b/graphics/gdk-pixbuf2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2012/04/30 14:12:05 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2012/10/03 14:36:10 adam Exp $
 
---- gdk-pixbuf/Makefile.in.orig	2012-03-20 16:47:37.000000000 +0000
+--- gdk-pixbuf/Makefile.in.orig	2012-09-18 00:49:18.000000000 +0000
 +++ gdk-pixbuf/Makefile.in
-@@ -276,8 +276,7 @@ libpixbufloader_ico_la_LINK = $(LIBTOOL)
+@@ -293,8 +293,7 @@ libpixbufloader_ico_la_LINK = $(LIBTOOL)
  	$(LDFLAGS) -o $@
  @BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@am_libpixbufloader_ico_la_rpath = -rpath \
  @BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@	$(loaderdir)
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.2 2012/04/30 14:12:05 drochner Exp $
  am_libpixbufloader_jasper_la_OBJECTS = io-jasper.lo
  libpixbufloader_jasper_la_OBJECTS =  \
  	$(am_libpixbufloader_jasper_la_OBJECTS)
-@@ -1103,7 +1102,7 @@ libpixbufloader_pcx_la_LIBADD = $(module
+@@ -1135,7 +1134,7 @@ libpixbufloader_pcx_la_LIBADD = $(module
  libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c
  libpixbufloader_jasper_la_SOURCES = io-jasper.c
  libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined)
diff --git a/graphics/gdk-pixbuf2/patches/patch-ac b/graphics/gdk-pixbuf2/patches/patch-ac
index 98749960f2d..92410d0da78 100644
--- a/graphics/gdk-pixbuf2/patches/patch-ac
+++ b/graphics/gdk-pixbuf2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2010/11/16 16:45:08 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2012/10/03 14:36:10 adam Exp $
 
---- contrib/gdk-pixbuf-xlib/Makefile.in.orig	2010-11-05 23:56:05.000000000 +0000
+--- contrib/gdk-pixbuf-xlib/Makefile.in.orig	2012-09-18 00:49:18.000000000 +0000
 +++ contrib/gdk-pixbuf-xlib/Makefile.in
-@@ -85,7 +85,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+@@ -107,7 +107,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  	"$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)"
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1 2010/11/16 16:45:08 drochner Exp $
  	$(am__DEPENDENCIES_1)
  am_libgdk_pixbuf_xlib_2_0_la_OBJECTS = gdk-pixbuf-xlib.lo \
  	gdk-pixbuf-xlib-render.lo gdk-pixbuf-xlib-drawable.lo \
-@@ -368,7 +368,7 @@ libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \
+@@ -409,7 +409,7 @@ libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \
  	-version-info $(LT_VERSION_INFO)
  
  libgdk_pixbuf_xlib_2_0_la_LIBADD = \
diff --git a/graphics/gdk-pixbuf2/patches/patch-af b/graphics/gdk-pixbuf2/patches/patch-af
deleted file mode 100644
index 7d6937a163c..00000000000
--- a/graphics/gdk-pixbuf2/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2011/08/30 22:34:13 drochner Exp $
-
---- gdk-pixbuf/io-png.c.orig	2011-03-04 00:04:14.000000000 +0000
-+++ gdk-pixbuf/io-png.c
-@@ -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"),
--                                     width, height);
-+                                     (long)width, (long)height);
-                 }
-                 return;
-         }