Update gtk3 to 3.12.2

Highlights from changes:

* GtkPopover: A new widget that is can be used for transient
  views, as an alternative to menus or dialogs.
 - GtkMenuButton can use popovers instead of menus
* Client-side decorations:
 - Make F10 move focus to the header bar
 - Make header bars draggable on touch systems
 - Make shadows unclickable
* Printing: Google cloud print support
* GtkActionBar is a new widget that is meant to be used
  for actions at the bottom of a window.
* GtkAppChooserDialog has been redesigned

* GtkBox can now place a widget centered, regardless of
  the sizes of children on either side, similar to GtkHeaderBar.
* Dialogs:
 - Dialogs have been modernized, can use a header bar now
 - Built-in dialogs react to a setting, gtk-dialogs-use-header
   for this, dialogs derived from GtkDialog: default to no headerbar
 - GtkAssistant also respects the setting
* OS X:
 - Better menu integration. Items such as 'Hide', 'Hide Others'
   and 'Show All' are now handled specially
 - GTK+ provides a default application menu now
* Theming:
 - GTK+ now uses RGBA visuals by default
 - Notebook tabs now support a prelight state
 - Reorderable notebook tabs can be themed differently
* GtkActionBar: A new container, which has a centered
  child like GtkHeaderBar. It can be used in places
  where header bar theming is not suitable
* GtkAppChooser: The online support has been simplified
  and modernized
* GtkHeaderBar button theming has been changed to be
  more flexible. There is now a gtk-decoraton-layout
  setting and a decoration-layout property.
* Accessibility:
  - Links in labels are now accessible
  - Model-based menus are accessible
  - Accessible roles of several widgets have been fixed
  - GtkColorChooser accessibility is improved
* Theming: The Raleigh theme has been updated for
  several new features, including client-side decorations
* Model-based menus now support a hidden-when attribute
  on items that allows them to be hidden on various
  conditions
* New notebook tab styling: GtkNotebook now offers a way
  for themes to opt out of the tab rendering, with the
  'has-tab-gap' style property. The Adwaita theme is using
  this to achieve a more modern tab appearance.
* GtkFlowBox: A container that its children in a reflowing
  grid, which can be oriented horizontally or vertically.
  It is similar to GtkListBox in that the children can
  be sorted and filtered, and by requiring a dedicated child
  widget type, GtkFlowBoxChild. It is similar to GtkTreeView
  in that is supports a full set of selection modes, including
  rubberband selection.
* GtkStack: children can now indicate that they require
  attention by setting the needs-attention child property.
* Broadway now requires binary array buffers and modern WebSocket
  protocol support
* Autoscrolling in range widgets has been improved to work more
  reliably in maximized windows.
* GtkSpinner has been changed to render in in a limited set of
  sizes.
* GtkApplication now stores and handles accelerators for GActions
  itself.
* GtkIconTheme now falls back to the gnome icontheme to fix
  problems with the availability of symbolic icons in other
  icon themes.
* GTK+ respects the deprecated gtk-button-images and gtk-menu-images
  settings again.

For full details see:
https://git.gnome.org/browse/gtk+/tree/NEWS?id=3.12.2

5 files changed, 49 insertions, 34 deletions

diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile
index ecfa2d8fb7e..fb28503b7f9 100644
--- a/x11/gtk3/Makefile
+++ b/x11/gtk3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2014/07/19 20:32:15 richard Exp $
+# $NetBSD: Makefile,v 1.53 2014/09/08 11:19:47 prlw1 Exp $
 
-DISTNAME=	gtk+-3.10.7
+DISTNAME=	gtk+-3.12.2
 PKGNAME=	${DISTNAME:S/gtk/gtk3/}
-PKGREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/${PKGVERSION_NOREV:R}/ \
 		${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
@@ -98,5 +97,9 @@ BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.12.0
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+# gtk-update-icon-cache --source  is called during build
+NOOP_GTK_UPDATE_ICON_CACHE=
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk3/PLIST b/x11/gtk3/PLIST
index 7b541482e97..263b3efc197 100644
--- a/x11/gtk3/PLIST
+++ b/x11/gtk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2014/03/22 13:03:56 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/09/08 11:19:47 prlw1 Exp $
 bin/gtk-launch
 bin/gtk-query-immodules-3.0
 bin/gtk3-demo
@@ -82,6 +82,8 @@ include/gtk-3.0/gtk/a11y/gtkcontaineraccessible.h
 include/gtk-3.0/gtk/a11y/gtkcontainercellaccessible.h
 include/gtk-3.0/gtk/a11y/gtkentryaccessible.h
 include/gtk-3.0/gtk/a11y/gtkexpanderaccessible.h
+include/gtk-3.0/gtk/a11y/gtkflowboxaccessible.h
+include/gtk-3.0/gtk/a11y/gtkflowboxchildaccessible.h
 include/gtk-3.0/gtk/a11y/gtkframeaccessible.h
 include/gtk-3.0/gtk/a11y/gtkiconviewaccessible.h
 include/gtk-3.0/gtk/a11y/gtkimageaccessible.h
@@ -93,11 +95,13 @@ include/gtk-3.0/gtk/a11y/gtklistboxaccessible.h
 include/gtk-3.0/gtk/a11y/gtklistboxrowaccessible.h
 include/gtk-3.0/gtk/a11y/gtklockbuttonaccessible.h
 include/gtk-3.0/gtk/a11y/gtkmenuaccessible.h
+include/gtk-3.0/gtk/a11y/gtkmenubuttonaccessible.h
 include/gtk-3.0/gtk/a11y/gtkmenuitemaccessible.h
 include/gtk-3.0/gtk/a11y/gtkmenushellaccessible.h
 include/gtk-3.0/gtk/a11y/gtknotebookaccessible.h
 include/gtk-3.0/gtk/a11y/gtknotebookpageaccessible.h
 include/gtk-3.0/gtk/a11y/gtkpanedaccessible.h
+include/gtk-3.0/gtk/a11y/gtkpopoveraccessible.h
 include/gtk-3.0/gtk/a11y/gtkprogressbaraccessible.h
 include/gtk-3.0/gtk/a11y/gtkradiobuttonaccessible.h
 include/gtk-3.0/gtk/a11y/gtkradiomenuitemaccessible.h
@@ -158,6 +162,7 @@ include/gtk-3.0/gtk/gtkaccellabel.h
 include/gtk-3.0/gtk/gtkaccelmap.h
 include/gtk-3.0/gtk/gtkaccessible.h
 include/gtk-3.0/gtk/gtkactionable.h
+include/gtk-3.0/gtk/gtkactionbar.h
 include/gtk-3.0/gtk/gtkadjustment.h
 include/gtk-3.0/gtk/gtkalignment.h
 include/gtk-3.0/gtk/gtkappchooser.h
@@ -223,6 +228,7 @@ include/gtk-3.0/gtk/gtkfilechooserdialog.h
 include/gtk-3.0/gtk/gtkfilechooserwidget.h
 include/gtk-3.0/gtk/gtkfilefilter.h
 include/gtk-3.0/gtk/gtkfixed.h
+include/gtk-3.0/gtk/gtkflowbox.h
 include/gtk-3.0/gtk/gtkfontbutton.h
 include/gtk-3.0/gtk/gtkfontchooser.h
 include/gtk-3.0/gtk/gtkfontchooserdialog.h
@@ -268,6 +274,7 @@ include/gtk-3.0/gtk/gtkpaned.h
 include/gtk-3.0/gtk/gtkpapersize.h
 include/gtk-3.0/gtk/gtkplacessidebar.h
 include/gtk-3.0/gtk/gtkplug.h
+include/gtk-3.0/gtk/gtkpopover.h
 include/gtk-3.0/gtk/gtkprintcontext.h
 include/gtk-3.0/gtk/gtkprintoperation.h
 include/gtk-3.0/gtk/gtkprintoperationpreview.h
@@ -390,6 +397,8 @@ man/man1/gtk-launch.1
 man/man1/gtk-query-immodules-3.0.1
 man/man1/gtk-update-icon-cache.1
 share/aclocal/gtk-3.0.m4
+share/applications/gtk3-demo.desktop
+share/applications/gtk3-widget-factory.desktop
 share/gir-1.0/Gdk-3.0.gir
 ${PLIST.x11}share/gir-1.0/GdkX11-3.0.gir
 share/gir-1.0/Gtk-3.0.gir
@@ -415,11 +424,13 @@ share/gtk-doc/html/gdk3/GdkDevice.html
 share/gtk-doc/html/gdk3/GdkDeviceManager.html
 share/gtk-doc/html/gdk3/GdkDisplay.html
 share/gtk-doc/html/gdk3/GdkDisplayManager.html
+share/gtk-doc/html/gdk3/GdkFrameClock.html
 share/gtk-doc/html/gdk3/GdkScreen.html
 share/gtk-doc/html/gdk3/X_cursor.png
 share/gtk-doc/html/gdk3/annotation-glossary.html
 share/gtk-doc/html/gdk3/api-index-3-0.html
 share/gtk-doc/html/gdk3/api-index-3-10.html
+share/gtk-doc/html/gdk3/api-index-3-12.html
 share/gtk-doc/html/gdk3/api-index-3-2.html
 share/gtk-doc/html/gdk3/api-index-3-4.html
 share/gtk-doc/html/gdk3/api-index-3-6.html
@@ -459,7 +470,6 @@ share/gtk-doc/html/gdk3/gdk3-Cursors.html
 share/gtk-doc/html/gdk3/gdk3-Drag-and-Drop.html
 share/gtk-doc/html/gdk3/gdk3-Event-Structures.html
 share/gtk-doc/html/gdk3/gdk3-Events.html
-share/gtk-doc/html/gdk3/gdk3-GdkFrameClock.html
 share/gtk-doc/html/gdk3/gdk3-GdkFrameTimings.html
 share/gtk-doc/html/gdk3/gdk3-General.html
 share/gtk-doc/html/gdk3/gdk3-Keyboard-Handling.html
@@ -611,6 +621,7 @@ share/gtk-doc/html/gtk3/GtkFileChooserDialog.html
 share/gtk-doc/html/gtk3/GtkFileChooserWidget.html
 share/gtk-doc/html/gtk3/GtkFileFilter.html
 share/gtk-doc/html/gtk3/GtkFixed.html
+share/gtk-doc/html/gtk3/GtkFlowBox.html
 share/gtk-doc/html/gtk3/GtkFontButton.html
 share/gtk-doc/html/gtk3/GtkFontChooser.html
 share/gtk-doc/html/gtk3/GtkFontChooserDialog.html
@@ -661,6 +672,8 @@ share/gtk-doc/html/gtk3/GtkPageSetupUnixDialog.html
 share/gtk-doc/html/gtk3/GtkPaned.html
 share/gtk-doc/html/gtk3/GtkPaperSize.html
 share/gtk-doc/html/gtk3/GtkPlacesSidebar.html
+share/gtk-doc/html/gtk3/GtkPlug.html
+share/gtk-doc/html/gtk3/GtkPopover.html
 share/gtk-doc/html/gtk3/GtkPrintContext.html
 share/gtk-doc/html/gtk3/GtkPrintJob.html
 share/gtk-doc/html/gtk3/GtkPrintSettings.html
@@ -692,6 +705,7 @@ share/gtk-doc/html/gtk3/GtkSeparatorMenuItem.html
 share/gtk-doc/html/gtk3/GtkSeparatorToolItem.html
 share/gtk-doc/html/gtk3/GtkSettings.html
 share/gtk-doc/html/gtk3/GtkSizeGroup.html
+share/gtk-doc/html/gtk3/GtkSocket.html
 share/gtk-doc/html/gtk3/GtkSpinButton.html
 share/gtk-doc/html/gtk3/GtkSpinner.html
 share/gtk-doc/html/gtk3/GtkStack.html
@@ -761,6 +775,7 @@ share/gtk-doc/html/gtk3/accel-label.png
 share/gtk-doc/html/gtk3/annotation-glossary.html
 share/gtk-doc/html/gtk3/api-index-3-0.html
 share/gtk-doc/html/gtk3/api-index-3-10.html
+share/gtk-doc/html/gtk3/api-index-3-12.html
 share/gtk-doc/html/gtk3/api-index-3-2.html
 share/gtk-doc/html/gtk3/api-index-3-4.html
 share/gtk-doc/html/gtk3/api-index-3-6.html
@@ -847,6 +862,7 @@ share/gtk-doc/html/gtk3/figure-hierarchical-drawing.png
 share/gtk-doc/html/gtk3/figure-windowed-label.png
 share/gtk-doc/html/gtk3/file-button.png
 share/gtk-doc/html/gtk3/filechooser.png
+share/gtk-doc/html/gtk3/flow-box.png
 share/gtk-doc/html/gtk3/focus.png
 share/gtk-doc/html/gtk3/folder.png
 share/gtk-doc/html/gtk3/font-button.png
@@ -867,6 +883,7 @@ share/gtk-doc/html/gtk3/frame-gap.png
 share/gtk-doc/html/gtk3/frame.png
 share/gtk-doc/html/gtk3/frames.png
 share/gtk-doc/html/gtk3/getting-started-app1.png
+share/gtk-doc/html/gtk3/getting-started-app10.png
 share/gtk-doc/html/gtk3/getting-started-app2.png
 share/gtk-doc/html/gtk3/getting-started-app3.png
 share/gtk-doc/html/gtk3/getting-started-app4.png
@@ -953,9 +970,8 @@ share/gtk-doc/html/gtk3/gtk3-Drag-and-Drop.html
 share/gtk-doc/html/gtk3/gtk3-Feature-Test-Macros.html
 share/gtk-doc/html/gtk3/gtk3-Filesystem-utilities.html
 share/gtk-doc/html/gtk3/gtk3-General.html
+share/gtk-doc/html/gtk3/gtk3-GtkActionBar.html
 share/gtk-doc/html/gtk3/gtk3-GtkGradient.html
-share/gtk-doc/html/gtk3/gtk3-GtkPlug.html
-share/gtk-doc/html/gtk3/gtk3-GtkSocket.html
 share/gtk-doc/html/gtk3/gtk3-GtkStyleProperties.html
 share/gtk-doc/html/gtk3/gtk3-GtkSymbolicColor.html
 share/gtk-doc/html/gtk3/gtk3-GtkTreeView-drag-and-drop.html
@@ -1095,6 +1111,18 @@ share/gtk-doc/html/gtk3/zoom-fit-best.png
 share/gtk-doc/html/gtk3/zoom-in.png
 share/gtk-doc/html/gtk3/zoom-original.png
 share/gtk-doc/html/gtk3/zoom-out.png
+share/icons/hicolor/16x16/apps/gtk3-demo.png
+share/icons/hicolor/16x16/apps/gtk3-widget-factory.png
+share/icons/hicolor/22x22/apps/gtk3-demo.png
+share/icons/hicolor/22x22/apps/gtk3-widget-factory.png
+share/icons/hicolor/24x24/apps/gtk3-demo.png
+share/icons/hicolor/24x24/apps/gtk3-widget-factory.png
+share/icons/hicolor/256x256/apps/gtk3-demo.png
+share/icons/hicolor/256x256/apps/gtk3-widget-factory.png
+share/icons/hicolor/32x32/apps/gtk3-demo.png
+share/icons/hicolor/32x32/apps/gtk3-widget-factory.png
+share/icons/hicolor/48x48/apps/gtk3-demo.png
+share/icons/hicolor/48x48/apps/gtk3-widget-factory.png
 share/locale/af/LC_MESSAGES/gtk30-properties.mo
 share/locale/af/LC_MESSAGES/gtk30.mo
 share/locale/am/LC_MESSAGES/gtk30-properties.mo
diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo
index 9ead0d99410..3dcf0197133 100644
--- a/x11/gtk3/distinfo
+++ b/x11/gtk3/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.23 2014/03/31 13:26:31 adam Exp $
+$NetBSD: distinfo,v 1.24 2014/09/08 11:19:47 prlw1 Exp $
 
-SHA1 (gtk+-3.10.7.tar.xz) = cf30e2e0c4cab9d5dfc0b4325a3139ed01387d01
-RMD160 (gtk+-3.10.7.tar.xz) = d2907147d6fc6a8532982c64edfd530b07ea343b
-Size (gtk+-3.10.7.tar.xz) = 14363820 bytes
+SHA1 (gtk+-3.12.2.tar.xz) = 9727843d1389306fcad80f92bb50201f1f43f894
+RMD160 (gtk+-3.12.2.tar.xz) = 49dd0b66a3f0806106f958949a8c655494882fad
+Size (gtk+-3.12.2.tar.xz) = 15015024 bytes
 SHA1 (patch-aj) = 4a03d88ba597fd93cfd2807e779a431e98bb8d5e
 SHA1 (patch-config.h.in) = 479ebf5a5cf5ca6855fcda94063638a919bbf548
-SHA1 (patch-configure) = 0bf253073a8799082f83fbd37b5424e9adf9b9d3
+SHA1 (patch-configure) = cb4e8c35154b3888c2ba6e178eea63df3890d719
 SHA1 (patch-configure.ac) = 4a2144abddc3468500515511cd934fd35f573952
 SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
 SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 11cf5dfe1bd6cfe08851c658ae871d3994759ae5
-SHA1 (patch-gtk_gtkselection.c) = 44b4c3e2be54abf4420a98cd22b5534724f47b5e
diff --git a/x11/gtk3/patches/patch-configure b/x11/gtk3/patches/patch-configure
index 9c773464d44..ad97bee770a 100644
--- a/x11/gtk3/patches/patch-configure
+++ b/x11/gtk3/patches/patch-configure
@@ -1,16 +1,16 @@
-$NetBSD: patch-configure,v 1.1 2013/05/11 19:49:15 riastradh Exp $
+$NetBSD: patch-configure,v 1.2 2014/09/08 11:19:47 prlw1 Exp $
 
---- configure.orig	2013-01-20 03:10:46.000000000 +0000
+--- configure.orig	2014-03-25 00:21:59.000000000 +0000
 +++ configure
-@@ -1010,6 +1010,7 @@ enable_glibtest
+@@ -1035,6 +1035,7 @@ enable_glibtest
  enable_modules
  with_included_immodules
  with_x
 +with_atk_bridge
  enable_cups
  enable_papi
- enable_test_print_backend
-@@ -1754,6 +1755,7 @@ Optional Packages:
+ enable_cloudprint
+@@ -1782,6 +1783,7 @@ Optional Packages:
    --with-included-immodules=MODULE1,MODULE2,...
                            build the specified input methods into gtk
    --with-x                use the X Window System
@@ -18,7 +18,7 @@ $NetBSD: patch-configure,v 1.1 2013/05/11 19:49:15 riastradh Exp $
    --with-html-dir=PATH    path to installed docs
    --with-xml-catalog=CATALOG
                            path to xml catalog to use
-@@ -23450,8 +23452,20 @@ fi
+@@ -24467,8 +24469,20 @@ fi
  # Check for Accessibility Toolkit flags
  ########################################
  
diff --git a/x11/gtk3/patches/patch-gtk_gtkselection.c b/x11/gtk3/patches/patch-gtk_gtkselection.c
deleted file mode 100644
index 455d95a0c52..00000000000
--- a/x11/gtk3/patches/patch-gtk_gtkselection.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gtk_gtkselection.c,v 1.1 2014/02/13 20:18:14 wiz Exp $
-
-Add missing return value. Fixes compilation with clang.
-
---- gtk/gtkselection.c.orig	2014-01-27 22:40:26.000000000 +0000
-+++ gtk/gtkselection.c
-@@ -2294,7 +2294,7 @@ _gtk_selection_request (GtkWidget *widge
-   gulong selection_max_size;
- 
-   if (event->requestor == NULL)
--    return;
-+    return FALSE;
- 
-   if (initialize)
-     gtk_selection_init ();