8 files changed, 110 insertions, 225 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index e38f8935ca4c..83d881b07752 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.191 2010/05/04 10:29:49 kwm Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.209 2010/11/15 21:17:48 kwm Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.20.1
-PORTREVISION?=	2
+PORTVERSION=	2.22.1
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
@@ -24,24 +24,23 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gimp Toolkit for X11 GUI (current stable version)
 
+LICENSE=	LGPL20
+LICENSE_FILE=   ${WRKSRC}/COPYING
 USE_BZIP2=	yes
 LATEST_LINK=	gtk20
 
 .if !defined(REFERENCE_PORT)
 
 BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		jasper.4:${PORTSDIR}/graphics/jasper
 RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
+MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:22
-USE_GNOME=	gnomehack atk pango ltverhack
+USE_GNOME=	gnomehack atk pango gdkpixbuf2 ltverhack
 USE_GETTEXT=	yes
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
@@ -49,26 +48,22 @@ CONFIGURE_ARGS=	--enable-static --with-xinput=yes --with-libjasper
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-GTK_VERSION=	2.10.0
-PLIST_SUB=	GTK_VERSION="${GTK_VERSION}"
 
-gdk_pixbuf_MAN=	gdk-pixbuf-query-loaders.1
-gtk_MAN=	gtk-query-immodules-2.0.1 gtk-update-icon-cache.1
-
-MAN1=		${gdk_pixbuf_MAN} ${gtk_MAN}
+MAN1=		gtk-query-immodules-2.0.1 gtk-update-icon-cache.1
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug=yes
 .endif
 
+OPTIONS=	CUPS "Enable cups printing support" on
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == powerpc64
-EXTRA_PATCHES=  ${.CURDIR}/files/extra-arch-powerpc64
+EXTRA_PATCHES=	${.CURDIR}/files/extra-arch-powerpc64
 .endif
 
-.if (defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)) && \
-	!defined(WITHOUT_CUPS)
+.if defined(WITH_CUPS)
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
 CONFIGURE_ARGS+=--enable-cups=auto
 PLIST_SUB+=	CUPS:=""
