Revision bump with upstream patches to react to stream-removed signal from GvcMixerControl and use event driven mode for syndaemon (bug #371455 by Alex Domingo).

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

5 files changed, 222 insertions, 15 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 628a7244ce15..d9646ea07488 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.79 2011/04/07 15:40:02 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.80 2011/06/15 19:32:02 pacho Exp $
+
+*gnome-settings-daemon-2.32.1-r2 (15 Jun 2011)
+
+  15 Jun 2011; Pacho Ramos <pacho@gentoo.org>
+  +gnome-settings-daemon-2.32.1-r2.ebuild,
+  +files/gnome-settings-daemon-2.32.1-media-keys-react.patch,
+  +files/gnome-settings-daemon-2.32.1-syndaemon-mode.patch:
+  Revision bump with upstream patches to react to stream-removed signal from
+  GvcMixerControl and use event driven mode for syndaemon (bug #371455 by Alex
+  Domingo).
 
   07 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   gnome-settings-daemon-2.32.1.ebuild,
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index a10c4bf4524b..4b3960178302 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -4,28 +4,21 @@ 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
+AUX gnome-settings-daemon-2.32.1-media-keys-react.patch 1556 RMD160 36120e9451f49045450fa17bf1fb3e304ce39e23 SHA1 680e13a75c296ddb899cb7637682e89ae19d09b5 SHA256 9d56379de2c2cc83ffd4c40f7ab4c913647fefc54a1978ca0c5a4300bf3abec2
 AUX gnome-settings-daemon-2.32.1-netfs-monitor.patch 1753 RMD160 af98d9b35a2f9748fc86654d4f9a90a85c1c1537 SHA1 b8606ac345e367619838466d5883c0595cd6bcc8 SHA256 ba30e87b4815dca4bae74076b787a3fb9bd083923a1a8e6dee2cd95e8f4ca4e9
+AUX gnome-settings-daemon-2.32.1-syndaemon-mode.patch 1612 RMD160 1ec1582c3e1565e128c8124510a0d9f10432a9fc SHA1 10c05a986f34147d2b17c2c20a5910ac13633c0e SHA256 1ac8939aa161c9a9737f5bdf68ccfdc923944802a864cd76dcc8655fa5b129e0
 DIST gnome-settings-daemon-2.30.0-gst-vol-control-support.patch 27189 RMD160 77e44583894977b6255fba168d565c5948481401 SHA1 8db1dde75b1866619d6589e989ed27fc45050c50 SHA256 0858e7fdb97086f7f0a284d535d642c23f06fb7d9fc71d9f7477dc856439a158
 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
 EBUILD gnome-settings-daemon-2.32.1-r1.ebuild 3599 RMD160 07b14d6f4fcc050aeea44e0d1cfa93df7056a582 SHA1 0a9f4cf3542cd27369a8f9b66a3de8d161779c52 SHA256 04a0e4315edae1388ea8c07521e8d0fc52e7b86af520f892f3c54480d49b1a64
+EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3799 RMD160 7a6c2be5590e3014da838ea27a0f22e1e8c88bb6 SHA1 aa967f377fe486dad24c71dc4bc4329acfa9d502 SHA256 c2697f9b2b3565fdce9c614bb141beb286028da0b83401b530e5c1514f3ebf4e
 EBUILD gnome-settings-daemon-2.32.1.ebuild 3221 RMD160 936a84871290b091dc7c1f65d92b5c06eb9f5dd5 SHA1 23efa449f73333872e8934f7eea743b2567fe18b SHA256 d1de887b4510cc37998a44b51f7ce880af0cf02d72e917f09c604e3cc9e3b31e
-MISC ChangeLog 14983 RMD160 d46f8241ddceb14a8527f81021fb7a426b4d0ad0 SHA1 4bf9d4b07224759f04bd221983c7b567ea9f21b1 SHA256 ef59c97f01fa8c06c701438fab52131fde0918d49df034caa0d77780e6a2120f
+MISC ChangeLog 15408 RMD160 1be40c42662cea8c3b8ac8fc41d06c32fd7f9fe4 SHA1 1f61312f22cc567dac2ea78bfdfc17e8d8974cd5 SHA256 6b2714b4bf4a3807af79dbe85ed338295684a1bd168e66c7c238f48409235aba
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNndrOAAoJEO/kOhxWD91kwnEP/3Rc7yVyVuNYWzbeu/hJ/Urj
-pEjDn2Xd2Dn6UtgnpqtUiBjaNYDqjWMkvRRitcHerzVANBCcGEsx5evpng1dtAU9
-Zv2oElA6jcx5+IQoSFS9InA2cEFv78A2OjzCxQbS+lNB7OenNIRmvC06VV2LyzTw
-28dhietr7eFigcVAIq93DAUN7V978EiFsv03bxu31NbDKv6wtzA5Md5JahVUUkrT
-SFTgqnq/RaaWobjeLIuZb8mgGUcBVVz43PXMx7HJB03o83zGTXRBoh3rIxz7Kivx
-1P7mtmlCnY8zUbPpnGhOYa/THcKxE9b/RrGtWNBBh+zT5dlSVzWbUurc/vCPA/Hj
-DfJeZvEV4l1Ltg1FWFUVJaDXyTqu4g0JjngQECE1iP0LyB2vvf/H8ELJkiMD91WG
-/sCp+XhBzXTERbMVbVFB5efPNQ23JIGNvtTouhGOR7AvJ93tCGy9I0+HEWp5IjSE
-rcjYBcFv/oJhE9F1FdTjtEvY2zTsbmKWzeyOsZ0Ap5ehEbGynKCX29CpENAtHWTj
-S4wKHuRY4kmj5zyjPDIluYU9OTGS4hf2LOacahwYWqj0L4OlmDRxhKTP9DH1+uQj
-pDV0DC9jYQCVpKBkzQtlVLFniRkbiu8A/CE2dYesvUUw4u5A5QxUwLvMnfd09xv+
-Pq7ndLyWRywRitXBspZF
-=S3QV
+iEYEARECAAYFAk35CLgACgkQCaWpQKGI+9QTGACgghekIBoUvFTjPLID1vB08aOP
+GrgAnREoDnSck3azjaQBZIImEF3vcO5O
+=bCaf
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-media-keys-react.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-media-keys-react.patch
new file mode 100644
index 000000000000..5a2c04555f2d
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-media-keys-react.patch
@@ -0,0 +1,43 @@
+From c9a6a27aa766b31d9f32d182b1de5886793e906b Mon Sep 17 00:00:00 2001
+From: Rodrigo Moya <rodrigo@gnome-db.org>
+Date: Tue, 19 Apr 2011 13:59:35 +0000
+Subject: media-keys: React to stream-removed signal from GvcMixerControl
+
+---
+diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
+index b563f73..1f18074 100644
+--- a/plugins/media-keys/gsd-media-keys-manager.c
++++ b/plugins/media-keys/gsd-media-keys-manager.c
+@@ -794,6 +794,19 @@ on_control_default_sink_changed (GvcMixerControl     *control,
+         update_default_sink (manager);
+ }
+ 
++static void
++on_control_stream_removed (GvcMixerControl     *control,
++                           guint                id,
++                           GsdMediaKeysManager *manager)
++{
++        if (manager->priv->stream != NULL) {
++		if (gvc_mixer_stream_get_id (manager->priv->stream) == id) {
++	                g_object_unref (manager->priv->stream);
++			manager->priv->stream = NULL;
++		}
++        }
++}
++
+ #endif /* HAVE_PULSE */
+ 
+ static gint
+@@ -1118,6 +1131,10 @@ gsd_media_keys_manager_start (GsdMediaKeysManager *manager,
+                           "default-sink-changed",
+                           G_CALLBACK (on_control_default_sink_changed),
+                           manager);
++        g_signal_connect (manager->priv->volume,
++                          "stream-removed",
++                          G_CALLBACK (on_control_stream_removed),
++                          manager);
+ 
+         gvc_mixer_control_open (manager->priv->volume);
+ 
+--
+cgit v0.9
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-syndaemon-mode.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-syndaemon-mode.patch
new file mode 100644
index 000000000000..3476a9d0f286
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-syndaemon-mode.patch
@@ -0,0 +1,42 @@
+From f7071bf1f9941f0ba5fe23c645656e70fb2dd699 Mon Sep 17 00:00:00 2001
+From: Pauli Nieminen <suokkos@gmail.com>
+Date: Sat, 15 Jan 2011 19:46:34 +0000
+Subject: mouse: Use event driven mode for syndaemon
+
+In default polling mode syndaemon wakeups 5 times per second. That
+is pretty bad for power consumption with hungry laptop CPUs.
+
+If syndaemon was compiled to include XRecord extension -R parameter
+can be used to select even driven mode. Event driven mode wakeups
+only when there is KeyPress or KeyRelease event. In that time CPU
+is already running so impact for power consumption is lesser.
+
+Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=639623
+---
+diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
+index 44df57f..0a9c179 100644
+--- a/plugins/mouse/gsd-mouse-manager.c
++++ b/plugins/mouse/gsd-mouse-manager.c
+@@ -555,7 +555,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
+ {
+         if (state && touchpad_is_present ()) {
+                 GError *error = NULL;
+-                char *args[5];
++                char *args[6];
+ 
+                 if (manager->priv->syndaemon_spawned)
+                         return 0;
+@@ -564,7 +564,8 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
+                 args[1] = "-i";
+                 args[2] = "2.0";
+                 args[3] = "-k";
+-                args[4] = NULL;
++                args[4] = "-R";
++                args[5] = NULL;
+ 
+                 if (!g_find_program_in_path (args[0]))
+                         return 0;
+--
+cgit v0.9
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild
new file mode 100644
index 000000000000..3e5489d04ffe
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2011 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-2.32.1-r2.ebuild,v 1.1 2011/06/15 19:32:02 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="http://www.gnome.org"
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/gnome-settings-daemon-2.32.1-gst-vol-control-support.patch"
+
+# Old patches:
+# 	mirror://gentoo/${PN}-2.30.0-gst-vol-control-support.patch" -> this causes bug #327609
+# 	mirror://gentoo/${PN}-2.30.2-gst-vol-control-support.patch.bz2" -> this patch has worse problems like bug #339732
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug libnotify policykit pulseaudio smartcard"
+
+# libgnomekbd-2.91 breaks API/ABI
+RDEPEND=">=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.21.2:2
+	>=gnome-base/gconf-2.6.1:2
+	>=gnome-base/libgnomekbd-2.31.2
+	<gnome-base/libgnomekbd-2.91.0
+	>=gnome-base/gnome-desktop-2.29.92:2
+
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXxf86misc
+	>=x11-libs/libxklavier-5.0
+	media-libs/fontconfig
+
+	libnotify? ( >=x11-libs/libnotify-0.4.3 )
+	policykit? (
+		>=sys-auth/polkit-0.91
+		>=dev-libs/dbus-glib-0.71
+		>=sys-apps/dbus-1.1.2 )
+	pulseaudio? (
+		>=media-sound/pulseaudio-0.9.15
+		media-libs/libcanberra[gtk] )
+	!pulseaudio? (
+		>=media-libs/gstreamer-0.10.1.2:0.10
+		>=media-libs/gst-plugins-base-0.10.1.2:0.10 )
+	smartcard? ( >=dev-libs/nss-3.11.2 )"
+
+DEPEND="${RDEPEND}
+	!<gnome-base/gnome-control-center-2.22
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.19
+	x11-proto/inputproto
+	x11-proto/xproto"
+
+pkg_setup() {
+	# README is empty
+	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable debug)
+		$(use_with libnotify)
+		$(use_enable policykit polkit)
+		$(use_enable pulseaudio pulse)
+		$(use_enable !pulseaudio gstreamer)
+		$(use_enable smartcard smartcard-support)"
+
+	if use pulseaudio; then
+		elog "Building volume media keys using Pulseaudio"
+	else
+		elog "Building volume media keys using GStreamer"
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# libnotify-0.7.1 compatibility patches
+	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch
+	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-init.patch
+
+	# Restore gstreamer volume control support, upstream bug #571145
+	# Keep using old patch as it doesn't cause problems like bug #339732
+#	epatch "${WORKDIR}/${PN}-2.30.2-gst-vol-control-support.patch"
+#	echo "plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c" >> po/POTFILES.in
+	# We use now debian patch as looks to fix bug #327609
+#	epatch "${DISTDIR}/${PN}-2.30.0-gst-vol-control-support.patch"
+	epatch "${DISTDIR}/${PN}-2.32.1-gst-vol-control-support.patch"
+
+	# More network filesystems not to monitor, upstream bug #606421
+	epatch "${FILESDIR}/${PN}-2.32.1-netfs-monitor.patch"
+
+	# xsettings: Export Xft.lcdfilter for OO.o's benefit, upstream bug #631924
+	epatch "${FILESDIR}/${PN}-2.32.1-lcdfilter.patch"
+
+	# media-keys: React to stream-removed signal from GvcMixerControl
+	epatch "${FILESDIR}/${PN}-2.32.1-media-keys-react.patch"
+
+	# mouse: Use event driven mode for syndaemon
+	epatch "${FILESDIR}/${PN}-2.32.1-syndaemon-mode.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! use pulseaudio; then
+		elog "GStreamer volume control support is a feature powered by Gentoo GNOME Team"
+		elog "PLEASE DO NOT report bugs upstream, report on https://bugs.gentoo.org instead"
+	fi
+}