update to 2.26.1

This is a new major release tree.

4 files changed, 21 insertions, 19 deletions

diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index d9c946374c2..ea66058b129 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2012/03/03 00:12:14 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2012/04/30 14:12:05 drochner Exp $
 #
 
-DISTNAME=	gdk-pixbuf-2.24.1
-PKGNAME=	gdk-pixbuf2-2.24.1
-PKGREVISION=	3
+DISTNAME=	gdk-pixbuf-2.26.1
+PKGNAME=	gdk-pixbuf2-2.26.1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.24/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.26/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -33,7 +32,7 @@ _BUILDING_GTK2= yes
 post-install:
 	${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB}
 
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection:= build
 .include "../../devel/gobject-introspection/buildlink3.mk"
diff --git a/graphics/gdk-pixbuf2/PLIST b/graphics/gdk-pixbuf2/PLIST
index a696f83019b..d9c0fe86268 100644
--- a/graphics/gdk-pixbuf2/PLIST
+++ b/graphics/gdk-pixbuf2/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2012/02/10 15:41:40 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/04/30 14:12:05 drochner Exp $
 bin/gdk-pixbuf-csource
+bin/gdk-pixbuf-pixdata
 bin/gdk-pixbuf-query-loaders
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h
@@ -40,6 +41,7 @@ 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
+share/gtk-doc/html/gdk-pixbuf/api-index-2-26.html
 share/gtk-doc/html/gdk-pixbuf/api-index-2-4.html
 share/gtk-doc/html/gdk-pixbuf/api-index-2-6.html
 share/gtk-doc/html/gdk-pixbuf/api-index-2-8.html
@@ -119,6 +121,7 @@ share/locale/is/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/it/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/km/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/kn/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ko/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ku/LC_MESSAGES/gdk-pixbuf.mo
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
index ed4d3cc5b26..63b08b5a53a 100644
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2012/01/09 17:25:48 drochner Exp $
+$NetBSD: distinfo,v 1.10 2012/04/30 14:12:05 drochner Exp $
 
-SHA1 (gdk-pixbuf-2.24.1.tar.xz) = b1719e885598a1dfada2e2187b81705b5f3b11c6
-RMD160 (gdk-pixbuf-2.24.1.tar.xz) = e1290bfcb3bdba52c32a74e7843ac14b7d614eeb
-Size (gdk-pixbuf-2.24.1.tar.xz) = 1177036 bytes
-SHA1 (patch-ab) = d18a235ce973ef132e9dc777b1cf029b064c02ef
+SHA1 (gdk-pixbuf-2.26.1.tar.xz) = 43e4fe5bd8d19bc7d7b853f71c85c193392cb2f7
+RMD160 (gdk-pixbuf-2.26.1.tar.xz) = a541fec932a3d89ad9b4835645989a687c8d56a7
+Size (gdk-pixbuf-2.26.1.tar.xz) = 1167608 bytes
+SHA1 (patch-ab) = 4edf5042b355f73c69586a48d21998e483ed1b81
 SHA1 (patch-ac) = f8c8ff3175cee6a88938a0aaa081d3bd832a050d
 SHA1 (patch-af) = 76ba335564db50762f50987d0c970a01d6463e77
diff --git a/graphics/gdk-pixbuf2/patches/patch-ab b/graphics/gdk-pixbuf2/patches/patch-ab
index faf89ad92b6..06ee62c182d 100644
--- a/graphics/gdk-pixbuf2/patches/patch-ab
+++ b/graphics/gdk-pixbuf2/patches/patch-ab
@@ -1,18 +1,18 @@
-$NetBSD: patch-ab,v 1.1 2010/11/14 20:11:42 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2012/04/30 14:12:05 drochner Exp $
 
---- gdk-pixbuf/Makefile.in.orig	2010-11-05 23:56:06.000000000 +0000
+--- gdk-pixbuf/Makefile.in.orig	2012-03-20 16:47:37.000000000 +0000
 +++ gdk-pixbuf/Makefile.in
-@@ -269,8 +269,7 @@ libpixbufloader_ico_la_LINK = $(LIBTOOL)
+@@ -276,8 +276,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)
--libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_2)
-+libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_3)
++libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
  am_libpixbufloader_jasper_la_OBJECTS = io-jasper.lo
  libpixbufloader_jasper_la_OBJECTS =  \
  	$(am_libpixbufloader_jasper_la_OBJECTS)
-@@ -1077,7 +1076,7 @@ libpixbufloader_pcx_la_LIBADD = $(module
+@@ -1103,7 +1102,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)