Upstream patch for libXi >= 1.3.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

6 files changed, 173 insertions, 7 deletions

diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index 252edd558ab0..8d0b46da58b1 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfce4-settings
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.26 2009/10/24 16:38:06 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.27 2009/10/27 16:46:42 ssuominen Exp $
+
+*xfce4-settings-4.6.3-r1 (27 Oct 2009)
+
+  27 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-settings-4.6.3-r1.ebuild, +files/xfce4-settings-4.6.3-Xi.patch:
+  Upstream patch for libXi >= 1.3.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> xfce4-settings-4.6.3.ebuild:
   ppc stable #281427
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 4338d05bd4f5..96dba3479486 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,7 +1,9 @@
+AUX xfce4-settings-4.6.3-Xi.patch 3446 RMD160 7ac843fc0939fa5c26ea00d9e073824e3e27a088 SHA1 3b9cd3623e9d4a9830075d54e49d7d5e63ea67cf SHA256 b28e940ae81087ea9cc7d15584b6a0ce4d329436dc513652b4fa81807d53160c
 AUX xfce4-settings-4.6.3-exo.patch 677 RMD160 cfd4cd31df25e62babea9d197c9bfbfd02d0df41 SHA1 27dc3571bdb8a6f63de8c4e0d24be17b5f000c3b SHA256 06be2fa459411bb42a03b49fb27bc8ae07d084e85995f6671f721aa750e4e4ae
 DIST xfce4-settings-4.6.1.tar.bz2 501587 RMD160 6ecfa08d6ad528d43988c5fe128b2fcd6db6f0d3 SHA1 ab117c3923571e2437095fd165ac4bf392e658e0 SHA256 36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
 DIST xfce4-settings-4.6.3.tar.bz2 534204 RMD160 732c19f0e6258a9ea2583eddd57d4953817a206d SHA1 8a7f114ae5cab071668937351a0b3b4be1b9b51c SHA256 f34b896960f7c30c3601b9946b145076a215778da6ab8399d268cd1f2b2b9d34
