summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorprlw1 <prlw1>2013-05-18 22:44:43 +0000
committerprlw1 <prlw1>2013-05-18 22:44:43 +0000
commitcee04ff3894cc3803c7ab7e46307a76348291652 (patch)
tree8aae401de360b3dc8c80ffa335e4da06f6ba974a
parent400ccb704d639824d31ac146ebf11783a604efd8 (diff)
downloadpkgsrc-cee04ff3894cc3803c7ab7e46307a76348291652.tar.gz
Update gtk3 to version 3.8.2
Rename patch-gtk_a11y_gail.c to patch-gtk_a11y_gtkaccessibility.c Many improvements, bug fixes and translation updates: https://git.gnome.org/browse/gtk+/tree/NEWS?id=3.8.2 Highlights: * Deprecations and removals: - Custom CSS properties have been deprecated - Support for color schemes has been removed - gtk_style_provider_get_style, gtk_style_provider_get_icon_factory - GtkGradient and GtkSymbolicColor - All the padding style properties in menus * CSS improvements: - Add cycle detection to color resolving * A lot of filechooser button fixes * The print dialog now shows printers that are discovered using avahi, if configured with --enable-avahi-browsing * We now support the Window Manager frame synchronization protocol draft (when running under a WM that supports it). This means applications will throttle their drawing cycle to what the compositor is drawing, and the compositor will never render half-updated windows, for seamless resizing and improved smoothness in drawing. See https://mail.gnome.org/archives/wm-spec-list/2013-January/msg00000.html and the articles at http://blog.fishsoup.net/ for more details. * We now support setting an opacity to any GtkWidget, not just toplevels: gtk_window_set_opacity has been deprecated in favor of gtk_widget_set_opacity. * GtkIconTheme gained asynchronous loaders for GtkIconInfo objects * GtkIconInfo has changed from being a boxed type to a GObject. This is technically an ABI change, but basically all existing code will keep working if its used as a boxed type, and its not possible to instantiate GtkIconInfos outside Gtk, so this is not expected to be a big problem. * GtkTreeView and GtkIconView allow single-click activation * GtkImage can be set from a resource * GdkWaylandDisplay is now public * gdk_window_set_fullscreen_mode: new function to let windows be fullscreened across multiple monitors * We now use state flags for text direction: GTK_STATE_FLAG_LTR/RTL. gtk_style_context_set_direction() has been deprecated. * We install headers for accessible implementations of GTK+ widgets. This makes it possible to implement accessibility for third-party widgets by subclassing the proper GTK+ implementation. To do this, include gtk/gtk-a11y.h. * Invisible widgets now return a size of 0x0. This is an experimental change that makes GtkWidget::visible essentially behave the same way that "display: none" does in CSS. If you want the effect of CSS's "visibility: hidden", you can use a GtkNotebook with an empty page. * GtkFrame now draws a background. * The Broadway backend now installs a separate server: broadwayd. * GtkBuilder now lets you refer to external objects from a ui file if the objects have been exported with the new function gtk_builder_expose_object() * Font handling has been improved: - The default font is no longer handled like a custom style sheet that overrides everything, but as the initial value. This is the same behavior as in web browsers. - It is now possible to set font-family and font-size like other CSS properties, and relative font sizes are supported. Font sizes in CSS can be specified as numbers or with keywords like xx-small, medium, smaller, larger,... * GTK+ now uses proper Unicode ellipses in strings.
-rw-r--r--x11/gtk3/Makefile17
-rw-r--r--x11/gtk3/PLIST147
-rw-r--r--x11/gtk3/distinfo10
-rw-r--r--x11/gtk3/patches/patch-gtk_a11y_gail.c37
-rw-r--r--x11/gtk3/patches/patch-gtk_a11y_gtkaccessibility.c39
5 files changed, 117 insertions, 133 deletions
diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile
index 1870f7e33b8..47662474bf7 100644
--- a/x11/gtk3/Makefile
+++ b/x11/gtk3/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2013/02/16 11:18:17 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2013/05/18 22:44:43 prlw1 Exp $
-DISTNAME= gtk+-3.6.4
+DISTNAME= gtk+-3.8.2
PKGNAME= ${DISTNAME:S/gtk/gtk3/}
-PKGREVISION= 3
-CATEGORIES= x11
+CATEGORIES= x11 gnome
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/${PKGVERSION_NOREV:R}/ \
${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
EXTRACT_SUFX= .tar.xz
@@ -27,6 +26,8 @@ CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata
CONFIGURE_ARGS+= --disable-papi
# XXX for now, to avoid conflict
CONFIGURE_ARGS+= --enable-gtk2-dependency
+# Avoid regeneration of Makefile.in after configure.ac patch
+CONFIGURE_ARGS+= --disable-maintainer-mode
DEPENDS+= gtk2+-[0-9]*:../../x11/gtk2
MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
TEST_TARGET= check
@@ -73,12 +74,12 @@ _BUILDING_GTK3= yes
.include "modules.mk"
.include "../../databases/shared-mime-info/buildlink3.mk"
-BUILDLINK_API_DEPENDS.atk+= atk>=2.5.3
+BUILDLINK_API_DEPENDS.atk+= atk>=2.7.5
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.33.1
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.35.3
.include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gdk-pixbuf2+= gdk-pixbuf2>=2.26.0
+BUILDLINK_API_DEPENDS.gdk-pixbuf2+= gdk-pixbuf2>=2.27.1
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
BUILDLINK_DEPMETHOD.gobject-introspection:= build
BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.32
@@ -88,7 +89,7 @@ BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.32
.include "../../devel/glib2/schemas.mk"
-BUILDLINK_API_DEPENDS.pango+= pango>=1.29.4nb2
+BUILDLINK_API_DEPENDS.pango+= pango>=1.32.4
.include "../../devel/pango/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.0
diff --git a/x11/gtk3/PLIST b/x11/gtk3/PLIST
index 745e883973d..01cf7dc7fe7 100644
--- a/x11/gtk3/PLIST
+++ b/x11/gtk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2012/10/18 19:10:00 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.10 2013/05/18 22:44:43 prlw1 Exp $
bin/gtk-launch
bin/gtk-query-immodules-3.0
bin/gtk3-demo
@@ -20,6 +20,8 @@ include/gtk-3.0/gdk/gdkdisplaymanager.h
include/gtk-3.0/gdk/gdkdnd.h
include/gtk-3.0/gdk/gdkenumtypes.h
include/gtk-3.0/gdk/gdkevents.h
+include/gtk-3.0/gdk/gdkframeclock.h
+include/gtk-3.0/gdk/gdkframetimings.h
include/gtk-3.0/gdk/gdkkeys.h
include/gtk-3.0/gdk/gdkkeysyms-compat.h
include/gtk-3.0/gdk/gdkkeysyms.h
@@ -69,9 +71,54 @@ ${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/a11y/gtkarrowaccessible.h
+include/gtk-3.0/gtk/a11y/gtkbooleancellaccessible.h
+include/gtk-3.0/gtk/a11y/gtkbuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtkcellaccessible.h
+include/gtk-3.0/gtk/a11y/gtkcellaccessibleparent.h
+include/gtk-3.0/gtk/a11y/gtkcheckmenuitemaccessible.h
+include/gtk-3.0/gtk/a11y/gtkcomboboxaccessible.h
+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/gtkframeaccessible.h
+include/gtk-3.0/gtk/a11y/gtkiconviewaccessible.h
+include/gtk-3.0/gtk/a11y/gtkimageaccessible.h
+include/gtk-3.0/gtk/a11y/gtkimagecellaccessible.h
+include/gtk-3.0/gtk/a11y/gtklabelaccessible.h
+include/gtk-3.0/gtk/a11y/gtklevelbaraccessible.h
+include/gtk-3.0/gtk/a11y/gtklinkbuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtklockbuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtkmenuaccessible.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/gtkprogressbaraccessible.h
+include/gtk-3.0/gtk/a11y/gtkradiobuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtkradiomenuitemaccessible.h
+include/gtk-3.0/gtk/a11y/gtkrangeaccessible.h
+include/gtk-3.0/gtk/a11y/gtkrenderercellaccessible.h
+include/gtk-3.0/gtk/a11y/gtkscaleaccessible.h
+include/gtk-3.0/gtk/a11y/gtkscalebuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtkscrolledwindowaccessible.h
+include/gtk-3.0/gtk/a11y/gtkspinbuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtkspinneraccessible.h
+include/gtk-3.0/gtk/a11y/gtkstatusbaraccessible.h
+include/gtk-3.0/gtk/a11y/gtkswitchaccessible.h
+include/gtk-3.0/gtk/a11y/gtktextcellaccessible.h
+include/gtk-3.0/gtk/a11y/gtktextviewaccessible.h
+include/gtk-3.0/gtk/a11y/gtktogglebuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtktoplevelaccessible.h
+include/gtk-3.0/gtk/a11y/gtktreeviewaccessible.h
+include/gtk-3.0/gtk/a11y/gtkwidgetaccessible.h
+include/gtk-3.0/gtk/a11y/gtkwindowaccessible.h
include/gtk-3.0/gtk/deprecated/gtkcolorsel.h
include/gtk-3.0/gtk/deprecated/gtkcolorseldialog.h
include/gtk-3.0/gtk/deprecated/gtkfontsel.h
+include/gtk-3.0/gtk/deprecated/gtkgradient.h
include/gtk-3.0/gtk/deprecated/gtkhandlebox.h
include/gtk-3.0/gtk/deprecated/gtkhbbox.h
include/gtk-3.0/gtk/deprecated/gtkhbox.h
@@ -82,6 +129,7 @@ include/gtk-3.0/gtk/deprecated/gtkhseparator.h
include/gtk-3.0/gtk/deprecated/gtkhsv.h
include/gtk-3.0/gtk/deprecated/gtkrc.h
include/gtk-3.0/gtk/deprecated/gtkstyle.h
+include/gtk-3.0/gtk/deprecated/gtksymboliccolor.h
include/gtk-3.0/gtk/deprecated/gtktable.h
include/gtk-3.0/gtk/deprecated/gtktearoffmenuitem.h
include/gtk-3.0/gtk/deprecated/gtkvbbox.h
@@ -90,6 +138,7 @@ include/gtk-3.0/gtk/deprecated/gtkvpaned.h
include/gtk-3.0/gtk/deprecated/gtkvscale.h
include/gtk-3.0/gtk/deprecated/gtkvscrollbar.h
include/gtk-3.0/gtk/deprecated/gtkvseparator.h
+include/gtk-3.0/gtk/gtk-a11y.h
include/gtk-3.0/gtk/gtk.h
include/gtk-3.0/gtk/gtkaboutdialog.h
include/gtk-3.0/gtk/gtkaccelgroup.h
@@ -170,7 +219,6 @@ include/gtk-3.0/gtk/gtkfontchooser.h
include/gtk-3.0/gtk/gtkfontchooserdialog.h
include/gtk-3.0/gtk/gtkfontchooserwidget.h
include/gtk-3.0/gtk/gtkframe.h
-include/gtk-3.0/gtk/gtkgradient.h
include/gtk-3.0/gtk/gtkgrid.h
include/gtk-3.0/gtk/gtkiconfactory.h
include/gtk-3.0/gtk/gtkicontheme.h
@@ -251,7 +299,6 @@ include/gtk-3.0/gtk/gtkstylecontext.h
include/gtk-3.0/gtk/gtkstyleproperties.h
include/gtk-3.0/gtk/gtkstyleprovider.h
include/gtk-3.0/gtk/gtkswitch.h
-include/gtk-3.0/gtk/gtksymboliccolor.h
include/gtk-3.0/gtk/gtktestutils.h
include/gtk-3.0/gtk/gtktextattributes.h
include/gtk-3.0/gtk/gtktextbuffer.h
@@ -328,6 +375,7 @@ ${PLIST.quartz}lib/pkgconfig/gtk+-quartz-3.0.pc
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/broadwayd.1
man/man1/gtk-launch.1
man/man1/gtk-query-immodules-3.0.1
man/man1/gtk-update-icon-cache.1
@@ -338,82 +386,6 @@ share/gir-1.0/Gtk-3.0.gir
share/glib-2.0/schemas/org.gtk.Demo.gschema.xml
share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
-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
-share/gtk-3.0/demo/builder.c
-share/gtk-3.0/demo/button_box.c
-share/gtk-3.0/demo/changedisplay.c
-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
-share/gtk-3.0/demo/editable_cells.c
-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
-share/gtk-3.0/demo/gnome-foot.png
-share/gtk-3.0/demo/gnome-fs-directory.png
-share/gtk-3.0/demo/gnome-fs-regular.png
-share/gtk-3.0/demo/gnome-gimp.png
-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
-share/gtk-3.0/demo/iconview_edit.c
-share/gtk-3.0/demo/images.c
-share/gtk-3.0/demo/infobar.c
-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
-share/gtk-3.0/demo/panes.c
-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
-share/gtk-3.0/demo/spinner.c
-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
-share/gtk-3.0/demo/ui_manager.c
share/gtk-3.0/gtkbuilder.rng
share/gtk-doc/html/gail-libgail-util3/gail-libgail-util3-GailMisc.html
share/gtk-doc/html/gail-libgail-util3/gail-libgail-util3-GailTextUtil.html
@@ -437,6 +409,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-3-8.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
@@ -472,6 +445,8 @@ 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
share/gtk-doc/html/gdk3/gdk3-Pango-Interaction.html
@@ -551,6 +526,7 @@ share/gtk-doc/html/gtk3/Application.html
share/gtk-doc/html/gtk3/ApplicationChoosing.html
share/gtk-doc/html/gtk3/Builder.html
share/gtk-doc/html/gtk3/ButtonWidgets.html
+share/gtk-doc/html/gtk3/DeprecatedObjects.html
share/gtk-doc/html/gtk3/DisplayWidgets.html
share/gtk-doc/html/gtk3/GtkAboutDialog.html
share/gtk-doc/html/gtk3/GtkAccelLabel.html
@@ -765,6 +741,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-3-8.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
@@ -781,13 +758,14 @@ share/gtk-doc/html/gtk3/border2.png
share/gtk-doc/html/gtk3/border3.png
share/gtk-doc/html/gtk3/box-expand.png
share/gtk-doc/html/gtk3/box-packing.png
+share/gtk-doc/html/gtk3/broadwayd.html
share/gtk-doc/html/gtk3/button.png
share/gtk-doc/html/gtk3/ch02.html
share/gtk-doc/html/gtk3/ch03.html
-share/gtk-doc/html/gtk3/ch24s02.html
-share/gtk-doc/html/gtk3/ch26s02.html
-share/gtk-doc/html/gtk3/ch28s02.html
-share/gtk-doc/html/gtk3/ch28s03.html
+share/gtk-doc/html/gtk3/ch25s02.html
+share/gtk-doc/html/gtk3/ch27s02.html
+share/gtk-doc/html/gtk3/ch29s02.html
+share/gtk-doc/html/gtk3/ch29s03.html
share/gtk-doc/html/gtk3/chap-drawing-model.html
share/gtk-doc/html/gtk3/check-button.png
share/gtk-doc/html/gtk3/checklist-gdkeventexpose-region.html
@@ -928,6 +906,7 @@ share/gtk-doc/html/gtk3/gtk-select-color.png
share/gtk-doc/html/gtk3/gtk-undelete-ltr.png
share/gtk-doc/html/gtk3/gtk-undelete-rtl.png
share/gtk-doc/html/gtk3/gtk-update-icon-cache.html
+share/gtk-doc/html/gtk3/gtk-wayland.html
share/gtk-doc/html/gtk3/gtk-windows.html
share/gtk-doc/html/gtk3/gtk-x11.html
share/gtk-doc/html/gtk3/gtk-yes.png
@@ -1072,6 +1051,8 @@ share/locale/af/LC_MESSAGES/gtk30-properties.mo
share/locale/af/LC_MESSAGES/gtk30.mo
share/locale/am/LC_MESSAGES/gtk30-properties.mo
share/locale/am/LC_MESSAGES/gtk30.mo
+share/locale/an/LC_MESSAGES/gtk30-properties.mo
+share/locale/an/LC_MESSAGES/gtk30.mo
share/locale/ang/LC_MESSAGES/gtk30-properties.mo
share/locale/ang/LC_MESSAGES/gtk30.mo
share/locale/ar/LC_MESSAGES/gtk30-properties.mo
diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo
index ac0a482ca2e..f5941ac3ffe 100644
--- a/x11/gtk3/distinfo
+++ b/x11/gtk3/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.17 2013/05/11 19:49:15 riastradh Exp $
+$NetBSD: distinfo,v 1.18 2013/05/18 22:44:43 prlw1 Exp $
-SHA1 (gtk+-3.6.4.tar.xz) = 2f592b78c32c21ce452f2e6864c24adee62b3665
-RMD160 (gtk+-3.6.4.tar.xz) = 8dd671f443b3956e6b0a215dde94d5f481ac538a
-Size (gtk+-3.6.4.tar.xz) = 13275488 bytes
+SHA1 (gtk+-3.8.2.tar.xz) = c519b553b618588f288c70ea5dce1145588944eb
+RMD160 (gtk+-3.8.2.tar.xz) = 1df32664805b746241ba4e45b20c658d248f24f3
+Size (gtk+-3.8.2.tar.xz) = 13701516 bytes
SHA1 (patch-aj) = 88d5a5c25bcc005bce8597d1262e68a9e67b5f93
SHA1 (patch-config.h.in) = 479ebf5a5cf5ca6855fcda94063638a919bbf548
SHA1 (patch-configure) = 0bf253073a8799082f83fbd37b5424e9adf9b9d3
SHA1 (patch-configure.ac) = 4a2144abddc3468500515511cd934fd35f573952
SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
-SHA1 (patch-gtk_a11y_gail.c) = a7545222e55f1b38ddbcfb094609cc232df071f1
+SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 73b653b855f21c23c13f2332f71aa865a465a621
diff --git a/x11/gtk3/patches/patch-gtk_a11y_gail.c b/x11/gtk3/patches/patch-gtk_a11y_gail.c
deleted file mode 100644
index 38c1039908f..00000000000
--- a/x11/gtk3/patches/patch-gtk_a11y_gail.c
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-gtk_a11y_gail.c,v 1.1 2013/05/11 19:49:15 riastradh Exp $
-
---- gtk/a11y/gail.c.orig 2013-01-07 10:50:02.000000000 +0000
-+++ gtk/a11y/gail.c
-@@ -36,8 +36,10 @@
- #include "gailmisc.h"
-
- #ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_ATK_BRIDGE
- #include <atk-bridge.h>
- #endif
-+#endif
-
- static gboolean gail_focus_watcher (GSignalInvocationHint *ihint,
- guint n_param_values,
-@@ -808,8 +810,10 @@ _gtk_accessibility_shutdown (void)
- g_clear_object (&atk_misc_instance);
-
- #ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_ATK_BRIDGE
- atk_bridge_adaptor_cleanup ();
- #endif
-+#endif
- _gail_util_uninstall ();
- }
-
-@@ -828,8 +832,10 @@ _gtk_accessibility_init (void)
-
- _gail_util_install ();
- #ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_ATK_BRIDGE
- atk_bridge_adaptor_init (NULL, NULL);
- #endif
-+#endif
-
- atk_misc_instance = g_object_new (GAIL_TYPE_MISC, NULL);
- }
diff --git a/x11/gtk3/patches/patch-gtk_a11y_gtkaccessibility.c b/x11/gtk3/patches/patch-gtk_a11y_gtkaccessibility.c
new file mode 100644
index 00000000000..980dd600182
--- /dev/null
+++ b/x11/gtk3/patches/patch-gtk_a11y_gtkaccessibility.c
@@ -0,0 +1,39 @@
+$NetBSD: patch-gtk_a11y_gtkaccessibility.c,v 1.1 2013/05/18 22:44:43 prlw1 Exp $
+
+gtk3-atk-bridge option to avoid dbus dependency.
+
+--- gtk/a11y/gtkaccessibility.c.orig 2013-03-09 20:03:17.000000000 +0000
++++ gtk/a11y/gtkaccessibility.c
+@@ -38,8 +38,10 @@
+ #include <gtk/gtkaccessible.h>
+
+ #ifdef GDK_WINDOWING_X11
++#ifdef HAVE_ATK_BRIDGE
+ #include <atk-bridge.h>
+ #endif
++#endif
+
+ static gboolean gail_focus_watcher (GSignalInvocationHint *ihint,
+ guint n_param_values,
+@@ -990,8 +992,10 @@ _gtk_accessibility_shutdown (void)
+ g_clear_object (&atk_misc_instance);
+
+ #ifdef GDK_WINDOWING_X11
++#ifdef HAVE_ATK_BRIDGE
+ atk_bridge_adaptor_cleanup ();
+ #endif
++#endif
+
+ undo_window_event_initialization ();
+ }
+@@ -1012,8 +1016,10 @@ _gtk_accessibility_init (void)
+ do_window_event_initialization ();
+
+ #ifdef GDK_WINDOWING_X11
++#ifdef HAVE_ATK_BRIDGE
+ atk_bridge_adaptor_init (NULL, NULL);
+ #endif
++#endif
+
+ atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
+ }