Version bump, fixes various bugs and plugs memory leaks.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

5 files changed, 231 insertions, 2 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 3678950d01cc..a0c76d2c2624 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.104 2012/05/13 23:35:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.105 2012/05/20 10:43:38 tetromino Exp $
+
+*gnome-settings-daemon-3.4.2 (20 May 2012)
+
+  20 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-settings-daemon-3.4.2.ebuild,
+  +files/gnome-settings-daemon-3.4.2-XI-2.2.patch,
+  +files/gnome-settings-daemon-3.4.2-double-unref.patch:
+  Version bump, fixes various bugs and plugs memory leaks.
 
 *gnome-settings-daemon-3.4.1 (13 May 2012)
 
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 25060256eaf1..ee7bb7f5514c 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-settings-daemon-2.32.1-lcdfilter.patch 1749 RMD160 3c3ac3aab62db8c963bb46f89b5ddc42ae699f82 SHA1 de66d2a6a5e8b7fd66def022338ba482dce4d62d SHA256 6aaf4fe50034de4c403850df25a93e371a94486af9629f4d3cc70863abbfb3ae
 AUX gnome-settings-daemon-2.32.1-libnotify-0.7.patch 3490 RMD160 f02271a40dd6f22e0041db8eff79441513b24ddd SHA1 ec981586bddcbe35269583b4a50827b57e31d55d SHA256 da836e61ddaea8b3a90692951296a28c4533e1e117412a0602f6c76e564e837d
 AUX gnome-settings-daemon-2.32.1-libnotify-init.patch 602 RMD160 90aee270093da761f587b25cd71956fdc6bbb435 SHA1 42c7b245b5842cdb1b47ede959c79e7852f49e71 SHA256 3f81b1bf76b4e01fe6264be0de987fe9d346eee305a898dca630dea7d77b61f3
@@ -10,12 +13,27 @@ AUX gnome-settings-daemon-3.2.1-optional-colord.patch 2934 RMD160 cefc964b1c6449
 AUX gnome-settings-daemon-3.2.2-color-unavailable-edid.patch 1311 RMD160 76d5fca7a75fc2fdcf7bc023f6a05280cfe3e1eb SHA1 d98b53d0909a9d3b14a1bf3678808547701e7869 SHA256 363257a18536cf1de0f28e2659649d40cf8c0de5d2de4dde25407b4b3b53d510
 AUX gnome-settings-daemon-3.2.2-print-notifications-malformed-dbus.patch 1361 RMD160 f81bea3a3121f0bcc3f6952fbf1f90521ebfcd3e SHA1 45c86a6348232363f35335a77cb431064eb8cffa SHA256 fca67486fe20bbc37e65d8e14fe1fae9c5b9677f9788e764f7634a28b04c3b1b
 AUX gnome-settings-daemon-3.4.0-optional-color-wacom.patch 4459 RMD160 2ff464bd02efffa4932d851dd8c73b5932667506 SHA1 d42be52c90d56d751b1991f8c2e7c565c2f0d750 SHA256 90ca17376761f81f81faf714d89642599dc779050ac1de71927063d2447396fd
+AUX gnome-settings-daemon-3.4.2-XI-2.2.patch 1816 RMD160 f3dcbbf136230ef064a7fe8dae7bccaed4694e75 SHA1 3937118090b2435349a5624829ea314501710b2b SHA256 307e9328347ebcff8b4aa75174f8f41791135d6fa39b093e4cd897b017315793
+AUX gnome-settings-daemon-3.4.2-double-unref.patch 1179 RMD160 ab05cb64beb480e54fd25a1af00816a6324daf6f SHA1 cffe27d7fe99dbcfef18850aaea5e7bbbacec10e SHA256 67453794ae5bec487395cc48e7f5caea820020559b5ff9eca8a069b64a1e7dc3
 DIST gnome-settings-daemon-2.32.1-gst-vol-control-support.patch 26788 RMD160 059f8e3e69990cf7f6f3e63159ab8d43f2f4f78a SHA1 5a734843d2094dccdb17014485ac20171193e130 SHA256 689f6152d6e27ddc0b8080d5c8c1644b6116075ff505951631af9b7289d2f933
 DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 RMD160 71aef9419eeca5f9fa59bb55990327c307f9ca31 SHA1 f2550acb4a9fd8f96ead1263ba5739915c303f6e SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
 DIST gnome-settings-daemon-3.2.3.tar.xz 1418144 RMD160 2dc5b8cbc011cee7ca7ec4c4c78325984c059750 SHA1 f6873415a3fc2c77ec804c5ca2f052cac940b413 SHA256 53c4d642ec8a4b812ad35c1b4cba7d33e9e4dc90ab135b726219ad9adc4a94b9
 DIST gnome-settings-daemon-3.4.1.tar.xz 1495068 RMD160 4d96b0aeceb8d43ceb5666af8700019990b04f2b SHA1 c5dd7754b4a5e585cedc23b944cd6f1026d93343 SHA256 d5d4a270ec5692cdc56a58cfb57bc7f8fa93374566912a65e78c1c3db7faf4ed
