UPdate to 2.90.4.

Add license, Clean up Makefile. Depend on gdk-pixbuf2.
Make JOBS UNSAFE, otherwise it errors out in Gdk gir foo.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14273 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 78 insertions, 173 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index a257e742a..306df3f85 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.2 2010/06/10 12:20:45 kwm Exp $
+#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.3 2010/06/18 11:14:50 kwm Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.90.3
+PORTVERSION=	2.90.4
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
@@ -24,6 +24,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gimp Toolkit for X11 GUI (current stable version)
 
+LICENSE=        LGPL20
+LICENSE_FILE=   ${WRKSRC}/COPYING
 USE_BZIP2=	yes
 LATEST_LINK=	gtk30
 
@@ -38,10 +40,10 @@ RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
-MAKE_JOBS_SAFE=	yes
+MAKE_JOBS_UNSAFE=	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,15 +51,10 @@ 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=	3.0.0
-PLIST_SUB=	GTK_VERSION="${GTK_VERSION}"
 
-gdk_pixbuf_MAN=	gdk-pixbuf-csource-3.0.1 gdk-pixbuf-query-loaders-3.0.1
-gtk_MAN=	gtk-builder-convert-3.0.1 gtk-query-immodules-3.0.1 \
+MAN1=		gtk-builder-convert-3.0.1 gtk-query-immodules-3.0.1 \
 		gtk-update-icon-cache-3.0.1
 
-MAN1=		${gdk_pixbuf_MAN} ${gtk_MAN}
-
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug=yes
 .endif
@@ -79,10 +76,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
@@ -95,9 +88,7 @@ post-install:
 		${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null
 	@${MKDIR} ${PREFIX}/lib/gtk-3.0/modules
 	@${MKDIR} ${PREFIX}/lib/gtk-3.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/|} \
+	${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 b90d0087b..33d8db83d 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome3/gtk+-2.90.3.tar.bz2) = e860c3b069289acca6cefb9d21aa0c50
-SHA256 (gnome3/gtk+-2.90.3.tar.bz2) = c5a556355342446eee5394680aae92e286509db04bf3230c625151d6f6530ee0
-SIZE (gnome3/gtk+-2.90.3.tar.bz2) = 18529705
+MD5 (gnome3/gtk+-2.90.4.tar.bz2) = c70b0c0617b02de3d1ff24a8b1fad5e6
+SHA256 (gnome3/gtk+-2.90.4.tar.bz2) = 73c1f474c9fc5c442097a1a8f2fa1ba4be514f182163ed2112085c46a1f57bb2
+SIZE (gnome3/gtk+-2.90.4.tar.bz2) = 16939155
diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in
index 4160988be..9e71b219c 100644
--- a/x11-toolkits/gtk30/files/patch-Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2010-05-11 11:41:33.000000000 +0200
-+++ Makefile.in	2010-05-11 11:42:30.000000000 +0200
-@@ -471,7 +471,7 @@
+--- Makefile.in.orig	2010-06-27 13:28:30.000000000 +0200
++++ Makefile.in	2010-06-27 13:28:44.000000000 +0200
+@@ -450,7 +450,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
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++SRC_SUBDIRS = gdk gtk modules demos perf
  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
- AUTOMAKE_OPTIONS = 1.7
- ACLOCAL_AMFLAGS = -I m4
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ MAINTAINERCLEANFILES = \
diff --git a/x11-toolkits/gtk30/files/patch-docs_reference_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_reference_Makefile.in
index 0a4e1022f..acd1f9f12 100644
--- a/x11-toolkits/gtk30/files/patch-docs_reference_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-docs_reference_Makefile.in
@@ -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 13:29:07.000000000 +0200
++++ docs/reference/Makefile.in	2010-06-27 13:29: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/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 53ca6b4dc..183b9dd22 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,29 +1,12 @@
-bin/gdk-pixbuf-csource-3.0
-bin/gdk-pixbuf-query-loaders-3.0
 bin/gtk-builder-convert-3.0
 bin/gtk-update-icon-cache-3.0
 bin/gtk3-demo
 bin/gtk-query-immodules-3.0
-@comment bug? etc/gtk-3.0/gdk-pixbuf.loaders
-@comment bug? etc/gtk-3.0/gtk.immodules
 etc/gtk-3.0/im-multipress.conf
 include/gail-3.0/gail/gailwidget.h
 include/gail-3.0/libgail-util/gail-util.h
 include/gail-3.0/libgail-util/gailmisc.h
 include/gail-3.0/libgail-util/gailtextutil.h
