gnome-base/gnome-settings-daemon: add patch to check for server-side XInput support (Gnome bug #562977)

(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r2 x86_64)

3 files changed, 116 insertions, 1 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 5d1c77c8a291..c794cf2fb4d1 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.18 2008/11/29 12:31:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.19 2008/12/02 15:02:18 remi Exp $
+
+*gnome-settings-daemon-2.24.1-r1 (02 Dec 2008)
+
+  02 Dec 2008; Rémi Cardona <remi@gentoo.org>
+  +files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch,
+  +gnome-settings-daemon-2.24.1-r1.ebuild:
+  add patch to check for server-side XInput support (Gnome bug #562977)
 
 *gnome-settings-daemon-2.24.1 (29 Nov 2008)
 
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch
new file mode 100644
index 000000000000..d86d9dd5d551
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch
@@ -0,0 +1,22 @@
+Index: plugins/mouse/gsd-mouse-manager.c
+===================================================================
+--- plugins/mouse/gsd-mouse-manager.c	(révision 621)
++++ plugins/mouse/gsd-mouse-manager.c	(copie de travail)
+@@ -328,6 +328,17 @@
+ set_devicepresence_handler (GsdMouseManager *manager)
+ {
+         Display *display = gdk_x11_get_default_xdisplay ();
++ 
++        XExtensionVersion *version = XGetExtensionVersion (display, INAME);
++        if (!version || version == (XExtensionVersion*) NoSuchExtension)
++            return;
++
++        if (!version->present)
++        {
++            XFree (version);
++            return;
++        }
++
+         XEventClass class_presence;
+         int xi_presence;
+ 
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild
new file mode 100644
index 000000000000..2360bd6e53fc
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2008-2008 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.24.1-r1.ebuild,v 1.1 2008/12/02 15:02:18 remi Exp $
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa debug esd gstreamer libnotify pulseaudio"
+
+RDEPEND=">=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.18.0
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/gconf-2.6.1
+	>=gnome-base/libgnomekbd-2.21.4
+
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gnome-desktop-2.23.90
+
+	libnotify? ( >=x11-libs/libnotify-0.4.3 )
+
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXext
+	x11-libs/libXxf86misc
+	>=x11-libs/libxklavier-3.3
+	media-libs/fontconfig
+
+	esd? ( >=media-sound/esound-0.2.28 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10.1.2
+		>=media-libs/gst-plugins-base-0.10.1.2 )
+	!gstreamer? (
+		alsa? ( >=media-libs/alsa-lib-0.99 ) )"
+# In configure: gstreamer wins over alsa
+
+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"
+
+# FIXME: pulseaudio is used to detect if system should build
+# old sound preference capplet (some braindead logic in there)
+PDEPEND="pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )"
+
+# README is empty
+DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable alsa)
+		$(use_enable debug)
+		$(use_enable esd)
+		$(use_enable gstreamer)
+		$(use_enable libnotify)
+		$(use_enable !pulseaudio legacy-sound-pref)"
+	# We use legacy-sound-pref instead of pulse because
+	# there is no gain in adding a build time dep on pulseaudio
+
+	if use esd && use pulseaudio; then
+		ewarn "You selected conflicting USE flags. Please note that USE=\"esd\""
+		ewarn "has no effect when USE=\"pulseaudio\" is selected."
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix libnotify & pulseaudio automagic dependencies
+	epatch "${FILESDIR}/${PN}-2.24.0-automagic.patch"
+
+	# Fix server-side XInput detection (Gnome bug #562977)
+	epatch "${FILESDIR}/${PN}-2.24.1-check-for-server-side-XInput.patch"
+
+	eautoreconf
+}