Update to 2.12.0.

(no shlib major changes)

Overview of Changes from GTK+ 2.11.6 to 2.12.0
==============================================

 * GtkTooltips
 - All widgets have been ported to the new tooltips code
 - Tooltips are disabled in touchscreen mode

 * GtkBuilder
 - Support custom tabs in GtkPrintUnixDialog

Lots of bugfixes and translation updates.

Overview of Changes from GTK+ 2.11.5 to 2.11.6
==============================================

 * GtkBuilder:
 - The gtk-builder-convert script is more versatile
 - GtkBuilder suppports GdkPixbuf properties
 - GtkBuilder parses, but doesn't yet implement <accessibility>
 - Support for accelerators in actions has been added

* GtkTooltips:
 - The old tooltips API has been deprecated
 - The has-tooltip property has getter and setter

* GtkTreeView:
 - Convenience API to set tooltips: gtk_tree_view_set_tooltip_row(),
   gtk_tree_view_set_tooltip_cell(), gtk_tree_view_get_tooltip_context(),
   gtk_tree_view_set_tooltip_column()

* GtkIconView:
 - Convenience API to set tooltips: gtk_icon_view_set_tooltip_item(),
   gtk_icon_view_set_tooltip_cell(), gtk_icon_view_get_tooltip_context(),
   gtk_icon_view_set_tooltip_column()

Lots of bugfixes and translation updates.


Overview of Changes from GTK+ 2.11.4 to 2.11.5
==============================================

* OS X port:
 - Many improvements

* Win32 port:
 - Inconsistent checkboxes are drawn correctly now

* GtkBuilder:
 - Ship a Python script, gtk-builder-convert, to
   convert glade files to GtkBuilder syntax

* GtkFileChooser:
 - Improved display of the time column
 - Support search on OS X, using Spotlight

* GtkTreeView:
 - New function gtk_tree_view_is_rubber_banding_active() to
   check whether rubber banding is active

* GtkVolumeButton uses the range 0.0 to 1.0, and
  correctly adapts tooltips to display percentages

Lots of bugfixes and translation updates.


Overview of Changes from GTK+ 2.11.3 to 2.11.4
==============================================

* The multipress input method correctly handles control keys

* The memory management of GtkRecentManager has been
  changed, deprecating the screen-related functions in favour
  of gtk_recent_manager_get_default().

Lots of bugfixes.


Overview of Changes from GTK+ 2.11.2 to 2.11.3
==============================================

* GtkBuilder: GTK+ supports constructing user interfaces
  from XML descriptions now, similar to libglade.

* The new tooltip code now has convenience api to set
  text tooltips: gtk_widget_set_tooltip_text(),
  gtk_widget_set_tooltip_markup()

* GtkTextView, GtkEntry:
 - gtk_widget_modify_cursor() is a new function in the
   gtk_widget_modify family to override the style-provided
   cursor colors
 - Use a block cursor in overwrite mode

* GtkFileChooser:
 - Use xdg-user-dirs to find the Desktop directory
 - gtk_file_system_create() is now public API

* GtkMenu:
 - GtkMenuItem gained a submenu property
 - GtkMenuShell obtained a move-selected signal

* OS X port:
 - Many improvements

Lots of bugfixes and translation updates.


Overview of Changes from GTK+ 2.11.1 to 2.11.2
==============================================

* The GtkListStore and GtkTreeStore have new API
  to set values using vectors of columns and values

Bugfixes and translation updates.

Overview of Changes from GTK+ 2.11.0 to 2.11.1
==============================================

* GtkTextView:
 - Marks can be created independent from buffers
 - Cursor color follows text color

* OS X port:
 - Many improvements

* GDK:
 - Add support for composited child windows

Lots of bugfixes and translation updates.


Overview of Changes from GTK+ 2.10.x to 2.11
============================================