+DIST gnome-settings-daemon-3.4.2.tar.xz 1430872 RMD160 46b3df8f62f101f4d93d14ffc791a572aae86706 SHA1 eecfdb1abc92f8ef6dd22c1b634cf0b7adc9b8d1 SHA256 00499118c80474981f3389ef518e2d001f1b1a3b1fb78e54859d59f3bee38ff4
 EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3934 RMD160 a8141e743467a65d4e16c1a6cef6e18c38583085 SHA1 f05d64d7f8a87ac615f1156c0225a42d05458d46 SHA256 1e30ad404ed92c793b4342dda5a7091678ce0869f6118a7e5fe3c3ded4cc55ea
 EBUILD gnome-settings-daemon-3.2.3.ebuild 3912 RMD160 793183eb1b03162499b15713f0b6b82eada7b9bc SHA1 c9ce68e34d858c1294b57d4cb7043a3b9c5ef92f SHA256 03ea24ebe7c7093da2d0bfd9a1297b8659d360ecb7abe7d64eb2e98e01198372
 EBUILD gnome-settings-daemon-3.4.1.ebuild 3478 RMD160 f77bbda547cfb37034222194b4f22fa39e9da09a SHA1 e2deedcf75b709b77115a99c7a4f97c06ee9559e SHA256 b631134eff866216b90adc77e0aebde443332108ee6a41bd60f62c338920d8da