-include/gtk-3.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
-include/gtk-3.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
-include/gtk-3.0/gdk-pixbuf/gdk-pixbuf-animation.h
-include/gtk-3.0/gdk-pixbuf/gdk-pixbuf-core.h
-include/gtk-3.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
-include/gtk-3.0/gdk-pixbuf/gdk-pixbuf-features.h
-include/gtk-3.0/gdk-pixbuf/gdk-pixbuf-io.h
-include/gtk-3.0/gdk-pixbuf/gdk-pixbuf-loader.h
-include/gtk-3.0/gdk-pixbuf/gdk-pixbuf-marshal.h
-include/gtk-3.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
-include/gtk-3.0/gdk-pixbuf/gdk-pixbuf-transform.h
-include/gtk-3.0/gdk-pixbuf/gdk-pixbuf.h
-include/gtk-3.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-3.0/gdk/gdk.h
 include/gtk-3.0/gdk/gdkapplaunchcontext.h
 include/gtk-3.0/gdk/gdkcairo.h
@@ -115,7 +98,6 @@ include/gtk-3.0/gtk/gtkentrycompletion.h
 include/gtk-3.0/gtk/gtkenums.h
 include/gtk-3.0/gtk/gtkeventbox.h
 include/gtk-3.0/gtk/gtkexpander.h
-include/gtk-3.0/gtk/gtkextendedlayout.h
 include/gtk-3.0/gtk/gtkfilechooser.h
 include/gtk-3.0/gtk/gtkfilechooserbutton.h
 include/gtk-3.0/gtk/gtkfilechooserdialog.h
@@ -200,6 +182,7 @@ include/gtk-3.0/gtk/gtkseparatortoolitem.h
 include/gtk-3.0/gtk/gtksettings.h
 include/gtk-3.0/gtk/gtkshow.h
 include/gtk-3.0/gtk/gtksizegroup.h
+include/gtk-3.0/gtk/gtksizerequest.h
 include/gtk-3.0/gtk/gtksocket.h
 include/gtk-3.0/gtk/gtkspinbutton.h
 include/gtk-3.0/gtk/gtkspinner.h
@@ -260,109 +243,53 @@ include/gtk-3.0/unix-print/gtk/gtkprintjob.h
 include/gtk-3.0/unix-print/gtk/gtkprintunixdialog.h
 include/gtk-3.0/unix-print/gtk/gtkunixprint.h
 lib/girepository-1.0/Gdk-3.0.typelib
-lib/girepository-1.0/GdkPixbuf-3.0.typelib
 lib/girepository-1.0/GdkX11-3.0.typelib
 lib/girepository-1.0/Gtk-3.0.typelib
-lib/gtk-3.0/%%GTK_VERSION%%/engines/libpixmap.a
-lib/gtk-3.0/%%GTK_VERSION%%/engines/libpixmap.la
-lib/gtk-3.0/%%GTK_VERSION%%/engines/libpixmap.so
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-am-et.a
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-am-et.la
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-am-et.so
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-cedilla.a
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-cedilla.la
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-cedilla.so
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.a
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.la
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-inuktitut.a
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-inuktitut.la
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-ipa.a
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-ipa.la
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-ipa.so
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-multipress.a
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-multipress.la
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-multipress.so
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-thai.a
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-thai.la
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-thai.so
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-ti-er.a
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-ti-er.la
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-ti-er.so
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-ti-et.a
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-ti-et.la
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-ti-et.so
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-viqr.a
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-viqr.la
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-viqr.so
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-xim.a
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-xim.la
-lib/gtk-3.0/%%GTK_VERSION%%/immodules/im-xim.so
-@comment xxx rm -f here?
-lib/gtk-3.0/%%GTK_VERSION%%/immodules.cache
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.la
-lib/gtk-3.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
-@comment xxx rm -f here?
-lib/gtk-3.0/%%GTK_VERSION%%/loaders.cache
-%%CUPS%%lib/gtk-3.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.a
-%%CUPS%%lib/gtk-3.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.la
-%%CUPS%%lib/gtk-3.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.so
-lib/gtk-3.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.a
-lib/gtk-3.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.la
-lib/gtk-3.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.so
-lib/gtk-3.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.a
-lib/gtk-3.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.la
-lib/gtk-3.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.so
+lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.a
+lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.la
+lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.so
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.a
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.la
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.so
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cedilla.a
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cedilla.la
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cedilla.so
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cyrillic-translit.a
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cyrillic-translit.la
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cyrillic-translit.so
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-inuktitut.a
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-inuktitut.la
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ipa.a
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ipa.la
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ipa.so
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-multipress.a
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-multipress.la
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-multipress.so
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-thai.a
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-thai.la
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-thai.so
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-er.a
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-er.la
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-er.so
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.a
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.la
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.so
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.a
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.la
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.so
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.a
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.la
+lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.so
+%%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.a
+%%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.la
+%%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.so
+lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.a
+lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.la
+lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.so
+lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.a
+lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.la
+lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.so
 lib/gtk-3.0/modules/libferret.a
 lib/gtk-3.0/modules/libferret.la
 lib/gtk-3.0/modules/libferret.so
