diff -Nru gtk+3.0-3.6.0/debian/changelog gtk+3.0-3.6.0/debian/changelog --- gtk+3.0-3.6.0/debian/changelog 2012-10-03 04:42:50.000000000 +0000 +++ gtk+3.0-3.6.0/debian/changelog 2012-10-09 20:44:45.000000000 +0000 @@ -1,8 +1,24 @@ -gtk+3.0 (3.6.0-0ubuntu2+wayland0) quantal; urgency=low +gtk+3.0 (3.6.0-0ubuntu3+wayland0) quantal; urgency=low * Enable Wayland backend (LP: #954352) - -- Darxus Wed, 03 Oct 2012 00:41:40 -0400 + -- Darxus Tue, 09 Oct 2012 16:43:47 -0400 + +gtk+3.0 (3.6.0-0ubuntu3) quantal-proposed; urgency=low + + * debian/patches/revert_git_a11y_stopped.patch: + - revert recent commit which unload a11y on shutdown, + that's an optimization and not strictly necessary and it's creating + issue with e.g ubiquity (lp: #1056300). That's a workaround but seems + to be the safest solution for quantal. + * debian/patches/git_iconview_render_item_select.patch: + - "iconview: Render focus even in non-selected items" + * debian/control.in: + - let libgtk depends on at-spi-core2 (rather than libgail) since that's + the library which is using the service, that should fix issues the + warnings raised on some configurations (including the QA tests) + + -- Sebastien Bacher Tue, 09 Oct 2012 11:48:15 +0200 gtk+3.0 (3.6.0-0ubuntu2) quantal-proposed; urgency=low diff -Nru gtk+3.0-3.6.0/debian/control gtk+3.0-3.6.0/debian/control --- gtk+3.0-3.6.0/debian/control 2012-10-03 04:47:52.000000000 +0000 +++ gtk+3.0-3.6.0/debian/control 2012-10-09 20:43:25.000000000 +0000 @@ -56,7 +56,8 @@ Depends: libgtk-3-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}, - shared-mime-info + shared-mime-info, + at-spi2-core Provides: gtk3-binver-3.0.0 Recommends: hicolor-icon-theme, libgtk-3-bin @@ -233,8 +234,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - libgtk-3-0 (= ${binary:Version}), - at-spi2-core + libgtk-3-0 (= ${binary:Version}) Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Description: GNOME Accessibility Implementation Library -- shared libraries diff -Nru gtk+3.0-3.6.0/debian/control.in gtk+3.0-3.6.0/debian/control.in --- gtk+3.0-3.6.0/debian/control.in 2012-10-03 04:47:56.000000000 +0000 +++ gtk+3.0-3.6.0/debian/control.in 2012-10-09 20:46:10.000000000 +0000 @@ -54,7 +54,8 @@ Depends: @COMMON_PKG@ (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}, - shared-mime-info + shared-mime-info, + at-spi2-core Provides: @GTK_BINVER_DEP@ Recommends: hicolor-icon-theme, @BIN_PKG@ @@ -231,8 +232,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - @SHARED_PKG@ (= ${binary:Version}), - at-spi2-core + @SHARED_PKG@ (= ${binary:Version}) Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Description: GNOME Accessibility Implementation Library -- shared libraries diff -Nru gtk+3.0-3.6.0/debian/patches/git_iconview_render_item_select.patch gtk+3.0-3.6.0/debian/patches/git_iconview_render_item_select.patch --- gtk+3.0-3.6.0/debian/patches/git_iconview_render_item_select.patch 1970-01-01 00:00:00.000000000 +0000 +++ gtk+3.0-3.6.0/debian/patches/git_iconview_render_item_select.patch 2012-10-09 09:57:16.000000000 +0000 @@ -0,0 +1,36 @@ +From ecd84fac48a56f1ebc984f1ee0d9dff30260c961 Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Thu, 27 Sep 2012 17:24:31 +0000 +Subject: iconview: Render focus even in non-selected items + +This is needed for the SELECTION_NONE mode where nothing is ever +selected, but its also needed for CTRL- keynav that moves the +focus without changing the selection. + +https://bugzilla.gnome.org/show_bug.cgi?id=684984 +--- +diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c +index a1df572..7eb50ae 100644 +--- a/gtk/gtkiconview.c ++++ b/gtk/gtkiconview.c +@@ -3042,14 +3042,12 @@ gtk_icon_view_paint_item (GtkIconView *icon_view, + + state &= ~(GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_PRELIGHT); + ++ if ((state & GTK_STATE_FLAG_FOCUSED) && ++ item == icon_view->priv->cursor_item) ++ flags |= GTK_CELL_RENDERER_FOCUSED; ++ + if (item->selected) + { +- if ((state & GTK_STATE_FLAG_FOCUSED) && +- item == icon_view->priv->cursor_item) +- { +- flags |= GTK_CELL_RENDERER_FOCUSED; +- } +- + state |= GTK_STATE_FLAG_SELECTED; + flags |= GTK_CELL_RENDERER_SELECTED; + } +-- +cgit v0.9.0.2 diff -Nru gtk+3.0-3.6.0/debian/patches/revert_git_a11y_stopped.patch gtk+3.0-3.6.0/debian/patches/revert_git_a11y_stopped.patch --- gtk+3.0-3.6.0/debian/patches/revert_git_a11y_stopped.patch 1970-01-01 00:00:00.000000000 +0000 +++ gtk+3.0-3.6.0/debian/patches/revert_git_a11y_stopped.patch 2012-10-09 09:57:16.000000000 +0000 @@ -0,0 +1,138 @@ +diff -Nur gtk+3.0-3.6.0.old/gtk/a11y/gail.c gtk+3.0-3.6.0/gtk/a11y/gail.c +--- gtk+3.0-3.6.0.old/gtk/a11y/gail.c 2012-10-09 11:28:38.129582008 +0200 ++++ gtk+3.0-3.6.0/gtk/a11y/gail.c 2012-10-09 11:30:27.485587299 +0200 +@@ -76,7 +76,6 @@ + static guint focus_notify_handler = 0; + static guint focus_tracker_id = 0; + static GQuark quark_focus_object = 0; +-static int initialized = FALSE; + + static AtkObject* + gail_get_accessible_for_widget (GtkWidget *widget, +@@ -796,24 +795,9 @@ + } + + void +-_gtk_accessibility_shutdown (void) +-{ +- if (!initialized) +- return; +- +- initialized = FALSE; +- +- g_clear_object (&atk_misc_instance); +- +-#ifdef GDK_WINDOWING_X11 +- atk_bridge_adaptor_cleanup (); +-#endif +- _gail_util_uninstall (); +-} +- +-void + _gtk_accessibility_init (void) + { ++ static int initialized = FALSE; + + if (initialized) + return; +diff -Nur gtk+3.0-3.6.0.old/gtk/a11y/gailutil.c gtk+3.0-3.6.0/gtk/a11y/gailutil.c +--- gtk+3.0-3.6.0.old/gtk/a11y/gailutil.c 2012-10-09 11:28:38.117582007 +0200 ++++ gtk+3.0-3.6.0/gtk/a11y/gailutil.c 2012-10-09 11:30:27.485587299 +0200 +@@ -206,17 +206,6 @@ + (GCallback) window_removed, NULL); + } + +-static void +-undo_window_event_initialization (void) +-{ +- AtkObject *root; +- +- root = atk_get_root (); +- +- g_signal_handlers_disconnect_by_func (root, (GCallback) window_added, NULL); +- g_signal_handlers_disconnect_by_func (root, (GCallback) window_removed, NULL); +-} +- + static AtkKeyEventStruct * + atk_key_event_from_gdk_event_key (GdkEventKey *key) + { +@@ -353,12 +342,6 @@ + } + + void +-_gail_util_uninstall (void) +-{ +- undo_window_event_initialization (); +-} +- +-void + _gail_util_install (void) + { + AtkUtilClass *atk_class = ATK_UTIL_CLASS (g_type_class_ref (ATK_TYPE_UTIL)); +diff -Nur gtk+3.0-3.6.0.old/gtk/a11y/gailutil.h gtk+3.0-3.6.0/gtk/a11y/gailutil.h +--- gtk+3.0-3.6.0.old/gtk/a11y/gailutil.h 2012-10-09 11:28:38.121582007 +0200 ++++ gtk+3.0-3.6.0/gtk/a11y/gailutil.h 2012-10-09 11:30:27.485587299 +0200 +@@ -23,7 +23,6 @@ + G_BEGIN_DECLS + + void _gail_util_install (void); +-void _gail_util_uninstall (void); + + gboolean _gail_util_key_snooper (GtkWidget *the_widget, + GdkEventKey *event); +diff -Nur gtk+3.0-3.6.0.old/gtk/gtkapplication.c gtk+3.0-3.6.0/gtk/gtkapplication.c +--- gtk+3.0-3.6.0.old/gtk/gtkapplication.c 2012-10-09 11:28:38.261582015 +0200 ++++ gtk+3.0-3.6.0/gtk/gtkapplication.c 2012-10-09 11:30:27.493587302 +0200 +@@ -47,8 +47,6 @@ + #include + #endif + +-extern void _gtk_accessibility_shutdown (void); +- + /** + * SECTION:gtkapplication + * @title: GtkApplication +@@ -425,16 +423,12 @@ + gtk_application_shutdown_quartz (GTK_APPLICATION (application)); + #endif + +- /* Keep this section in sync with gtk_main() */ +- + /* Try storing all clipboard data we have */ + _gtk_clipboard_store_all (); + + /* Synchronize the recent manager singleton */ + _gtk_recent_manager_sync (); + +- _gtk_accessibility_shutdown (); +- + G_APPLICATION_CLASS (gtk_application_parent_class) + ->shutdown (application); + } +diff -Nur gtk+3.0-3.6.0.old/gtk/gtkmain.c gtk+3.0-3.6.0/gtk/gtkmain.c +--- gtk+3.0-3.6.0.old/gtk/gtkmain.c 2012-10-09 11:28:38.217582012 +0200 ++++ gtk+3.0-3.6.0/gtk/gtkmain.c 2012-10-09 11:30:27.497587303 +0200 +@@ -671,7 +671,6 @@ + + /* XXX: Remove me after getting rid of gail */ + extern void _gtk_accessibility_init (void); +-extern void _gtk_accessibility_shutdown (void); + + static void + do_post_parse_initialization (int *argc, +@@ -1173,15 +1172,11 @@ + + if (gtk_main_loop_level == 0) + { +- /* Keep this section in sync with gtk_application_shutdown() */ +- + /* Try storing all clipboard data we have */ + _gtk_clipboard_store_all (); + + /* Synchronize the recent manager singleton */ + _gtk_recent_manager_sync (); +- +- _gtk_accessibility_shutdown (); + } + } + diff -Nru gtk+3.0-3.6.0/debian/patches/series gtk+3.0-3.6.0/debian/patches/series --- gtk+3.0-3.6.0/debian/patches/series 2012-10-03 04:43:42.000000000 +0000 +++ gtk+3.0-3.6.0/debian/patches/series 2012-10-09 20:45:26.000000000 +0000 @@ -14,4 +14,6 @@ ubuntu_gtk_custom_menu_items.patch print-dialog-show-options-of-remote-dnssd-printers.patch git_use_right_display.patch +revert_git_a11y_stopped.patch +git_iconview_render_item_select.patch 102_add_wayland_symbols.patch