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

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 119 insertions, 12 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/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index be6b89815bcf..37f33e91adb1 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-settings-daemon-2.24.0-automagic.patch 1656 RMD160 895fe60a74854d14229fa81fb534dc2379b3de8c SHA1 dfbfdc227104cc4339e8ff4c5bc8d3208a18f09c SHA256 ebf248ccbe911200ff256df37345f07c2291caf165b16331e6916ccf24be003d
+AUX gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch 709 RMD160 39d2c64c6e81d2aeb02dbbdfa81f8d8a38086ff7 SHA1 101d117e8c3072e9ad588435e801dd4d134695af SHA256 9d3ae8148fe52eebb28ae243bc95942de2b8d27a50097c7edae175c55926b739
 DIST gnome-settings-daemon-2.22.2.1.tar.bz2 1139262 RMD160 c79d531226f8e58e0acd8f23177a62c8818b70d7 SHA1 0424486b6e53ab0d2dd676c375d02e35341b3a20 SHA256 72cb9aee096019a2925fb5b99a5e880d01f7d529d4c9e75dfbbea1b1f654d7a9
 DIST gnome-settings-daemon-2.24.0.tar.bz2 1119609 RMD160 da517b2a5841ba4044c7ee69f784894f622ec5f3 SHA1 7d95a7550c465c9a64e4bda64331c92069958bfd SHA256 98377ed6d7c4abb75b746570f07e00a4346ba6f5924574130211beca764bb99d
 DIST gnome-settings-daemon-2.24.1.tar.bz2 1131518 RMD160 27d432cd217a836fcef0deac5f80f638a73cda7c SHA1 d0dbf6ba82cdc1e814d6c46bdc363e61ee9fd0f3 SHA256 a2a5132a5b9d0bef52010ea45b14560b6344f591ce3296ed555165332cce9a70
 EBUILD gnome-settings-daemon-2.22.2.1.ebuild 1402 RMD160 892cee9f8acfcef02afd0ac10fabad5b68c0466f SHA1 d880aec50d6621a48e77fedd41953458f83f0112 SHA256 8f5374607384da838219f0eec28ad6c9dca369b9c6dc848ecb1a3c0c760e0ae7
 EBUILD gnome-settings-daemon-2.24.0.ebuild 2239 RMD160 ac1169181ee8e382a2079d2572fb935c8599e99e SHA1 e8ef308613e754ab4be4823b8cd812d39a83953e SHA256 24340eb32674b0d01e7d2d9cbb992cc63a0e9c43cf9f99416ef82a8199b3094b
+EBUILD gnome-settings-daemon-2.24.1-r1.ebuild 2373 RMD160 d3a93a37f3efd765279c41cc288f1282d1c265e3 SHA1 c7575828c3537366a49289f5cf18c845c36c7779 SHA256 eb0b8dbceb2749ac9eeebe8c20082d0a6efac6960f70594039528b98d0665559
 EBUILD gnome-settings-daemon-2.24.1.ebuild 2242 RMD160 a60e874d778dade248db370170a920903accc118 SHA1 774360ce6f94cac77e3961355734a3bfc79f3eaa SHA256 31d5acd6a38f9e6e933c5f19961cccce47056b0bb8b476dae4d47b71ab67519d
-MISC ChangeLog 3598 RMD160 4561456d811f9496755963a03409d710c0d0bb64 SHA1 3c9e14de8758c9f6a4f747cfc997ba79d8421b2e SHA256 83f84e7715be4183daa3a2cc0fe840c18b05821d2a0e20ad733cebfb78f1b0af
+MISC ChangeLog 3884 RMD160 671c62e5c7633f5aebf5a0def537279b78e3d763 SHA1 7a3403cf03bfb20eb6f7d086df63a29353813eac SHA256 14eb3cd82ff1e8ee840de099ae4a2d8542c72a07300c6b1b8670567949d0e0b0
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkxNjUACgkQ1fmVwcYIWAaSMwCeOFLkMFvOIgdEUsLtO8QFEyvR
-U2sAn1LnjWUqLrvsnWYSiyJuOp2pJUBm
-=ZIgA
------END PGP SIGNATURE-----
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
+}