@@ -377,29 +304,18 @@ lib/libgdk-x11-3.0.a
 lib/libgdk-x11-3.0.la
 lib/libgdk-x11-3.0.so
 lib/libgdk-x11-3.0.so.0
-lib/libgdk_pixbuf-3.0.a
-lib/libgdk_pixbuf-3.0.la
-lib/libgdk_pixbuf-3.0.so
-lib/libgdk_pixbuf-3.0.so.0
-lib/libgdk_pixbuf_xlib-3.0.a
-lib/libgdk_pixbuf_xlib-3.0.la
-lib/libgdk_pixbuf_xlib-3.0.so
-lib/libgdk_pixbuf_xlib-3.0.so.0
 lib/libgtk-x11-3.0.a
 lib/libgtk-x11-3.0.la
 lib/libgtk-x11-3.0.so
 lib/libgtk-x11-3.0.so.0
 libdata/pkgconfig/gail-3.0.pc
 libdata/pkgconfig/gdk-3.0.pc
-libdata/pkgconfig/gdk-pixbuf-3.0.pc
-libdata/pkgconfig/gdk-pixbuf-xlib-3.0.pc
 libdata/pkgconfig/gdk-x11-3.0.pc
 libdata/pkgconfig/gtk+-3.0.pc
 libdata/pkgconfig/gtk+-unix-print-3.0.pc
 libdata/pkgconfig/gtk+-x11-3.0.pc
 share/aclocal/gtk-3.0.m4
 share/gir-1.0/Gdk-3.0.gir
-share/gir-1.0/GdkPixbuf-3.0.gir
 share/gir-1.0/GdkX11-3.0.gir
 share/gir-1.0/Gtk-3.0.gir
 share/gtk-3.0/demo/alphatest.png
@@ -678,8 +594,6 @@ share/themes/Raleigh/gtk-3.0/gtkrc
 @dirrm include/gtk-3.0/unix-print/gtk
 @dirrm include/gtk-3.0/unix-print
 @dirrm include/gtk-3.0/gtk
-@dirrm include/gtk-3.0/gdk-pixbuf-xlib
-@dirrm include/gtk-3.0/gdk-pixbuf
 @dirrm include/gtk-3.0/gdk
 @dirrm include/gtk-3.0
 @dirrm include/gail-3.0/libgail-util
@@ -687,19 +601,19 @@ share/themes/Raleigh/gtk-3.0/gtkrc
 @dirrm include/gail-3.0
 @dirrm etc/gtk-3.0
 @exec /bin/mkdir -p %D/lib/gtk-3.0/modules
-@exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK_VERSION%%/engines
+@exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/engines
+@exec %D/bin/gtk-query-immodules-3.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache 2>/dev/null || /usr/bin/true
+@unexec rm %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
 @dirrmtry share/themes/Default
 @dirrmtry share/themes
 @dirrmtry lib/gtk-3.0/modules
-@dirrmtry lib/gtk-3.0/%%GTK_VERSION%%/printbackends
-@dirrmtry lib/gtk-3.0/%%GTK_VERSION%%/modules
-@dirrmtry lib/gtk-3.0/%%GTK_VERSION%%/loaders
-@dirrmtry lib/gtk-3.0/%%GTK_VERSION%%/immodules
-@dirrmtry lib/gtk-3.0/%%GTK_VERSION%%/engines
-@dirrmtry lib/gtk-3.0/%%GTK_VERSION%%
+@dirrmtry lib/gtk-3.0/engines
+@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/printbackends
+@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/modules
+@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/immodules
+@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/engines
+@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%
 @dirrmtry lib/gtk-3.0
-@exec %D/bin/gdk-pixbuf-query-loaders-3.0 > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-3.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
-@exec %D/bin/gtk-query-immodules-3.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-3.0 > %D/etc/gtk-3.0/gtk.immodules 2>/dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/yi/LC_MESSAGES