summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-drivers/xf86-input-synaptics')
-rw-r--r--x11-drivers/xf86-input-synaptics/ChangeLog11
-rw-r--r--x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch14
-rw-r--r--x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0-r1.ebuild (renamed from x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0.ebuild)6
3 files changed, 29 insertions, 2 deletions
diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index fdbccd982e99..2e78be3aa0ac 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for x11-drivers/xf86-input-synaptics
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.3 2008/08/22 17:50:48 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.4 2008/08/23 21:28:55 chainsaw Exp $
+
+*xf86-input-synaptics-0.15.0-r1 (23 Aug 2008)
+
+ 23 Aug 2008; <chainsaw@gentoo.org> +files/synaptics-xorg-version.patch,
+ -xf86-input-synaptics-0.15.0.ebuild,
+ +xf86-input-synaptics-0.15.0-r1.ebuild:
+ Patch out a reference to XF86_CURRENT_VERSION which recently disappeared
+ in upstream X.Org git and block against the older synaptics ebuild. Both
+ thanks to papillon81 on IRC.
22 Aug 2008; <chainsaw@gentoo.org> files/11-x11-synaptics.fdi:
Have FDI file also trigger for appletouch devices, from upstream commit
diff --git a/x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch b/x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch
new file mode 100644
index 000000000000..6580385568d9
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch
@@ -0,0 +1,14 @@
+diff -uNr xf86-input-synaptics-0.15.0.ORIG/src/synaptics.c xf86-input-synaptics-0.15.0/src/synaptics.c
+--- xf86-input-synaptics-0.15.0.ORIG/src/synaptics.c 2008-08-23 22:19:55.000000000 +0100
++++ xf86-input-synaptics-0.15.0/src/synaptics.c 2008-08-23 22:21:16.000000000 +0100
+@@ -136,8 +136,8 @@
+ MODULEVENDORSTRING,
+ MODINFOSTRING1,
+ MODINFOSTRING2,
+- XF86_VERSION_CURRENT,
+- 1, 0, 0,
++ XORG_VERSION_CURRENT,
++ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
+ ABI_CLASS_XINPUT,
+ ABI_XINPUT_VERSION,
+ MOD_CLASS_XINPUT,
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0-r1.ebuild
index 187941c9a70f..2eddf6db6866 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0.ebuild,v 1.2 2008/08/22 17:17:11 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0-r1.ebuild,v 1.1 2008/08/23 21:28:55 chainsaw Exp $
inherit toolchain-funcs eutils linux-info x-modular
@@ -12,6 +12,7 @@ IUSE="hal"
RDEPEND="x11-libs/libXext
hal? ( sys-apps/hal )"
DEPEND="${RDEPEND}
+ !x11-drivers/synaptics
x11-base/xorg-server
x11-proto/inputproto
>=sys-apps/sed-4"
@@ -48,6 +49,9 @@ src_unpack() {
x-modular_unpack_source
# Fix to handle multiple screens through Xinerama properly. Bug #206614.
epatch "${FILESDIR}"/synaptics-fix-xinerama.patch
+
+ # Recent X.Org git versions stopped defining XF86-style version.
+ epatch "${FILESDIR}"/synaptics-xorg-version.patch
}
src_install() {