[pkgsrc/trunk]: pkgsrc/x11/gtk3 Update gtk3 to 3.6.1

[prlw1 <prlw1%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d232eb9274d2
branches:  trunk
changeset: 610117:d232eb9274d2
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Thu Oct 18 19:08:47 2012 +0000

description:
Update gtk3 to 3.6.1

* The accessibility bridge code that exports accessible objects
  on the bus is now used by default; atk-bridge has been converted
  into a library that GTK+ links against. To void the linking,
  pass --without-atk-bridge when configuring GTK+.

* GDK threading support has been deprecated. It is recommended to
  use g_idle_add(), g_main_context_invoke() and similar funtions
  to make all GTK+ calls from the main thread.

* GTK+ now follows the XDG Base Directory specification for
  user configuration and data files. In detail,
  * $XDG_CONFIG_HOME/gtk-3.0/custom-papers is the new location
    for $HOME/.gtk-custom-papers
  * $XDG_CONFIG_HOME/gtk-3.0/bookmarks is the new location
    for $HOME/.gtk-bookmarks
  * $XDG_DATA_HOME/themes is preferred over $HOME/.themes
  * $XDG_DATA_HOME/icons is preferred over $HOME/.icons.
  Existing files from the old location will still be read
  if the new location does not exist.

* $HOME/.gtk-3.0 is no longer in the default module load path.
  If you want to load modules from there, add it to the GTK_PATH
  environment variable.

diffstat:

 x11/gtk3/Makefile                                  |  18 +++---
 x11/gtk3/PLIST                                     |  51 +++++++++++++++++++++-
 x11/gtk3/buildlink3.mk                             |   3 +-
 x11/gtk3/distinfo                                  |  12 +---
 x11/gtk3/patches/patch-ab                          |  20 --------
 x11/gtk3/patches/patch-af                          |  31 -------------
 x11/gtk3/patches/patch-ak                          |  13 -----
 x11/gtk3/patches/patch-gtk_gtksearchenginesimple.c |  14 ------
 8 files changed, 65 insertions(+), 97 deletions(-)

diffs (truncated from 410 to 300 lines):

diff -r f20352546171 -r d232eb9274d2 x11/gtk3/Makefile
--- a/x11/gtk3/Makefile Thu Oct 18 16:58:18 2012 +0000
+++ b/x11/gtk3/Makefile Thu Oct 18 19:08:47 2012 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2012/10/08 23:00:34 adam Exp $
+# $NetBSD: Makefile,v 1.30 2012/10/18 19:08:47 prlw1 Exp $
 
-DISTNAME=      gtk+-3.4.4
+DISTNAME=      gtk+-3.6.1
 PKGNAME=       ${DISTNAME:S/gtk/gtk3/}
-PKGREVISION=   5
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.gtk.org/pub/gtk/${PKGVERSION_NOREV:R}/ \
                ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
@@ -34,10 +33,8 @@
 TEST_TARGET=           check
 
 PKGCONFIG_OVERRIDE+=   gdk-3.0.pc.in
-PKGCONFIG_OVERRIDE+=   gtk+-3.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=   gtk+-3.0.pc.in
 PKGCONFIG_OVERRIDE+=   gtk+-unix-print-3.0.pc.in
-PKGCONFIG_OVERRIDE+=   gail-3.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=   gail-3.0.pc.in
 
 INSTALLATION_DIRS+=    lib/gtk-3.0/immodules
@@ -63,7 +60,7 @@
 CONFIGURE_ENV+=                ac_cv_func_isinf=yes
 .endif
 
-CFLAGS.SunOS+=         -std=gnu99 -D_XOPEN_SOURCE=600
+CFLAGS.SunOS+=         -std=gnu99
 
 CPPFLAGS+=             -DPREFIX="\"${PREFIX}\""
 
@@ -77,13 +74,16 @@
 .include "modules.mk"
 
 .include "../../databases/shared-mime-info/buildlink3.mk"
-BUILDLINK_API_DEPENDS.atk+=    atk>=2.2.0nb2
+BUILDLINK_API_DEPENDS.atk+=    atk>=2.5.3
 .include "../../devel/atk/buildlink3.mk"
+BUILDLINK_API_DEPENDS.at-spi2-atk+=    at-spi2-atk>=2.6.1
+.include "../../devel/at-spi2-atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.29.14
+BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.33.1
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gdk-pixbuf2+=    gdk-pixbuf2>=2.24.1nb2
+BUILDLINK_API_DEPENDS.gdk-pixbuf2+=    gdk-pixbuf2>=2.26.0
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection:=    build
 BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=1.32
 .include "../../devel/gobject-introspection/buildlink3.mk"
 
diff -r f20352546171 -r d232eb9274d2 x11/gtk3/PLIST
--- a/x11/gtk3/PLIST    Thu Oct 18 16:58:18 2012 +0000
+++ b/x11/gtk3/PLIST    Thu Oct 18 19:08:47 2012 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2012/04/30 14:26:38 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/10/18 19:08:47 prlw1 Exp $
+bin/gtk-launch
 bin/gtk-query-immodules-3.0
 bin/gtk3-demo
 bin/gtk3-demo-application
@@ -185,12 +186,14 @@
 include/gtk-3.0/gtk/gtkinvisible.h
 include/gtk-3.0/gtk/gtklabel.h
 include/gtk-3.0/gtk/gtklayout.h
+include/gtk-3.0/gtk/gtklevelbar.h
 include/gtk-3.0/gtk/gtklinkbutton.h
 include/gtk-3.0/gtk/gtkliststore.h
 include/gtk-3.0/gtk/gtklockbutton.h
 include/gtk-3.0/gtk/gtkmain.h
 include/gtk-3.0/gtk/gtkmenu.h
 include/gtk-3.0/gtk/gtkmenubar.h
+include/gtk-3.0/gtk/gtkmenubutton.h
 include/gtk-3.0/gtk/gtkmenuitem.h
 include/gtk-3.0/gtk/gtkmenushell.h
 include/gtk-3.0/gtk/gtkmenutoolbutton.h
@@ -229,6 +232,7 @@
 include/gtk-3.0/gtk/gtkscrollable.h
 include/gtk-3.0/gtk/gtkscrollbar.h
 include/gtk-3.0/gtk/gtkscrolledwindow.h
+include/gtk-3.0/gtk/gtksearchentry.h
 include/gtk-3.0/gtk/gtkselection.h
 include/gtk-3.0/gtk/gtkseparator.h
 include/gtk-3.0/gtk/gtkseparatormenuitem.h
@@ -324,6 +328,7 @@
 lib/pkgconfig/gtk+-unix-print-3.0.pc
 ${PLIST.x11}lib/pkgconfig/gtk+-x11-3.0.pc
 libdata/gtk-3.0/im-multipress.conf
+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
@@ -336,6 +341,7 @@
 share/gtk-3.0/demo/alphatest.png
 share/gtk-3.0/demo/apple-red.png
 share/gtk-3.0/demo/application.c
+share/gtk-3.0/demo/application.ui
 share/gtk-3.0/demo/appwindow.c
 share/gtk-3.0/demo/assistant.c
 share/gtk-3.0/demo/background.jpg
@@ -345,6 +351,17 @@
 share/gtk-3.0/demo/clipboard.c
 share/gtk-3.0/demo/colorsel.c
 share/gtk-3.0/demo/combobox.c
+share/gtk-3.0/demo/css_accordion.c
+share/gtk-3.0/demo/css_accordion.css
+share/gtk-3.0/demo/css_basics.c
+share/gtk-3.0/demo/css_basics.css
+share/gtk-3.0/demo/css_multiplebgs.c
+share/gtk-3.0/demo/css_multiplebgs.css
+share/gtk-3.0/demo/css_pixbufs.c
+share/gtk-3.0/demo/css_pixbufs.css
+share/gtk-3.0/demo/css_shadows.c
+share/gtk-3.0/demo/css_shadows.css
+share/gtk-3.0/demo/cssview.css
 share/gtk-3.0/demo/demo.ui
 share/gtk-3.0/demo/dialog.c
 share/gtk-3.0/demo/drawingarea.c
@@ -352,6 +369,7 @@
 share/gtk-3.0/demo/entry_buffer.c
 share/gtk-3.0/demo/entry_completion.c
 share/gtk-3.0/demo/expander.c
+share/gtk-3.0/demo/fancy.css
 share/gtk-3.0/demo/floppybuddy.gif
 share/gtk-3.0/demo/gnome-applets.png
 share/gtk-3.0/demo/gnome-calendar.png
@@ -362,6 +380,8 @@
 share/gtk-3.0/demo/gnome-gmush.png
 share/gtk-3.0/demo/gnome-gsame.png
 share/gtk-3.0/demo/gnu-keys.png
+share/gtk-3.0/demo/gtk-logo-24.png
+share/gtk-3.0/demo/gtk-logo-48.png
 share/gtk-3.0/demo/gtk-logo-rgb.gif
 share/gtk-3.0/demo/hypertext.c
 share/gtk-3.0/demo/iconview.c
@@ -371,6 +391,7 @@
 share/gtk-3.0/demo/links.c
 share/gtk-3.0/demo/list_store.c
 share/gtk-3.0/demo/menus.c
+share/gtk-3.0/demo/menus.ui
 share/gtk-3.0/demo/offscreen_window.c
 share/gtk-3.0/demo/offscreen_window2.c
 share/gtk-3.0/demo/overlay.c
@@ -378,6 +399,7 @@
 share/gtk-3.0/demo/pickers.c
 share/gtk-3.0/demo/pixbufs.c
 share/gtk-3.0/demo/printing.c
+share/gtk-3.0/demo/reset.css
 share/gtk-3.0/demo/rotated_text.c
 share/gtk-3.0/demo/search_entry.c
 share/gtk-3.0/demo/sizegroup.c
@@ -385,6 +407,9 @@
 share/gtk-3.0/demo/stock_browser.c
 share/gtk-3.0/demo/textscroll.c
 share/gtk-3.0/demo/textview.c
+share/gtk-3.0/demo/theming.ui
+share/gtk-3.0/demo/theming_custom_css.c
+share/gtk-3.0/demo/theming_style_classes.c
 share/gtk-3.0/demo/toolpalette.c
 share/gtk-3.0/demo/transparent.c
 share/gtk-3.0/demo/tree_store.c
@@ -411,6 +436,7 @@
 share/gtk-doc/html/gdk3/api-index-3-0.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
 share/gtk-doc/html/gdk3/api-index-deprecated.html
 share/gtk-doc/html/gdk3/api-index-full.html
 share/gtk-doc/html/gdk3/arrow.png
@@ -454,6 +480,7 @@
 share/gtk-doc/html/gdk3/gdk3-Properties-and-Atoms.html
 share/gtk-doc/html/gdk3/gdk3-RGBA-Colors.html
 share/gtk-doc/html/gdk3/gdk3-Selections.html
+share/gtk-doc/html/gdk3/gdk3-Testing.html
 share/gtk-doc/html/gdk3/gdk3-Threads.html
 share/gtk-doc/html/gdk3/gdk3-Visuals.html
 share/gtk-doc/html/gdk3/gdk3-Windows.html
@@ -618,11 +645,13 @@
 share/gtk-doc/html/gtk3/GtkInvisible.html
 share/gtk-doc/html/gtk3/GtkLabel.html
 share/gtk-doc/html/gtk3/GtkLayout.html
+share/gtk-doc/html/gtk3/GtkLevelBar.html
 share/gtk-doc/html/gtk3/GtkLinkButton.html
 share/gtk-doc/html/gtk3/GtkListStore.html
 share/gtk-doc/html/gtk3/GtkLockButton.html
 share/gtk-doc/html/gtk3/GtkMenu.html
 share/gtk-doc/html/gtk3/GtkMenuBar.html
+share/gtk-doc/html/gtk3/GtkMenuButton.html
 share/gtk-doc/html/gtk3/GtkMenuItem.html
 share/gtk-doc/html/gtk3/GtkMenuShell.html
 share/gtk-doc/html/gtk3/GtkMenuToolButton.html
@@ -660,6 +689,7 @@
 share/gtk-doc/html/gtk3/GtkScrollable.html
 share/gtk-doc/html/gtk3/GtkScrollbar.html
 share/gtk-doc/html/gtk3/GtkScrolledWindow.html
+share/gtk-doc/html/gtk3/GtkSearchEntry.html
 share/gtk-doc/html/gtk3/GtkSeparator.html
 share/gtk-doc/html/gtk3/GtkSeparatorMenuItem.html
 share/gtk-doc/html/gtk3/GtkSeparatorToolItem.html
@@ -734,6 +764,7 @@
 share/gtk-doc/html/gtk3/api-index-3-0.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
 share/gtk-doc/html/gtk3/api-index-deprecated.html
 share/gtk-doc/html/gtk3/api-index-full.html
 share/gtk-doc/html/gtk3/appchooserbutton.png
@@ -782,6 +813,9 @@
 share/gtk-doc/html/gtk3/document-revert-rtl.png
 share/gtk-doc/html/gtk3/document-save-as.png
 share/gtk-doc/html/gtk3/document-save.png
+share/gtk-doc/html/gtk3/down-center.png
+share/gtk-doc/html/gtk3/down-end.png
+share/gtk-doc/html/gtk3/down-start.png
 share/gtk-doc/html/gtk3/drawing.png
 share/gtk-doc/html/gtk3/drive-harddisk.png
 share/gtk-doc/html/gtk3/ease-in-out.png
@@ -864,6 +898,7 @@
 share/gtk-doc/html/gtk3/gtk-font.png
 share/gtk-doc/html/gtk3/gtk-getting-started.html
 share/gtk-doc/html/gtk3/gtk-index.png
+share/gtk-doc/html/gtk3/gtk-launch.html
 share/gtk-doc/html/gtk3/gtk-migrating-2-to-3.html
 share/gtk-doc/html/gtk3/gtk-migrating-GtkGrid.html
 share/gtk-doc/html/gtk3/gtk-migrating-GtkStyleContext-bonus-points.html
@@ -940,7 +975,11 @@
 share/gtk-doc/html/gtk3/layout-rltb.png
 share/gtk-doc/html/gtk3/layout-tblr.png
 share/gtk-doc/html/gtk3/layout-tbrl.png
+share/gtk-doc/html/gtk3/left-center.png
+share/gtk-doc/html/gtk3/left-end.png
+share/gtk-doc/html/gtk3/left-start.png
 share/gtk-doc/html/gtk3/left.png
+share/gtk-doc/html/gtk3/levelbar.png
 share/gtk-doc/html/gtk3/linear.png
 share/gtk-doc/html/gtk3/link-button.png
 share/gtk-doc/html/gtk3/list-add.png
@@ -966,6 +1005,7 @@
 share/gtk-doc/html/gtk3/media-skip-backward-rtl.png
 share/gtk-doc/html/gtk3/media-skip-forward-ltr.png
 share/gtk-doc/html/gtk3/media-skip-forward-rtl.png
+share/gtk-doc/html/gtk3/menu-button.png
 share/gtk-doc/html/gtk3/menubar.png
 share/gtk-doc/html/gtk3/messagedialog.png
 share/gtk-doc/html/gtk3/migrating.html
@@ -987,9 +1027,13 @@
 share/gtk-doc/html/gtk3/pt06.html
 share/gtk-doc/html/gtk3/radio-group.png
 share/gtk-doc/html/gtk3/recentchooserdialog.png
+share/gtk-doc/html/gtk3/right-center.png
+share/gtk-doc/html/gtk3/right-end.png
+share/gtk-doc/html/gtk3/right-start.png
 share/gtk-doc/html/gtk3/right.png
 share/gtk-doc/html/gtk3/scales.png
 share/gtk-doc/html/gtk3/scrolledwindow.png
+share/gtk-doc/html/gtk3/search-entry.png
 share/gtk-doc/html/gtk3/separator.png
 share/gtk-doc/html/gtk3/slices.png
 share/gtk-doc/html/gtk3/sliders.png
@@ -1006,6 +1050,9 @@
 share/gtk-doc/html/gtk3/toolpalette.png
 share/gtk-doc/html/gtk3/tools-check-spelling.png
 share/gtk-doc/html/gtk3/tree-view-coordinates.png
+share/gtk-doc/html/gtk3/up-center.png
+share/gtk-doc/html/gtk3/up-end.png
+share/gtk-doc/html/gtk3/up-start.png
 share/gtk-doc/html/gtk3/up.png
 share/gtk-doc/html/gtk3/view-fullscreen.png
 share/gtk-doc/html/gtk3/view-refresh.png
@@ -1131,6 +1178,8 @@
 share/locale/ko/LC_MESSAGES/gtk30.mo
 share/locale/ku/LC_MESSAGES/gtk30-properties.mo
 share/locale/ku/LC_MESSAGES/gtk30.mo
+share/locale/ky/LC_MESSAGES/gtk30-properties.mo
+share/locale/ky/LC_MESSAGES/gtk30.mo
 share/locale/lg/LC_MESSAGES/gtk30-properties.mo
 share/locale/lg/LC_MESSAGES/gtk30.mo
 share/locale/li/LC_MESSAGES/gtk30-properties.mo
diff -r f20352546171 -r d232eb9274d2 x11/gtk3/buildlink3.mk
--- a/x11/gtk3/buildlink3.mk    Thu Oct 18 16:58:18 2012 +0000
+++ b/x11/gtk3/buildlink3.mk    Thu Oct 18 19:08:47 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2012/10/08 23:00:34 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2012/10/18 19:08:47 prlw1 Exp $
 
 BUILDLINK_TREE+=       gtk3
 
@@ -14,6 +14,7 @@
 pkgbase := gtk3
 .include "../../mk/pkg-build-options.mk"
 
+.include "../../devel/at-spi2-atk/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff -r f20352546171 -r d232eb9274d2 x11/gtk3/distinfo
--- a/x11/gtk3/distinfo Thu Oct 18 16:58:18 2012 +0000