* Printing support:
 - Cups backend: Work with "BrowseShortNames Off"
 - Cups backend: Fix handling of multi-valued options
 - Cups backend: Work with raw printers
 - Cups backend: don't lock up when met with larger numbers of printers
 - Improved sensitivity handling of controls in the unix dialog
 - Support half-open ranges
 - Add a test print backend for easier debugging
 - Add API to list paper sizes
 - Add API to serialize and deserialize page setups and print settings
 - Print settings can be passed to the preview command
 - Make more GtkPrinter public

* GtkFileChooser:
 - Improve file chooser dialog size logic
 - Add a GtkFileChooserButton::file-set signal
 - Add a search mode with backends for Beagle, Tracker and simple search
 - Add recent files support

* New tooltips API, that allows complex tooltips (markup, images),
  tooltips on insensitive widgets, tooltips on treeviews, etc

* GtkScaleButton, GtkVolumeButton: new widgets for volume controls
  frequently seen in multimedia applications

* Input Methods:
 - New Thai and Lao input method
 - New multipress input method for phone pads

* Recent files:
 - GtkRecentChooserMenu supports custom menu items
 - GtkRecentAction was added

* Keyboard navigation improvements:
 - Infrastructure for notification of failed keyboard navigation
 - Better support for restricted sets of keys
 - Only handle keys for notebook tab reordering and scrolledwindow
   scrolling if it make sense
 - Add settings gtk-enable-accels and gtk-enable-mnemonics to disable
   the display of accelerators and mnemonics
 - Popup/popdown of comboboxes is keybindable

* Windows port:
 - Windows 9x/ME is not supported anymore
 - Many ms-windows theme improvements
 - The file chooser uses native icons
 - Support drop shadows
 - Use native cursors

* OS X port:
 - Many improvements

* Icon theme support:
 - Add api to list contexts of an icon theme
 - The builtin stock icons have been replaced by a new set of icons
   which are visually compatible with Tango
 - Support fallback to more generic icon names
 - Validate icon caches when they are created and before they are used

* GtkRange has gained support for fill levels

* GtkEntry:
 - inline-selection mode for entry completion that is closer to what
   web browsers need
 - Add gtk_entry_set_cursor_hadjustment() to support automatic scrolling

* GtkTextView:
 - Support accumulative and negative margins
 - GTK_JUSTIFY_FILL works

* GtkLabel:
 - GTK_JUSTIFY_FILL works

* GtkStatusIcon:
 - Multiscreen support
 - gtk_status_icon_position_menu() works on Windows
 - Don't take up space when invisible

* GtkCellRendererProgress:
 - Respect themes
 - Support activity mode

* GtkNotebook:
 - Support scrolling during tab DND
 - Allow dropping tabs anywhere
 - Deprecate numeric group-ids in favour of a more flexible group property

* GtkTreeView:
 - Lots of scrolling fixes
 - Add a gtk-alternative-sort-arrows setting for drawing sort arrows
   according to platform conventions

* GtkButtonBox:
 - Can center buttons now

* GtkComboBoxEntry
 - Can add an arbitrary child widget

* GtkAboutDialog:
 - The "name" property has been replaced by "program-name" to avoid
   a clash with the preexisting "name" property on GtkWidget

* GDK changes:
 - Add gdk_event_request_motions() which works with input devices
 - Add API for changing startup notification id on a window
 - Add API for sending startup notification messages
 - Don't deadlock with xcb-based libX11
 - The handling of _NET_WM_USER_TIME has been changed to reduce
   the amount of root window property changes
 - New gdk_threads api() to allow fully threadsafe handling of idles
   and timeouts

* gdk-pixbuf changes:
 - Optional support for Sun mediaLib hardware acceleration
 - Support exif rotations in tiffs and jpegs
 - Allow arbitrary split between builtin vs modular loaders
 - Support v5 and OS/2 bmps
 - Support scaling animations

* Miscellaneous GTK+ changes:
 - New function gtk_window_set_opacity(), to set the opacity
   of toplevel windows
 - Allow to restrict drags within an application or widget
 - Support opening/closing of submenus on click
 - Configurable cursor blinking timeout
 - Insensitive widgets don't install cursors

