Changes 3.0.12:

* Assorted file chooser improvements/redesign:
 - Remove the expander in Save mode
 - Move the path bar up in Save mode
 - Remember the last opened directory
 - Start in recently-used mode when no folder is set
 - Update recent-files when confirming in the file chooser

4 files changed, 60 insertions, 44 deletions

diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile
index dabf2e78705..b952b9e6740 100644
--- a/x11/gtk3/Makefile
+++ b/x11/gtk3/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2011/07/17 03:34:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2011/09/09 10:02:03 adam Exp $
 
-DISTNAME=		gtk+-3.0.11
-PKGNAME=		${DISTNAME:S/gtk/gtk3/}
-CATEGORIES=		x11
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/3.0/ \
-			${MASTER_SITE_GNOME:=sources/gtk+/3.0/}
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	gtk+-3.0.12
+PKGNAME=	${DISTNAME:S/gtk/gtk3/}
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/3.0/ \
+		${MASTER_SITE_GNOME:=sources/gtk+/3.0/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.gtk.org/
-COMMENT=		GIMP Toolkit v3 - libraries for building X11 user interfaces
-LICENSE=		gnu-lgpl-v2.1
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.gtk.org/
+COMMENT=	GIMP Toolkit v3 - libraries for building X11 user interfaces
+LICENSE=	gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--disable-papi
 # XXX for now, to avoid conflict
 CONFIGURE_ARGS+=	--enable-gtk2-dependency
 DEPENDS+=		gtk2+-[0-9]*:../../x11/gtk2
-MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 TEST_TARGET=		check
 
 PKGCONFIG_OVERRIDE+=	gdk-3.0.pc.in
diff --git a/x11/gtk3/PLIST b/x11/gtk3/PLIST
index ae30330f0e8..edfc4c3fddb 100644
--- a/x11/gtk3/PLIST
+++ b/x11/gtk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/04/10 04:30:01 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/09/09 10:02:03 adam Exp $
 bin/gtk-query-immodules-3.0
 bin/gtk3-demo
 include/gail-3.0/gail/gailwidget.h
@@ -35,25 +35,37 @@ include/gtk-3.0/gdk/gdkthreads.h
 include/gtk-3.0/gdk/gdktypes.h
 include/gtk-3.0/gdk/gdkvisual.h
 include/gtk-3.0/gdk/gdkwindow.h
-include/gtk-3.0/gdk/gdkx.h
-include/gtk-3.0/gdk/x11/gdkx11applaunchcontext.h
-include/gtk-3.0/gdk/x11/gdkx11cursor.h
-include/gtk-3.0/gdk/x11/gdkx11device-core.h
-include/gtk-3.0/gdk/x11/gdkx11device-xi.h
-include/gtk-3.0/gdk/x11/gdkx11device-xi2.h
-include/gtk-3.0/gdk/x11/gdkx11devicemanager-core.h
-include/gtk-3.0/gdk/x11/gdkx11devicemanager-xi.h
-include/gtk-3.0/gdk/x11/gdkx11devicemanager-xi2.h
-include/gtk-3.0/gdk/x11/gdkx11display.h
-include/gtk-3.0/gdk/x11/gdkx11displaymanager.h
-include/gtk-3.0/gdk/x11/gdkx11dnd.h
-include/gtk-3.0/gdk/x11/gdkx11keys.h
-include/gtk-3.0/gdk/x11/gdkx11property.h
-include/gtk-3.0/gdk/x11/gdkx11screen.h
-include/gtk-3.0/gdk/x11/gdkx11selection.h
-include/gtk-3.0/gdk/x11/gdkx11utils.h
-include/gtk-3.0/gdk/x11/gdkx11visual.h
-include/gtk-3.0/gdk/x11/gdkx11window.h
+${PLIST.quartz}include/gtk-3.0/gdk/gdkquartz.h
+${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzcursor.h
+${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzdevice-core.h
+${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzdevicemanager-core.h
+${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzdisplay.h
+${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzdisplaymanager.h
+${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzdnd.h
+${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzkeys.h
+${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzscreen.h
+${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzutils.h
+${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzvisual.h
+${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzwindow.h
+${PLIST.x11}include/gtk-3.0/gdk/gdkx.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11applaunchcontext.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11cursor.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11device-core.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11device-xi.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11device-xi2.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11devicemanager-core.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11devicemanager-xi.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11devicemanager-xi2.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11display.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11displaymanager.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11dnd.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11keys.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11property.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11screen.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11selection.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11utils.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11visual.h
+${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11window.h
 include/gtk-3.0/gtk/gtk.h
 include/gtk-3.0/gtk/gtkaboutdialog.h
 include/gtk-3.0/gtk/gtkaccelgroup.h
@@ -277,7 +289,7 @@ lib/gtk-3.0/3.0.0/immodules/im-thai.la
 lib/gtk-3.0/3.0.0/immodules/im-ti-er.la
 lib/gtk-3.0/3.0.0/immodules/im-ti-et.la
 lib/gtk-3.0/3.0.0/immodules/im-viqr.la
-lib/gtk-3.0/3.0.0/immodules/im-xim.la
+${PLIST.x11}lib/gtk-3.0/3.0.0/immodules/im-xim.la
 ${PLIST.cups}lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la
 lib/gtk-3.0/3.0.0/printbackends/libprintbackend-file.la
 lib/gtk-3.0/3.0.0/printbackends/libprintbackend-lpr.la
@@ -288,10 +300,12 @@ lib/libgdk-3.la
 lib/libgtk-3.la
 lib/pkgconfig/gail-3.0.pc
 lib/pkgconfig/gdk-3.0.pc
-lib/pkgconfig/gdk-x11-3.0.pc
+${PLIST.quartz}lib/pkgconfig/gdk-quartz-3.0.pc
+${PLIST.x11}lib/pkgconfig/gdk-x11-3.0.pc
 lib/pkgconfig/gtk+-3.0.pc
 lib/pkgconfig/gtk+-unix-print-3.0.pc
-lib/pkgconfig/gtk+-x11-3.0.pc
+${PLIST.quartz}lib/pkgconfig/gtk+-quartz-3.0.pc
+${PLIST.x11}lib/pkgconfig/gtk+-x11-3.0.pc
 libdata/gtk-3.0/im-multipress.conf
 man/man1/gtk-query-immodules-3.0.1
 man/man1/gtk-update-icon-cache.1
@@ -352,7 +366,7 @@ share/gtk-3.0/demo/tree_store.c
 share/gtk-3.0/demo/ui_manager.c
 share/gtk-doc/html/gail-libgail-util3/gail-libgail-util3-GailMisc.html
 share/gtk-doc/html/gail-libgail-util3/gail-libgail-util3-GailTextUtil.html
-share/gtk-doc/html/gail-libgail-util3/gail-libgail-util3.devhelp
+${PLIST.x11}share/gtk-doc/html/gail-libgail-util3/gail-libgail-util3.devhelp
 share/gtk-doc/html/gail-libgail-util3/gail-libgail-util3.devhelp2
 share/gtk-doc/html/gail-libgail-util3/home.png
 share/gtk-doc/html/gail-libgail-util3/index.html
@@ -418,7 +432,7 @@ share/gtk-doc/html/gdk3/gdk3-Threads.html
 share/gtk-doc/html/gdk3/gdk3-Visuals.html
 share/gtk-doc/html/gdk3/gdk3-Windows.html
 share/gtk-doc/html/gdk3/gdk3-X-Window-System-Interaction.html
-share/gtk-doc/html/gdk3/gdk3.devhelp
+${PLIST.x11}share/gtk-doc/html/gdk3/gdk3.devhelp
 share/gtk-doc/html/gdk3/gdk3.devhelp2
 share/gtk-doc/html/gdk3/gobbler.png
 share/gtk-doc/html/gdk3/gumby.png
@@ -848,7 +862,7 @@ share/gtk-doc/html/gtk3/gtk3-Stock-Items.html
 share/gtk-doc/html/gtk3/gtk3-Testing.html
 share/gtk-doc/html/gtk3/gtk3-Themeable-Stock-Images.html
 share/gtk-doc/html/gtk3/gtk3-gtkcheckmenuitem.html
-share/gtk-doc/html/gtk3/gtk3.devhelp
+${PLIST.x11}share/gtk-doc/html/gtk3/gtk3.devhelp
 share/gtk-doc/html/gtk3/gtk3.devhelp2
 share/gtk-doc/html/gtk3/gtkbase.html
 share/gtk-doc/html/gtk3/gtkobjects.html
@@ -925,6 +939,7 @@ share/gtk-doc/html/gtk3/statusbar.png
 share/gtk-doc/html/gtk3/style.css
 share/gtk-doc/html/gtk3/switch.png
 share/gtk-doc/html/gtk3/system-run.png
+${PLIST.quartz}share/gtk-doc/html/gtk3/text-x-generic.png
 share/gtk-doc/html/gtk3/theming.html
 share/gtk-doc/html/gtk3/toggle-button.png
 share/gtk-doc/html/gtk3/toolbar.png
@@ -1163,6 +1178,7 @@ share/locale/zh_TW/LC_MESSAGES/gtk30-properties.mo
 share/locale/zh_TW/LC_MESSAGES/gtk30.mo
 share/themes/Default/gtk-3.0/gtk-keys.css
 share/themes/Emacs/gtk-3.0/gtk-keys.css
+${PLIST.quartz}share/themes/Mac/gtk-3.0/gtk-keys.css
 share/themes/Raleigh/gtk-3.0/gtk.css
 @pkgdir lib/gtk-3.0/immodules
 @pkgdir lib/gtk-3.0/3.0.0/filesystems
diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo
index 84335a06326..7e019fe3ff0 100644
--- a/x11/gtk3/distinfo
+++ b/x11/gtk3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2011/06/09 11:18:09 drochner Exp $
+$NetBSD: distinfo,v 1.6 2011/09/09 10:02:03 adam Exp $
 
-SHA1 (gtk+-3.0.11.tar.bz2) = e01da1fe2e1baf9a715cb5ceb1f28d7873eed1fd
-RMD160 (gtk+-3.0.11.tar.bz2) = 73c3c82fde988c65f1a3109b7d41f36e88758509
-Size (gtk+-3.0.11.tar.bz2) = 16949671 bytes
+SHA1 (gtk+-3.0.12.tar.bz2) = bb2d294d6cbe9f7e71de67ab4892217085a47d97
+RMD160 (gtk+-3.0.12.tar.bz2) = aaf1f6fd626a4790bd75f1229a722778c58026ae
+Size (gtk+-3.0.12.tar.bz2) = 17570924 bytes
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
 SHA1 (patch-af) = cbd00ab8134e445b9b2e7a58bbdef95e2aca5ce2
 SHA1 (patch-aj) = b7c5bc214987435762c88ab8b9438bda5ee6ddd5
diff --git a/x11/gtk3/options.mk b/x11/gtk3/options.mk
index 4d1a9ef70f0..27ddb1db177 100644
--- a/x11/gtk3/options.mk
+++ b/x11/gtk3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2011/03/18 17:06:10 drochner Exp $
+# $NetBSD: options.mk,v 1.2 2011/09/09 10:02:03 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gtk3
 PKG_SUPPORTED_OPTIONS=	cups debug
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--enable-debug=yes
 PLIST_VARS+=		quartz x11
 .if !empty(PKG_OPTIONS:Mquartz)
 CONFIGURE_ARGS+=	--without-x
-CONFIGURE_ARGS+=	--with-gdktarget=quartz
+CONFIGURE_ARGS+=	--enable-quartz-backend
 PLIST.quartz=		yes
 .else
 CONFIGURE_ARGS+=	--with-xinput=xfree