@@ -82,10 +77,6 @@ post-patch:
 		${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
 	@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
 		${WRKSRC}/configure
-# GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser)
-	@${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
-		s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \
-		${WRKSRC}/demos/gtk-demo/Makefile.in
 	@${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
 	@${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
 		${WRKSRC}/gtk/Makefile.in
@@ -97,10 +88,9 @@ post-install:
 	-@${FIND} ${LOCALBASE}/share/icons -type d -depth 1 -exec \
 		${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null
 	@${MKDIR} ${PREFIX}/lib/gtk-2.0/modules
-	@${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines
-	${INSTALL_MAN} ${gdk_pixbuf_MAN:S|^|${WRKSRC}/docs/reference/gdk-pixbuf/|} \
-		${PREFIX}/man/man1
-	${INSTALL_MAN} ${gtk_MAN:S|^|${WRKSRC}/docs/reference/gtk/|} \
+	@${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines
+	@${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/loaders
+	${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/docs/reference/gtk/|} \
 		${PREFIX}/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index cc3c94a0d656..a6827d508561 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gtk+-2.20.1.tar.bz2) = 53e6f3a93bd22934878fc4a4a34c68aa
-SHA256 (gnome2/gtk+-2.20.1.tar.bz2) = 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65
-SIZE (gnome2/gtk+-2.20.1.tar.bz2) = 19089076
+SHA256 (gnome2/gtk+-2.22.1.tar.bz2) = 965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07
+SIZE (gnome2/gtk+-2.22.1.tar.bz2) = 18306164
diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in
index 307fd6fc2f77..f2ac7216d525 100644
--- a/x11-toolkits/gtk30/files/patch-Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Wed Aug  3 18:09:32 2005
-+++ Makefile.in	Wed Aug  3 18:10:01 2005
-@@ -288,7 +288,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- Makefile.in.orig	2010-06-27 12:13:41.000000000 +0200
++++ Makefile.in	2010-06-27 12:14:23.000000000 +0200
+@@ -456,7 +456,7 @@
+ 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ 	&& DISPLAY=:$$XID && export DISPLAY
  
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++SRC_SUBDIRS = gdk gtk modules demos perf
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
  
  # require automake 1.4
diff --git a/x11-toolkits/gtk30/files/patch-ai b/x11-toolkits/gtk30/files/patch-ai
index 0a4e1022fa27..a9d1d5f214c3 100644
--- a/x11-toolkits/gtk30/files/patch-ai
+++ b/x11-toolkits/gtk30/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig	2009-09-05 11:17:44.000000000 +0200
-+++ docs/reference/Makefile.in	2009-09-05 11:18:15.000000000 +0200
-@@ -359,7 +359,7 @@ XVFB_START = \
+--- docs/reference/Makefile.in.orig	2010-06-27 12:22:03.000000000 +0200
++++ docs/reference/Makefile.in	2010-06-27 12:22:37.000000000 +0200
+@@ -354,7 +354,7 @@
  	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
  	&& DISPLAY=:$$XID && export DISPLAY
  
--SUBDIRS = gdk-pixbuf gdk gtk libgail-util
-+SUBDIRS = #gdk-pixbuf gdk gtk libgail-util
+-SUBDIRS = gdk gtk libgail-util
++SUBDIRS = #gdk gtk libgail-util
  GITIGNOREFILES = */*.1
  all: all-recursive
  
diff --git a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
deleted file mode 100644
index 04ce78984f84..000000000000
--- a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- gdk-pixbuf/Makefile.in.orig	2009-09-05 11:19:07.000000000 +0200
-+++ gdk-pixbuf/Makefile.in	2009-09-05 11:20:19.000000000 +0200
-@@ -1322,9 +1322,9 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loade
- LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
- test_gdk_pixbuf_LDADD = $(LDADDS)
- gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
--gdk_pixbuf_csource_LDADD = $(LDADDS)
-+gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS)
- gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
--gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
-+gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS)
- gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
- 
- #
diff --git a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c
deleted file mode 100644
index cca139d6b99a..000000000000
--- a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gdk-pixbuf/io-png.c.orig	2010-05-02 05:14:27.000000000 +0200
-+++ gdk-pixbuf/io-png.c	2010-05-15 17:30:35.000000000 +0200
-@@ -261,7 +261,11 @@ gdk_pixbuf__png_image_load (FILE *f, GEr
-         gchar *icc_profile_base64;
-         const gchar *icc_profile_title;
-         const gchar *icc_profile;
-+#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-+        guint icc_profile_size;
-+#else
-         gulong icc_profile_size;
-+#endif
-         guint32 retval;
-         gint compression_type;
- 
-@@ -607,7 +611,11 @@ png_info_callback   (png_structp png_rea
-         gchar *icc_profile_base64;
-         const gchar *icc_profile_title;
-         const gchar *icc_profile;
-+#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-+        guint icc_profile_size;
-+#else
-         gulong icc_profile_size;
-+#endif
-         guint32 retval;
-         gint compression_type;
- 
diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
index 25056ecf7e03..60254041d668 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
@@ -1,16 +1,14 @@
---- gtk/Makefile.in.orig	2009-12-25 20:27:57.000000000 +0100
-+++ gtk/Makefile.in	2009-12-25 20:29:14.000000000 +0100
-@@ -1377,11 +1377,11 @@ bin_SCRIPTS = gtk-builder-convert $(am__
+--- gtk/Makefile.in.orig	2010-06-27 12:26:58.000000000 +0200
++++ gtk/Makefile.in	2010-06-27 12:28:14.000000000 +0200
+@@ -1350,9 +1350,9 @@
  # gtk-update-icon-cache.exe doesn't require any special privileges.
  @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
  gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
 -gtk_query_immodules_2_0_LDADD = $(LDADDS)
 +gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
  gtk_query_immodules_2_0_SOURCES = queryimmodules.c
- gtk_update_icon_cache_LDADD = \
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
--	$(GDK_PIXBUF_DEP_LIBS)
-+	$(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS)
- 
- gtk_update_icon_cache_SOURCES = \
- 	updateiconcache.c 
+-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
++gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
+ gtk_update_icon_cache_SOURCES = updateiconcache.c 
+ STOCK_ICONS = \
+ 	stock-icons/16/document-open-recent.png		\
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 28d34b3b06ac..06e2e8485b92 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,29 +1,13 @@
-bin/gdk-pixbuf-csource
-bin/gdk-pixbuf-query-loaders
 bin/gtk-builder-convert
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
 bin/gtk-update-icon-cache
-etc/gtk-2.0/gdk-pixbuf.loaders
 etc/gtk-2.0/gtk.immodules
 etc/gtk-2.0/im-multipress.conf
 include/gail-1.0/gail/gailwidget.h
 include/gail-1.0/libgail-util/gail-util.h
 include/gail-1.0/libgail-util/gailmisc.h
 include/gail-1.0/libgail-util/gailtextutil.h
-include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
-include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
 include/gtk-2.0/gdk/gdkapplaunchcontext.h
 include/gtk-2.0/gdk/gdkcairo.h
@@ -41,6 +25,7 @@ include/gtk-2.0/gdk/gdki18n.h
 include/gtk-2.0/gdk/gdkimage.h
 include/gtk-2.0/gdk/gdkinput.h
 include/gtk-2.0/gdk/gdkkeys.h
+include/gtk-2.0/gdk/gdkkeysyms-compat.h
 include/gtk-2.0/gdk/gdkkeysyms.h
 include/gtk-2.0/gdk/gdkpango.h
 include/gtk-2.0/gdk/gdkpixbuf.h
@@ -278,104 +263,53 @@ include/gtk-unix-print-2.0/gtk/gtkprintjob.h
 include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
 include/gtk-unix-print-2.0/gtk/gtkunixprint.h
 lib/girepository-1.0/Gdk-2.0.typelib
-lib/girepository-1.0/GdkPixbuf-2.0.typelib
+lib/girepository-1.0/GdkX11-2.0.typelib
 lib/girepository-1.0/Gtk-2.0.typelib
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.a
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.la
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.so
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.a
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.la
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.so
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.a
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.la
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.so
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.a
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.so
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.a
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.la
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.so
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.a
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.la
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.so
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.a
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.la
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.so
 lib/gtk-2.0/modules/libferret.a
 lib/gtk-2.0/modules/libferret.la
 lib/gtk-2.0/modules/libferret.so
@@ -390,29 +324,19 @@ lib/libgdk-x11-2.0.a
 lib/libgdk-x11-2.0.la
 lib/libgdk-x11-2.0.so
 lib/libgdk-x11-2.0.so.0
-lib/libgdk_pixbuf-2.0.a
-lib/libgdk_pixbuf-2.0.la
-lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.0
-lib/libgdk_pixbuf_xlib-2.0.a
-lib/libgdk_pixbuf_xlib-2.0.la
-lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.0
 lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.la
 lib/libgtk-x11-2.0.so
 lib/libgtk-x11-2.0.so.0
 libdata/pkgconfig/gail.pc
 libdata/pkgconfig/gdk-2.0.pc
-libdata/pkgconfig/gdk-pixbuf-2.0.pc
-libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
 libdata/pkgconfig/gdk-x11-2.0.pc
 libdata/pkgconfig/gtk+-2.0.pc
 libdata/pkgconfig/gtk+-unix-print-2.0.pc
 libdata/pkgconfig/gtk+-x11-2.0.pc
 share/aclocal/gtk-2.0.m4
 share/gir-1.0/Gdk-2.0.gir
-share/gir-1.0/GdkPixbuf-2.0.gir
+share/gir-1.0/GdkX11-2.0.gir
 share/gir-1.0/Gtk-2.0.gir
 share/gtk-2.0/demo/alphatest.png
 share/gtk-2.0/demo/apple-red.png
@@ -563,12 +487,18 @@ share/locale/ja/LC_MESSAGES/gtk20-properties.mo
 share/locale/ja/LC_MESSAGES/gtk20.mo
 share/locale/ka/LC_MESSAGES/gtk20-properties.mo
 share/locale/ka/LC_MESSAGES/gtk20.mo
+share/locale/kg/LC_MESSAGES/gtk20-properties.mo
+share/locale/kg/LC_MESSAGES/gtk20.mo
+share/locale/kk/LC_MESSAGES/gtk20-properties.mo
+share/locale/kk/LC_MESSAGES/gtk20.mo
 share/locale/kn/LC_MESSAGES/gtk20-properties.mo
 share/locale/kn/LC_MESSAGES/gtk20.mo
 share/locale/ko/LC_MESSAGES/gtk20-properties.mo
 share/locale/ko/LC_MESSAGES/gtk20.mo
 share/locale/ku/LC_MESSAGES/gtk20-properties.mo
 share/locale/ku/LC_MESSAGES/gtk20.mo
+share/locale/lg/LC_MESSAGES/gtk20-properties.mo
+share/locale/lg/LC_MESSAGES/gtk20.mo
 share/locale/li/LC_MESSAGES/gtk20-properties.mo
 share/locale/li/LC_MESSAGES/gtk20.mo
 share/locale/lt/LC_MESSAGES/gtk20-properties.mo
@@ -651,6 +581,8 @@ share/locale/tr/LC_MESSAGES/gtk20-properties.mo
 share/locale/tr/LC_MESSAGES/gtk20.mo
 share/locale/tt/LC_MESSAGES/gtk20-properties.mo
 share/locale/tt/LC_MESSAGES/gtk20.mo
+share/locale/ug/LC_MESSAGES/gtk20-properties.mo
+share/locale/ug/LC_MESSAGES/gtk20.mo
 share/locale/uk/LC_MESSAGES/gtk20-properties.mo
 share/locale/uk/LC_MESSAGES/gtk20.mo
 share/locale/ur/LC_MESSAGES/gtk20-properties.mo
@@ -688,8 +620,6 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrm include/gtk-unix-print-2.0/gtk
 @dirrm include/gtk-unix-print-2.0
 @dirrm include/gtk-2.0/gtk
-@dirrm include/gtk-2.0/gdk-pixbuf-xlib
-@dirrm include/gtk-2.0/gdk-pixbuf
 @dirrm include/gtk-2.0/gdk
 @dirrm include/gtk-2.0
 @dirrm include/gail-1.0/libgail-util
@@ -697,18 +627,18 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrm include/gail-1.0
 @dirrm etc/gtk-2.0
 @exec /bin/mkdir -p %D/lib/gtk-2.0/modules
-@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines
+@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/engines
+@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/loaders
 @dirrmtry share/themes/Default
 @dirrmtry share/themes
 @dirrmtry lib/gtk-2.0/modules
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/printbackends
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/modules
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/loaders
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/immodules
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/printbackends
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/modules
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/loaders
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/immodules
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
 @dirrmtry lib/gtk-2.0
-@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
 @exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
@@ -720,6 +650,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @dirrmtry share/locale/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
 @dirrmtry share/locale/te/LC_MESSAGES
@@ -748,8 +680,14 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
+@dirrmtry share/locale/lg/LC_MESSAGES
+@dirrmtry share/locale/lg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/kg/LC_MESSAGES
+@dirrmtry share/locale/kg
 @dirrmtry share/locale/io/LC_MESSAGES
 @dirrmtry share/locale/io
 @dirrmtry share/locale/ia/LC_MESSAGES