[gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtk+/files/, x11-libs/gtk+/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     3f4e494e299e791b6123856a36c9763b64021c2a
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep  7 20:34:57 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep  7 20:34:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3f4e494e

x11-libs/gtk+: 3.1.16 → 3.1.18

Version bump, features gtktreeview and gtkfilechooser improvements. Add
some useful upstream patches (ignore disabled xi devices, initialize a
potentially uninitialized variable, use the correct weak ref).

---
 .../gtk+/files/gtk+-3.1.18-disabled-devices.patch  |   26 ++++++++++++++++++++
 ...tk+-3.1.18-gtkselection-uninitialized-var.patch |   25 +++++++++++++++++++
 .../gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch |   23 +++++++++++++++++
 .../{gtk+-3.1.16.ebuild => gtk+-3.1.18.ebuild}     |    3 ++
 4 files changed, 77 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.1.18-disabled-devices.patch b/x11-libs/gtk+/files/gtk+-3.1.18-disabled-devices.patch
new file mode 100644
index 0000000..c1a585c
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.1.18-disabled-devices.patch
@@ -0,0 +1,26 @@
+commit 79ff1b669c74ecb3d876d4616a9fc4fad640f521
+Author: Carlos Garnacho <carlosg@gnome.org>
+Date:   Tue Sep 6 19:22:59 2011 +0200
+
+    x11: Don't create GdkDevices for disabled devices
+    
+    Fixes bug #658379 - Disabled devices still added to list on startup,
+    spotted by Bastien Nocera. Do not create GdkDevices for disabled
+    devices on device manager construction, leading to a confusing initial
+    state.
+
+diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
+index 425efee..c921ce0 100644
+--- a/gdk/x11/gdkdevicemanager-xi2.c
++++ b/gdk/x11/gdkdevicemanager-xi2.c
+@@ -417,6 +417,10 @@ gdk_x11_device_manager_xi2_constructed (GObject *object)
+   for (i = 0; i < ndevices; i++)
+     {
+       dev = &info[i];
++
++      if (!dev->enabled)
++	      continue;
++
+       add_device (device_manager, dev, FALSE);
+ 
+       if (dev->use == XIMasterPointer ||

diff --git a/x11-libs/gtk+/files/gtk+-3.1.18-gtkselection-uninitialized-var.patch b/x11-libs/gtk+/files/gtk+-3.1.18-gtkselection-uninitialized-var.patch
new file mode 100644
index 0000000..e66a7d4
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.1.18-gtkselection-uninitialized-var.patch
@@ -0,0 +1,25 @@
+commit 057a50d58e940056c6f5407812a67405308aa983
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Wed Sep 7 16:19:44 2011 -0400
+
+    Bug 658398 - Use of uninitialized variable reported by Valgrind
+    
+    Fix it.
+
+diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
+index 7fbc996..9e2295f 100644
+--- a/gtk/gtkselection.c
++++ b/gtk/gtkselection.c
+@@ -1097,11 +1097,10 @@ gtk_selection_convert (GtkWidget *widget,
+     {
+       GtkWidget *owner_widget;
+       gpointer owner_widget_ptr;
+-      GtkSelectionData selection_data;
++      GtkSelectionData selection_data = {0};
+       
+       selection_data.selection = selection;
+       selection_data.target = target;
+-      selection_data.data = NULL;
+       selection_data.length = -1;
+       selection_data.display = display;
+       

diff --git a/x11-libs/gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch b/x11-libs/gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch
new file mode 100644
index 0000000..8a1593a
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch
@@ -0,0 +1,23 @@
+commit 8b9f0402b02a34d2e987936f134a20dc3effd34b
+Author: Cosimo Cecchi <cosimoc@gnome.org>
+Date:   Tue Sep 6 18:26:54 2011 -0400
+
+    iconview: fix a typo while removing the a11y adjustment weak ref
+    
+    The code sets old_adj_ptr to the location containing the old weak ref,
+    but then wants to remove a weak ref from &view->old_hadj, causing warnings
+    when disposing the widget.
+
+diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
+index a252e0f..8b4a184 100644
+--- a/gtk/gtkiconview.c
++++ b/gtk/gtkiconview.c
+@@ -8089,7 +8089,7 @@ gtk_icon_view_accessible_set_adjustment (AtkObject      *accessible,
+   if (*old_adj_ptr)
+     {
+       g_object_remove_weak_pointer (G_OBJECT (*old_adj_ptr),
+-                                    (gpointer *)&view->old_hadj);
++                                    (gpointer *)old_adj_ptr);
+       g_signal_handlers_disconnect_by_func (*old_adj_ptr,
+                                             gtk_icon_view_accessible_adjustment_changed,
+                                             accessible);

diff --git a/x11-libs/gtk+/gtk+-3.1.16.ebuild b/x11-libs/gtk+/gtk+-3.1.18.ebuild
similarity index 98%
rename from x11-libs/gtk+/gtk+-3.1.16.ebuild
rename to x11-libs/gtk+/gtk+-3.1.18.ebuild
index ec98b3a..d078fb7 100644
--- a/x11-libs/gtk+/gtk+-3.1.16.ebuild
+++ b/x11-libs/gtk+/gtk+-3.1.18.ebuild
@@ -111,6 +111,9 @@ src_prepare() {
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
 
+	# Useful upstream patches, will be in next release
+	epatch "${FILESDIR}/${P}"-*.patch
+
 	gnome2_src_prepare
 }