From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R1PhP-0006tG-Qj for garchives@archives.gentoo.org; Wed, 07 Sep 2011 21:30:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43DC521C2E3; Wed, 7 Sep 2011 21:30:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0463D21C264 for ; Wed, 7 Sep 2011 21:30:15 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D12C1B400D for ; Wed, 7 Sep 2011 21:30:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3A49B8004A for ; Wed, 7 Sep 2011 21:30:14 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <3f4e494e299e791b6123856a36c9763b64021c2a.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtk+/files/, x11-libs/gtk+/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/gtk+/files/gtk+-3.1.18-disabled-devices.patch x11-libs/gtk+/files/gtk+-3.1.18-gtkselection-uninitialized-var.patch x11-libs/gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch x11-libs/gtk+/gtk+-3.1.16.ebuild x11-libs/gtk+/gtk+-3.1.18.ebuild X-VCS-Directories: x11-libs/gtk+/files/ x11-libs/gtk+/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 3f4e494e299e791b6123856a36c9763b64021c2a Date: Wed, 7 Sep 2011 21:30:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1f3428998238f6f8e83e056ade108417 commit: 3f4e494e299e791b6123856a36c9763b64021c2a Author: Alexandre Rostovtsev gmail com> AuthorDate: Wed Sep 7 20:34:57 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Wed Sep 7 20:34:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D3f4e494e x11-libs/gtk+: 3.1.16 =E2=86=92 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 =3D> 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 +Date: Tue Sep 6 19:22:59 2011 +0200 + + x11: Don't create GdkDevices for disabled devices + =20 + 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 initi= al + state. + +diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-x= i2.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 *ob= ject) + for (i =3D 0; i < ndevices; i++) + { + dev =3D &info[i]; ++ ++ if (!dev->enabled) ++ continue; ++ + add_device (device_manager, dev, FALSE); +=20 + if (dev->use =3D=3D XIMasterPointer || diff --git a/x11-libs/gtk+/files/gtk+-3.1.18-gtkselection-uninitialized-v= ar.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.patc= h @@ -0,0 +1,25 @@ +commit 057a50d58e940056c6f5407812a67405308aa983 +Author: Behdad Esfahbod +Date: Wed Sep 7 16:19:44 2011 -0400 + + Bug 658398 - Use of uninitialized variable reported by Valgrind + =20 + 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 =3D {0}; + =20 + selection_data.selection =3D selection; + selection_data.target =3D target; +- selection_data.data =3D NULL; + selection_data.length =3D -1; + selection_data.display =3D display; + =20 diff --git a/x11-libs/gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch b/x1= 1-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 +Date: Tue Sep 6 18:26:54 2011 -0400 + + iconview: fix a typo while removing the a11y adjustment weak ref + =20 + The code sets old_adj_ptr to the location containing the old weak re= f, + but then wants to remove a weak ref from &view->old_hadj, causing wa= rnings + 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_ad= justment_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} !=3D 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in fi =20 + # Useful upstream patches, will be in next release + epatch "${FILESDIR}/${P}"-*.patch + gnome2_src_prepare } =20