Upstream patch for libXi >= 1.3.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

5 files changed, 168 insertions, 4 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/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