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).

(Portage version: 2.1.9.50/cvs/Linux x86_64)

4 files changed, 215 insertions, 1 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/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
+}