-MISC ChangeLog 21019 RMD160 3c8c578c0546353deed331fcd57eb0bef0cf311e SHA1 9d40129b884d66fc4e7a7ba0c668ac302a9ef36a SHA256 05d82129105d81dca69c08f06da1ee5cb10b9ff2087f95acaa95e7dc07f289dc
+EBUILD gnome-settings-daemon-3.4.2.ebuild 3599 RMD160 0c3c783672048b5d4fbe34a99234874d8bbceeac SHA1 699fa80dce3b8ac74fa4c58911fb224666e9cfe4 SHA256 b825c30cfa7d3af3d7644405f465194ba124cb1e6f61f3d50862b1ef41740970
+MISC ChangeLog 21329 RMD160 57fef611c40914a1008a74356f7ecc119af252b2 SHA1 0f716ef3c1703c1f001f3530088d44a690bf6dcb SHA256 75ea86995aac0858932bfbdea621a869d8d38d0c3f0276d35fe2faca0ad11e86
 MISC metadata.xml 719 RMD160 bf43a1fbb57e126352838cf1dbadcd29f4403842 SHA1 76225892e354670bc75883efd1b332baa75124cc SHA256 c7a442b18c3adc866db0c31ec2303a008fcf5b3513c0b44c1b0c71628a46f608
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPuMrfAAoJEJ0WA1zPCt1hRCEH/1cK0v697lLejfm9f9hRivhU
+HgWKQzZ50yoDw5NYfhk/8yIfXp6q5oppjp3d/VKPN8bFIj6oIaAypfrCmBfL2lpr
+I80jxxpP+DyU7ebQe6tWuEFeN/afyMCk8r+smsQyb1b5tcAZxZ+umOZMVFS36lU0
+iusYTQrzj/mYHhOuUIM4sTA6Zv79H2CXxjINLrE+Vn8Ws590oW9Rjrfx+IGxfYAN
+aUVZrXhcJ+CVzYWSMO4ZOUztxkeWjivYa9HOsNdJDR0UZbtFXPqg6rW95JqfWL04
+kgWbS9V3urkIG7U+x1q+pPzoqFwINNePZwjxFiYpFWZnCxDSdK5NAChWbq0nz6s=
+=px25
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-XI-2.2.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-XI-2.2.patch
new file mode 100644
index 000000000000..f2079dd81b88
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-XI-2.2.patch
@@ -0,0 +1,44 @@
+From 9d23fac4ce927cd27964323aa4cf8138e5128ba0 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu, 12 Apr 2012 13:51:09 +1000
+Subject: [PATCH] common: Try XI 2.2 if XI 2.0 fails
+
+The media-keys plugin calls supports_xinput2_devices(). That again calls
+XIQueryDevice with a major/minor of 2.0. The upstream server has a check
+for this in place and responds BadValue if a client initiates XI2 twice
+with two different versions (such both us and GTK+ checking for
+different versions). This happens here, and thus the plugin fails
+to load.
+
+The X server was fixed, but this is still required for older versions
+of the Xi code:
+http://cgit.freedesktop.org/xorg/xserver/commit/?id=ea51e9b2877df60135edaf2a8f88d0f2a2b41060
+
+https://bugzilla.gnome.org/show_bug.cgi?id=673964
+---
+ plugins/common/gsd-input-helper.c |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c
+index cf9e83d..f06b507 100644
+--- a/plugins/common/gsd-input-helper.c
++++ b/plugins/common/gsd-input-helper.c
+@@ -129,7 +129,14 @@ supports_xinput2_devices (int *opcode)
+ 
+         if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
+                 gdk_error_trap_pop_ignored ();
+-                return FALSE;
++                /* try for 2.2, maybe gtk has already announced 2.2 support */
++                gdk_error_trap_push ();
++                major = 2;
++                minor = 2;
++                if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
++                    gdk_error_trap_pop_ignored ();
++                    return FALSE;
++                }
+         }
+         gdk_error_trap_pop_ignored ();
+ 
+-- 
+1.7.8.6
+
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-double-unref.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-double-unref.patch
new file mode 100644
index 000000000000..8ae42e1b2393
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-double-unref.patch
@@ -0,0 +1,33 @@
+From f3e5a738c7d663adedb98829fb69bb389a10e775 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@unixuser.org>
+Date: Thu, 5 Apr 2012 16:41:12 +0900
+Subject: [PATCH] daemon: don't unref member objects twice on dispose
+
+https://bugzilla.gnome.org/show_bug.cgi?id=673555
+---
+ gnome-settings-daemon/gnome-settings-manager.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gnome-settings-daemon/gnome-settings-manager.c b/gnome-settings-daemon/gnome-settings-manager.c
+index 13faeba..672c53f 100644
+--- a/gnome-settings-daemon/gnome-settings-manager.c
++++ b/gnome-settings-daemon/gnome-settings-manager.c
+@@ -461,11 +461,11 @@ gnome_settings_manager_stop (GnomeSettingsManager *manager)
+                 manager->priv->owner_id = 0;
+         }
+ 
+-        g_object_unref (manager->priv->settings);
+-        manager->priv->settings = NULL;
++        if (manager->priv->settings)
++                g_clear_object (&manager->priv->settings);
+ 
+-        g_object_unref (manager->priv->pnp_ids);
+-        manager->priv->pnp_ids = NULL;
++        if (manager->priv->pnp_ids)
++                g_clear_object (&manager->priv->pnp_ids);
+ }
+ 
+ static void
+-- 
+1.7.8.6
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild
new file mode 100644
index 000000000000..760afcca7267
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild,v 1.1 2012/05/20 10:43:38 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
+
+# colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.0:2
+	>=x11-libs/gtk+-3.3.4:3
+	>=gnome-base/libgnomekbd-2.91.1
+	>=gnome-base/gnome-desktop-3.3.92:3
+	>=gnome-base/gsettings-desktop-schemas-3.3.0
+	media-fonts/cantarell
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra[gtk3]
+	>=media-sound/pulseaudio-0.9.16
+	>=sys-power/upower-0.9.11
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7.3
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/libXxf86misc
+	>=x11-libs/libxklavier-5.0
+	>=media-sound/pulseaudio-0.9.16
+
+	colord? ( >=x11-misc/colord-0.1.13 )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	packagekit? (
+		sys-fs/udev[gudev]
+		>=app-admin/packagekit-base-0.6.12 )
+	smartcard? (
+		sys-fs/udev[gudev]
+		>=dev-libs/nss-3.11.2 )
+	systemd? ( >=sys-apps/systemd-31 )
+	udev? ( sys-fs/udev[gudev] )
+	wacom? ( >=dev-libs/libwacom-0.3
+		x11-drivers/xf86-input-wacom )"
+# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
+# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
+# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/dconf
+	>=x11-themes/gnome-themes-standard-2.91
+	>=x11-themes/gnome-icon-theme-2.91
+	>=x11-themes/gnome-icon-theme-symbolic-2.91
+	!<gnome-base/gnome-control-center-2.22
+	!<gnome-extra/gnome-color-manager-3.1.1
+	!<gnome-extra/gnome-power-manager-3.1.3
+
+	!systemd? ( sys-auth/consolekit )"
+# xproto-7.0.15 needed for power plugin
+DEPEND="${COMMON_DEPEND}
+	cups? ( sys-apps/sed )
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/xf86miscproto
+	>=x11-proto/xproto-7.0.15"
+
+pkg_setup() {
+	# README is empty
+	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-schemas-compile
+		$(use_enable colord color)
+		$(use_enable cups)
+		$(use_enable debug)
+		$(use_enable debug more-warnings)
+		$(use_enable packagekit)
+		$(use_enable smartcard smartcard-support)
+		$(use_enable systemd)
+		$(use_enable udev gudev)
+		$(use_enable wacom)"
+}
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
+	# Apparently this change severely affects touchpad usability for some
+	# people, so revert it if USE=short-touchpad-timeout.
+	# Revisit if/when upstream adds a setting for customizing the timeout.
+	use short-touchpad-timeout &&
+		epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
+
+	# Make colord and wacom optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.4.0-optional-color-wacom.patch"
+
+	# Useful patches in next release
+	epatch "${FILESDIR}/${P}-double-unref.patch"
+	epatch "${FILESDIR}/${P}-XI-2.2.patch"
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	echo 'GSETTINGS_BACKEND="dconf"' >> 51gsettings-dconf
+	doenvd 51gsettings-dconf
+}