Lots of bugfixes and translation updates.

8 files changed, 71 insertions, 52 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 64cfd85dbfc..ae06c49b85a 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.143 2007/07/21 21:56:08 wiz Exp $
+# $NetBSD: Makefile,v 1.144 2007/09/16 19:53:26 wiz Exp $
 
-DISTNAME=		gtk+-2.10.14
+DISTNAME=		gtk+-2.12.0
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=		x11
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.10/ \
-			${MASTER_SITE_GNOME:=sources/gtk+/2.10/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.12/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.12/ \
+			${MASTER_SITE_GNOME:=sources/gtk+/2.12/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -17,12 +17,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS=		gtk2-engines<2.6.0
 
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.2.0
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.12.0
-BUILDLINK_API_DEPENDS.pango+=	pango>=1.13.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.13.5
+BUILDLINK_API_DEPENDS.pango+=	pango>=1.17.3
 
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt perl pkg-config
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 PTHREAD_AUTO_VARS=	yes
 
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index 72c404d168c..86e205a2a8e 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.53 2007/03/20 15:46:32 drochner Exp $
+@comment $NetBSD: PLIST,v 1.54 2007/09/16 19:53:26 wiz Exp $
 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
@@ -66,6 +67,8 @@ include/gtk-2.0/gtk/gtkbbox.h
 include/gtk-2.0/gtk/gtkbin.h
 include/gtk-2.0/gtk/gtkbindings.h
 include/gtk-2.0/gtk/gtkbox.h
+include/gtk-2.0/gtk/gtkbuildable.h
+include/gtk-2.0/gtk/gtkbuilder.h
 include/gtk-2.0/gtk/gtkbutton.h
 include/gtk-2.0/gtk/gtkcalendar.h
 include/gtk-2.0/gtk/gtkcelleditable.h
@@ -175,6 +178,7 @@ include/gtk-2.0/gtk/gtkradiomenuitem.h
 include/gtk-2.0/gtk/gtkradiotoolbutton.h
 include/gtk-2.0/gtk/gtkrange.h
 include/gtk-2.0/gtk/gtkrc.h
+include/gtk-2.0/gtk/gtkrecentaction.h
 include/gtk-2.0/gtk/gtkrecentchooser.h
 include/gtk-2.0/gtk/gtkrecentchooserdialog.h
 include/gtk-2.0/gtk/gtkrecentchoosermenu.h
@@ -183,6 +187,7 @@ include/gtk-2.0/gtk/gtkrecentfilter.h
 include/gtk-2.0/gtk/gtkrecentmanager.h
 include/gtk-2.0/gtk/gtkruler.h
 include/gtk-2.0/gtk/gtkscale.h
+include/gtk-2.0/gtk/gtkscalebutton.h
 include/gtk-2.0/gtk/gtkscrollbar.h
 include/gtk-2.0/gtk/gtkscrolledwindow.h
 include/gtk-2.0/gtk/gtkselection.h
@@ -218,6 +223,7 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h
 include/gtk-2.0/gtk/gtktoolbar.h
 include/gtk-2.0/gtk/gtktoolbutton.h
 include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktooltip.h
 include/gtk-2.0/gtk/gtktooltips.h
 include/gtk-2.0/gtk/gtktree.h
 include/gtk-2.0/gtk/gtktreednd.h
@@ -237,6 +243,7 @@ include/gtk-2.0/gtk/gtkvbbox.h
 include/gtk-2.0/gtk/gtkvbox.h
 include/gtk-2.0/gtk/gtkversion.h
 include/gtk-2.0/gtk/gtkviewport.h
+include/gtk-2.0/gtk/gtkvolumebutton.h
 include/gtk-2.0/gtk/gtkvpaned.h
 include/gtk-2.0/gtk/gtkvruler.h
 include/gtk-2.0/gtk/gtkvscale.h
@@ -254,6 +261,7 @@ lib/gtk-2.0/2.10.0/immodules/im-cedilla.la
 lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.la
 lib/gtk-2.0/2.10.0/immodules/im-inuktitut.la
 lib/gtk-2.0/2.10.0/immodules/im-ipa.la
+lib/gtk-2.0/2.10.0/immodules/im-multipress.la
 lib/gtk-2.0/2.10.0/immodules/im-thai.la
 lib/gtk-2.0/2.10.0/immodules/im-ti-er.la
 lib/gtk-2.0/2.10.0/immodules/im-ti-et.la
@@ -273,9 +281,9 @@ lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.la
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.la
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.la
+${CUPS}lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la
 lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.la
 lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.la
-${CUPS}lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la
 lib/gtk-2.0/include/gdkconfig.h
 ${QUARTZ}lib/libgdk-quartz-2.0.la
 ${X11}lib/libgdk-x11-2.0.la
@@ -285,15 +293,17 @@ ${QUARTZ}lib/libgtk-quartz-2.0.la
 ${X11}lib/libgtk-x11-2.0.la
 lib/pkgconfig/gdk-2.0.pc
 lib/pkgconfig/gdk-pixbuf-2.0.pc
-${QUARTZ}lib/pkgconfig/gdk-quartz-2.0.pc
 ${X11}lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
+${QUARTZ}lib/pkgconfig/gdk-quartz-2.0.pc
 ${X11}lib/pkgconfig/gdk-x11-2.0.pc
 lib/pkgconfig/gtk+-2.0.pc
 ${QUARTZ}lib/pkgconfig/gtk+-quartz-2.0.pc
 lib/pkgconfig/gtk+-unix-print-2.0.pc
 ${X11}lib/pkgconfig/gtk+-x11-2.0.pc
+libdata/gtk-2.0/im-multipress.conf
 man/man1/gdk-pixbuf-csource.1
 man/man1/gdk-pixbuf-query-loaders.1
+man/man1/gtk-builder-convert.1
 man/man1/gtk-query-immodules-2.0.1
 man/man1/gtk-update-icon-cache.1
 share/aclocal/gtk-2.0.m4
@@ -302,11 +312,13 @@ share/gtk-2.0/demo/apple-red.png
 share/gtk-2.0/demo/appwindow.c
 share/gtk-2.0/demo/assistant.c
 share/gtk-2.0/demo/background.jpg
+share/gtk-2.0/demo/builder.c
 share/gtk-2.0/demo/button_box.c
 share/gtk-2.0/demo/changedisplay.c
 share/gtk-2.0/demo/clipboard.c
 share/gtk-2.0/demo/colorsel.c
 share/gtk-2.0/demo/combobox.c
+share/gtk-2.0/demo/demo.ui
 share/gtk-2.0/demo/dialog.c
 share/gtk-2.0/demo/drawingarea.c
 share/gtk-2.0/demo/editable_cells.c
@@ -456,6 +468,7 @@ share/gtk-doc/html/gdk/ix04.html
 share/gtk-doc/html/gdk/ix05.html
 share/gtk-doc/html/gdk/ix06.html
 share/gtk-doc/html/gdk/ix07.html
+share/gtk-doc/html/gdk/ix08.html
 share/gtk-doc/html/gdk/left.png
 share/gtk-doc/html/gdk/left_ptr.png
 share/gtk-doc/html/gdk/left_side.png
@@ -508,6 +521,7 @@ share/gtk-doc/html/gdk/watch.png
 share/gtk-doc/html/gdk/xterm.png
 share/gtk-doc/html/gtk/AbstractObjects.html
 share/gtk-doc/html/gtk/Actions.html
+share/gtk-doc/html/gtk/Builder.html
 share/gtk-doc/html/gtk/ButtonWidgets.html
 share/gtk-doc/html/gtk/DeprecatedObjects.html
 share/gtk-doc/html/gtk/DisplayWidgets.html
@@ -523,6 +537,7 @@ share/gtk-doc/html/gtk/GtkAspectFrame.html
 share/gtk-doc/html/gtk/GtkAssistant.html
 share/gtk-doc/html/gtk/GtkBin.html
 share/gtk-doc/html/gtk/GtkBox.html
+share/gtk-doc/html/gtk/GtkBuilder.html
 share/gtk-doc/html/gtk/GtkButton.html
 share/gtk-doc/html/gtk/GtkButtonBox.html
 share/gtk-doc/html/gtk/GtkCList.html
@@ -621,6 +636,7 @@ share/gtk-doc/html/gtk/GtkRadioButton.html
 share/gtk-doc/html/gtk/GtkRadioMenuItem.html
 share/gtk-doc/html/gtk/GtkRadioToolButton.html
 share/gtk-doc/html/gtk/GtkRange.html
+share/gtk-doc/html/gtk/GtkRecentAction.html
 share/gtk-doc/html/gtk/GtkRecentChooser.html
 share/gtk-doc/html/gtk/GtkRecentChooserDialog.html
 share/gtk-doc/html/gtk/GtkRecentChooserMenu.html
@@ -629,6 +645,7 @@ share/gtk-doc/html/gtk/GtkRecentFilter.html
 share/gtk-doc/html/gtk/GtkRecentManager.html
 share/gtk-doc/html/gtk/GtkRuler.html
 share/gtk-doc/html/gtk/GtkScale.html
+share/gtk-doc/html/gtk/GtkScaleButton.html
 share/gtk-doc/html/gtk/GtkScrollbar.html
 share/gtk-doc/html/gtk/GtkScrolledWindow.html
 share/gtk-doc/html/gtk/GtkSeparator.html
@@ -656,6 +673,7 @@ share/gtk-doc/html/gtk/GtkToggleToolButton.html
 share/gtk-doc/html/gtk/GtkToolButton.html
 share/gtk-doc/html/gtk/GtkToolItem.html
 share/gtk-doc/html/gtk/GtkToolbar.html
+share/gtk-doc/html/gtk/GtkTooltip.html
 share/gtk-doc/html/gtk/GtkTooltips.html
 share/gtk-doc/html/gtk/GtkTree.html
 share/gtk-doc/html/gtk/GtkTreeItem.html
@@ -676,6 +694,7 @@ share/gtk-doc/html/gtk/GtkVScale.html
 share/gtk-doc/html/gtk/GtkVScrollbar.html
 share/gtk-doc/html/gtk/GtkVSeparator.html
 share/gtk-doc/html/gtk/GtkViewport.html
+share/gtk-doc/html/gtk/GtkVolumeButton.html
 share/gtk-doc/html/gtk/GtkWidget.html
 share/gtk-doc/html/gtk/GtkWindow.html
 share/gtk-doc/html/gtk/GtkWindowGroup.html
@@ -739,6 +758,7 @@ share/gtk-doc/html/gtk/gtk-about.png
 share/gtk-doc/html/gtk/gtk-add.png
 share/gtk-doc/html/gtk/gtk-apply.png
 share/gtk-doc/html/gtk/gtk-bold.png
+share/gtk-doc/html/gtk/gtk-builder-convert.html
 share/gtk-doc/html/gtk/gtk-building.html
 share/gtk-doc/html/gtk/gtk-cancel.png
 share/gtk-doc/html/gtk/gtk-cdrom.png
@@ -770,7 +790,6 @@ share/gtk-doc/html/gtk/gtk-find-and-replace.png
 share/gtk-doc/html/gtk/gtk-find.png
 share/gtk-doc/html/gtk/gtk-floppy.png
 share/gtk-doc/html/gtk/gtk-font.png
-share/gtk-doc/html/gtk/gtk-framebuffer.html
 share/gtk-doc/html/gtk/gtk-fullscreen.png
 share/gtk-doc/html/gtk/gtk-go-back-ltr.png
 share/gtk-doc/html/gtk/gtk-go-back-rtl.png
@@ -784,6 +803,7 @@ share/gtk-doc/html/gtk/gtk-goto-first-rtl.png
 share/gtk-doc/html/gtk/gtk-goto-last-ltr.png
 share/gtk-doc/html/gtk/gtk-goto-last-rtl.png
 share/gtk-doc/html/gtk/gtk-goto-top.png
+share/gtk-doc/html/gtk/gtk-gtkbuildable.html
 share/gtk-doc/html/gtk/gtk-gtkfilefilter.html
 share/gtk-doc/html/gtk/gtk-harddisk.png
 share/gtk-doc/html/gtk/gtk-help.png
@@ -816,6 +836,7 @@ share/gtk-doc/html/gtk/gtk-media-stop.png
 share/gtk-doc/html/gtk/gtk-migrating-GtkAboutDialog.html
 share/gtk-doc/html/gtk/gtk-migrating-GtkAction.html
 share/gtk-doc/html/gtk/gtk-migrating-GtkAssistant.html
+share/gtk-doc/html/gtk/gtk-migrating-GtkBuilder.html
 share/gtk-doc/html/gtk/gtk-migrating-GtkColorButton.html
 share/gtk-doc/html/gtk/gtk-migrating-GtkComboBox.html
 share/gtk-doc/html/gtk/gtk-migrating-GtkFileChooser.html
@@ -823,6 +844,7 @@ share/gtk-doc/html/gtk/gtk-migrating-GtkIconView.html
 share/gtk-doc/html/gtk/gtk-migrating-GtkLinkButton.html
 share/gtk-doc/html/gtk/gtk-migrating-GtkRecentChooser.html
 share/gtk-doc/html/gtk/gtk-migrating-checklist.html
+share/gtk-doc/html/gtk/gtk-migrating-tooltips.html
 share/gtk-doc/html/gtk/gtk-missing-image.png
 share/gtk-doc/html/gtk/gtk-network.png
 share/gtk-doc/html/gtk/gtk-new.png
@@ -897,6 +919,7 @@ share/gtk-doc/html/gtk/ix04.html
 share/gtk-doc/html/gtk/ix05.html
 share/gtk-doc/html/gtk/ix06.html
 share/gtk-doc/html/gtk/ix07.html
+share/gtk-doc/html/gtk/ix08.html
 share/gtk-doc/html/gtk/label.png
 share/gtk-doc/html/gtk/left.png
 share/gtk-doc/html/gtk/link-button.png
@@ -926,8 +949,10 @@ share/gtk-doc/html/gtk/statusbar.png
 share/gtk-doc/html/gtk/style.css
 share/gtk-doc/html/gtk/toggle-button.png
 share/gtk-doc/html/gtk/toolbar.png
+share/gtk-doc/html/gtk/tree-view-coordinates.png
 share/gtk-doc/html/gtk/ui-manager.html
 share/gtk-doc/html/gtk/up.png
+share/gtk-doc/html/gtk/volumebutton.png
 share/gtk-doc/html/gtk/window.png
 share/locale/af/LC_MESSAGES/gtk20-properties.mo
 share/locale/af/LC_MESSAGES/gtk20.mo
@@ -937,8 +962,6 @@ share/locale/ang/LC_MESSAGES/gtk20-properties.mo
 share/locale/ang/LC_MESSAGES/gtk20.mo
 share/locale/ar/LC_MESSAGES/gtk20-properties.mo
 share/locale/ar/LC_MESSAGES/gtk20.mo
-share/locale/as/LC_MESSAGES/gtk20-properties.mo
-share/locale/as/LC_MESSAGES/gtk20.mo
 share/locale/az/LC_MESSAGES/gtk20-properties.mo
 share/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/az_IR/LC_MESSAGES/gtk20-properties.mo
@@ -1049,6 +1072,8 @@ share/locale/nn/LC_MESSAGES/gtk20-properties.mo
 share/locale/nn/LC_MESSAGES/gtk20.mo
 share/locale/nso/LC_MESSAGES/gtk20-properties.mo
 share/locale/nso/LC_MESSAGES/gtk20.mo
+share/locale/oc/LC_MESSAGES/gtk20-properties.mo
+share/locale/oc/LC_MESSAGES/gtk20.mo
 share/locale/or/LC_MESSAGES/gtk20-properties.mo
 share/locale/or/LC_MESSAGES/gtk20.mo
 share/locale/pa/LC_MESSAGES/gtk20-properties.mo
@@ -1065,8 +1090,6 @@ share/locale/ru/LC_MESSAGES/gtk20-properties.mo
 share/locale/ru/LC_MESSAGES/gtk20.mo
 share/locale/rw/LC_MESSAGES/gtk20-properties.mo
 share/locale/rw/LC_MESSAGES/gtk20.mo
-share/locale/si/LC_MESSAGES/gtk20-properties.mo
-share/locale/si/LC_MESSAGES/gtk20.mo
 share/locale/sk/LC_MESSAGES/gtk20-properties.mo
 share/locale/sk/LC_MESSAGES/gtk20.mo
 share/locale/sl/LC_MESSAGES/gtk20-properties.mo
@@ -1099,8 +1122,8 @@ share/locale/ur/LC_MESSAGES/gtk20-properties.mo
 share/locale/ur/LC_MESSAGES/gtk20.mo
 share/locale/uz/LC_MESSAGES/gtk20-properties.mo
 share/locale/uz/LC_MESSAGES/gtk20.mo
-share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo
-share/locale/uz@Latn/LC_MESSAGES/gtk20.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gtk20.mo
 share/locale/vi/LC_MESSAGES/gtk20-properties.mo
 share/locale/vi/LC_MESSAGES/gtk20.mo
 share/locale/wa/LC_MESSAGES/gtk20-properties.mo
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 9478d1d2094..35c99953254 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.87 2007/07/19 21:43:35 wiz Exp $
+$NetBSD: distinfo,v 1.88 2007/09/16 19:53:26 wiz Exp $
 
-SHA1 (gtk+-2.10.14.tar.bz2) = 78b819814d52caa66739ab64611e41f35e5b48c3
-RMD160 (gtk+-2.10.14.tar.bz2) = 234d7240732b28a31a260aa9e04c34fc502acbf4
-Size (gtk+-2.10.14.tar.bz2) = 15172170 bytes
-SHA1 (patch-aa) = 7efcbf733e3459fd3853c0d49842136b434ca983
-SHA1 (patch-ab) = b36f9e74e5c9ecc7617bc659b72822e52451a3ae
-SHA1 (patch-ac) = 59c1f7bfb0db4a38f943d389f8d5a649f4d1a0f3
+SHA1 (gtk+-2.12.0.tar.bz2) = f5ecbf73a789a8880a6b2e15279267bb113980e2
+RMD160 (gtk+-2.12.0.tar.bz2) = 226c8f38eb7895d63f81feb60152db1ca3599628
+Size (gtk+-2.12.0.tar.bz2) = 15732170 bytes
+SHA1 (patch-aa) = 507f43c8257607c3ddb194015cc67c5b166a5047
+SHA1 (patch-ac) = 9582cc72149a5746fd63d6b29c332e6835ec66bc
 SHA1 (patch-ad) = f38270c343961be2892d8f2b2f89a67d21f0dc15
-SHA1 (patch-ae) = 3c99f3ded9b82e4eff440b014ef034f8dc7aae79
-SHA1 (patch-ai) = c54cd41297cae98355cc9cb61a762463bac43902
+SHA1 (patch-ae) = b56b3f65186919fb1e458cce0c5bdef676c9bdf8
+SHA1 (patch-ai) = 203d7e91ef7c8cdaa7660ed3a0d500876c537d44
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index 2506575f91b..23ba74703a9 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.15 2005/10/05 14:37:44 wiz Exp $
+$NetBSD: patch-aa,v 1.16 2007/09/16 19:53:26 wiz Exp $
 
---- gdk-pixbuf/Makefile.in.orig	2005-10-04 06:31:25.000000000 +0200
+--- gdk-pixbuf/Makefile.in.orig	2007-09-13 23:40:48.000000000 +0000
 +++ gdk-pixbuf/Makefile.in
-@@ -526,7 +526,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-
+@@ -567,7 +567,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-
  gdk_pixbuf_csource_LDADD = $(LDADDS)
  
  gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
deleted file mode 100644
index e20b51ee24d..00000000000
--- a/x11/gtk2/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.16 2007/04/10 13:05:59 adam Exp $
-
---- gdk/quartz/gdkdrawable-quartz.c.orig	2007-04-10 14:32:41.000000000 +0200
-+++ gdk/quartz/gdkdrawable-quartz.c
-@@ -61,7 +61,7 @@ gdk_quartz_ref_cairo_surface (GdkDrawabl
- 
-   gdk_drawable_get_size (drawable, &width, &height);
- 
--  surface = cairo_quartz_surface_create (context, width, height, TRUE);
-+  surface = cairo_quartz_surface_create_for_cg_context (context, width, height);
- 
-   info = g_new (SurfaceInfo, 1);
-   info->drawable = drawable;
diff --git a/x11/gtk2/patches/patch-ac b/x11/gtk2/patches/patch-ac
index 3be9d29046f..547b5169789 100644
--- a/x11/gtk2/patches/patch-ac
+++ b/x11/gtk2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.14 2007/05/29 09:58:59 obache Exp $
+$NetBSD: patch-ac,v 1.15 2007/09/16 19:53:27 wiz Exp $
 
---- gdk/quartz/gdkevents-quartz.c.orig	2007-05-02 16:27:34.000000000 +0000
+--- gdk/quartz/gdkevents-quartz.c.orig	2007-09-13 20:36:07.000000000 +0000
 +++ gdk/quartz/gdkevents-quartz.c
-@@ -1581,6 +1581,23 @@ gdk_flush (void)
+@@ -1859,6 +1859,23 @@ gdk_add_client_message_filter (GdkAtom  
    /* Not supported. */
  }
  
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
index d6a00479f23..915780cd3d5 100644
--- a/x11/gtk2/patches/patch-ae
+++ b/x11/gtk2/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.14 2007/05/29 09:58:59 obache Exp $
+$NetBSD: patch-ae,v 1.15 2007/09/16 19:53:27 wiz Exp $
 
---- gdk/quartz/gdkselection-quartz.c.orig	2007-05-02 16:27:34.000000000 +0000
+--- gdk/quartz/gdkselection-quartz.c.orig	2007-09-13 20:36:07.000000000 +0000
 +++ gdk/quartz/gdkselection-quartz.c
-@@ -122,6 +122,12 @@ gdk_utf8_to_compound_text_for_display (G
-   return 0;
+@@ -131,6 +131,12 @@ gdk_free_text_list (gchar **list)
+   g_free (list);
  }
  
 +void
diff --git a/x11/gtk2/patches/patch-ai b/x11/gtk2/patches/patch-ai
index 8485084b317..7a8c655e349 100644
--- a/x11/gtk2/patches/patch-ai
+++ b/x11/gtk2/patches/patch-ai
@@ -1,8 +1,17 @@
-$NetBSD: patch-ai,v 1.18 2007/01/06 15:13:15 wiz Exp $
+$NetBSD: patch-ai,v 1.19 2007/09/16 19:53:27 wiz Exp $
 
---- configure.orig	2006-09-05 04:40:15.000000000 +0200
+--- configure.orig	2007-09-13 20:47:55.000000000 +0000
 +++ configure
-@@ -32042,6 +32042,9 @@ _ACEOF
+@@ -4652,7 +4652,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+-if test "$OBJC" == "yes"; then
++if test "$OBJC" = "yes"; then
+   HAVE_OBJC_TRUE=
+   HAVE_OBJC_FALSE='#'
+ else
+@@ -35379,6 +35379,9 @@ fi
  fi