-EBUILD xfce4-settings-4.6.1.ebuild 1323 RMD160 b7e3aad99af7194b5227f8deb19390e54370f24c SHA1 749566c367cae3ee2d676694dd36b6b8dab50124 SHA256 f0b159bb6169a6c92179d82a92bed71705b018c71dae0fd39c8669477fc1b5ee
-EBUILD xfce4-settings-4.6.3.ebuild 1460 RMD160 288ddbf9fbfd6feb7466630df522022ba8da61a1 SHA1 56849e2b4e1d28725e3bda4fb743cae5e571e72e SHA256 ff6e57b245c8b79c7ff56019392ca9b4c18d3bc428255da3344eb7e5e17f47f9
-MISC ChangeLog 3880 RMD160 d48bebbd426c951f3301b2645ee071a4df3c4317 SHA1 6d72d334edddb16da4595eba5cecb443d4b82806 SHA256 c5d077e3e063334de23eabeaa84fdfc342e19ce8067f1d864d90f4f4c950a6ed
+EBUILD xfce4-settings-4.6.1.ebuild 1328 RMD160 6c797152f1bf55722c0f31a7346839b9f0a1663b SHA1 0efa0dfa9ae1e886aedf4011bdff99aeb9d06d49 SHA256 2501ba04f2e89220df1b163fe2290331aa901ae0d588c238d70a3fb10295d3ed
+EBUILD xfce4-settings-4.6.3-r1.ebuild 1501 RMD160 fabd3dc37b82300590bc7d2841b98aeee7244d8a SHA1 dd574803589431e27e5da735e306f5eee986de1c SHA256 f3e46ade30f9c0c752801ddd02158c83b83485e3df4a0551d5a498042c76bd81
+EBUILD xfce4-settings-4.6.3.ebuild 1484 RMD160 ffa79e846d4b66f97c39ebfb582db67ecfaad307 SHA1 29ff857e098ca625d44a1bb2ee3acd70dc419a12 SHA256 50e0a8d8f1662a0898c95dfbcb47e35b9d098df1e35e7b0c344a5cd1028f9768
+MISC ChangeLog 4086 RMD160 a164b47e3467b2ec378434750ea279a54f9cbe65 SHA1 788a9a7e36cdfca7d5166df2d857278f102b891a SHA256 e50f5617ac322d6db9e71c2db0b99225d34c8f531562a1888a46b3e48cf4529a
 MISC metadata.xml 363 RMD160 2f66508d394f9cc14654775f3a0b117bc10d3ef5 SHA1 8a3e6715e41535ea04377624a621c9ada60fd5ff SHA256 2442135d806e37420f1904d5b32e8b7afe94ed212307d25667f363db06c558e3
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-Xi.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-Xi.patch
new file mode 100644
index 000000000000..1a625cf14ae7
--- /dev/null
+++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-Xi.patch
@@ -0,0 +1,106 @@
+From 041cb4450d1d7c525c3fde20c38e293665619bd3 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Sun, 11 Oct 2009 12:02:05 +0000
+Subject: Fix the check for Xi so it does not fail with Xi2 (bug #4929).
+
+---
+diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
+index dc5604d..6edddac 100644
+--- a/dialogs/mouse-settings/main.c
++++ b/dialogs/mouse-settings/main.c
+@@ -60,6 +60,10 @@
+ #define IsXExtensionPointer 4
+ #endif
+ 
++/* Xi 1.4 is required */
++#define MIN_XI_VERS_MAJOR 1
++#define MIN_XI_VERS_MINOR 4
++
+ /* settings */
+ #ifdef HAVE_XCURSOR
+ #define PREVIEW_ROWS    (3)
+@@ -1221,13 +1225,21 @@ main (gint argc, gchar **argv)
+ 
+         return EXIT_FAILURE;
+     }
+-    
+-    /* check for Xi 1.4 */
++
++    /* check for Xi */
+     version = XGetExtensionVersion (GDK_DISPLAY (), INAME);
+-    if (!version || !version->present || version->major_version < 1 || version->minor_version < 4)
++    if (version == NULL || !version->present)
++    {
++        g_critical ("XI is not present.");
++        return EXIT_FAILURE;
++    }
++    else if (version->major_version < MIN_XI_VERS_MAJOR
++             || (version->major_version == MIN_XI_VERS_MAJOR
++                 && version->minor_version < MIN_XI_VERS_MINOR))
+     {
+-        g_critical ("XI is not present or too old.");
+-        
++        g_critical ("Your XI is too old (%d.%d) version %d.%d is required.",
++                    version->major_version, version->minor_version,
++                    MIN_XI_VERS_MAJOR, MIN_XI_VERS_MINOR);
+         return EXIT_FAILURE;
+     }
+ 
+diff --git a/xfce4-settings-helper/pointers.c b/xfce4-settings-helper/pointers.c
+index 6dd2cd4..b8718ba 100644
+--- a/xfce4-settings-helper/pointers.c
++++ b/xfce4-settings-helper/pointers.c
+@@ -42,6 +42,10 @@
+ 
+ #define MAX_DENOMINATOR (100.00)
+ 
++/* Xi 1.4 is required */
++#define MIN_XI_VERS_MAJOR 1
++#define MIN_XI_VERS_MINOR 4
++
+ /* test if the required version of inputproto (1.4.2) is available */
+ #if XI_Add_DevicePresenceNotify_Major >= 1 && defined (DeviceRemoved)
+ #define HAS_DEVICE_HOTPLUGGING
+@@ -133,18 +137,22 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
+ 
+     /* get the default display */
+     xdisplay = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
+-    
++
+     /* query the extension version */
+     version = XGetExtensionVersion (xdisplay, INAME);
+-    
+-    /* check for Xi 1.4 */
+-    if (!version || !version->present || version->major_version < 1 || version->minor_version < 4)
+-    {
+-        /* print error */
+-        g_critical ("XI is not present or too old.");
+ 
+-        /* no channel */
+-        helper->channel = NULL;
++    /* check for Xi */
++    if (version == NULL || !version->present)
++    {
++        g_critical ("XI is not present.");
++    }
++    else if (version->major_version < MIN_XI_VERS_MAJOR
++             || (version->major_version == MIN_XI_VERS_MAJOR
++                 && version->minor_version < MIN_XI_VERS_MINOR))
++    {
++        g_critical ("Your XI is too old (%d.%d) version %d.%d is required.",
++                    version->major_version, version->minor_version,
++                    MIN_XI_VERS_MAJOR, MIN_XI_VERS_MINOR);
+     }
+     else
+     {
+@@ -162,7 +170,7 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
+         gdk_flush ();
+         gdk_error_trap_push ();
+ 
+-        
++
+         if (G_LIKELY (xdisplay))
+         {
+             /* monitor device changes */
+--
+cgit v0.8.2.1
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.6.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.1.ebuild
index 41888b464a35..0833e1aa1cc6 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.6.1.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.1.ebuild,v 1.13 2009/08/23 17:45:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.1.ebuild,v 1.14 2009/10/27 16:46:42 ssuominen Exp $
 
 EAPI=2
 inherit xfconf
@@ -19,7 +19,7 @@ RDEPEND=">=dev-libs/glib-2.12:2
 	>=x11-libs/gtk+-2.10:2
 	x11-libs/libX11
 	x11-libs/libXcursor
-	x11-libs/libXi
+	<x11-libs/libXi-1.3
 	x11-libs/libXrandr
 	x11-libs/libwnck
 	>=x11-base/xorg-server-1.5.3
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild
new file mode 100644
index 000000000000..31e6fecbd6d5
--- /dev/null
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild,v 1.1 2009/10/27 16:46:42 ssuominen Exp $
+
+EAPI=2
+EAUTORECONF=yes
+inherit xfconf
+
+DESCRIPTION="Settings daemon for Xfce4"
+HOMEPAGE="http://www.xfce.org"
+SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug +keyboard libnotify sound"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	>=dev-libs/dbus-glib-0.34
+	>=gnome-base/libglade-2
+	>=x11-libs/gtk+-2.10:2
+	>=x11-libs/libX11-1
+	>=x11-libs/libXcursor-1.1
+	>=x11-libs/libXi-1.3
+	>=x11-libs/libXrandr-1.1
+	>=x11-libs/libwnck-2.12
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfcegui4-4.6
+	>=xfce-base/xfconf-4.6
+	>=xfce-base/exo-0.3.100
+	libnotify? ( >=x11-libs/libnotify-0.1.3 )
+	keyboard? ( >=x11-libs/libxklavier-0.3 )
+	sound? ( media-libs/libcanberra )
+	!<x11-base/xorg-server-1.5.3"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	dev-util/pkgconfig
+	x11-proto/inputproto
+	x11-proto/xf86vidmodeproto"
+
+pkg_setup() {
+	XFCONF="--disable-dependency-tracking
+		$(use_enable libnotify)
+		$(use_enable keyboard libxklavier)
+		$(use_enable sound sound-settings)
+		$(use_enable debug)"
+	DOCS="AUTHORS ChangeLog NEWS TODO"
+	PATCHES=( "${FILESDIR}/${P}-exo.patch"
+		"${FILESDIR}/${P}-Xi.patch" )
+}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild
index 292927bd988b..56a75ee01a53 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild,v 1.8 2009/10/24 16:38:06 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild,v 1.9 2009/10/27 16:46:42 ssuominen Exp $
 
 EAPI=2
 EAUTORECONF=yes
@@ -22,6 +22,7 @@ RDEPEND=">=dev-libs/glib-2.12:2
 	>=x11-libs/libX11-1
 	>=x11-libs/libXcursor-1.1
 	>=x11-libs/libXi-1
+	<x11-libs/libXi-1.3
 	>=x11-libs/libXrandr-1.1
 	>=x11-libs/libwnck-2.12
 	>=xfce-base/libxfce4util-4.6