commit: 3ff230531a340ccd8b3c64ccaa8510645dcf6943 Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> AuthorDate: Sun May 29 20:26:36 2016 +0000 Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> CommitDate: Sun May 29 20:26:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff23053
x11-drivers/xf86-input-aiptek: fix building against x11-base/xorg-server-1.18 Bug: https://bugs.gentoo.org/show_bug.cgi?id=572696 Package-Manager: portage-2.2.28 .../xf86-input-aiptek-1.4.1-xorg-server-1.18.patch | 44 ++++++++++++++++++++++ .../xf86-input-aiptek-1.4.1-r1.ebuild | 18 +++++++++ 2 files changed, 62 insertions(+) diff --git a/x11-drivers/xf86-input-aiptek/files/xf86-input-aiptek-1.4.1-xorg-server-1.18.patch b/x11-drivers/xf86-input-aiptek/files/xf86-input-aiptek-1.4.1-xorg-server-1.18.patch new file mode 100644 index 0000000..d5240c3 --- /dev/null +++ b/x11-drivers/xf86-input-aiptek/files/xf86-input-aiptek-1.4.1-xorg-server-1.18.patch @@ -0,0 +1,44 @@ +From f075deff61d3092d6754e48a3b63d40647888a35 Mon Sep 17 00:00:00 2001 +From: Tobias Schlemmer <keinst...@users.sf.net> +Date: Thu, 10 Mar 2016 19:13:41 +0100 +Subject: Fix build against current input ABI (xserver 1.18) + +xf86PostKeyEvent dropped the valuator arguments it wasn't using. + +Debian bug#813359 <https://bugs.debian.org/813359> + +Signed-off-by: Julien Cristau <jcris...@debian.org> + +diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c +index 7368602..78532e4 100644 +--- a/src/xf86Aiptek.c ++++ b/src/xf86Aiptek.c +@@ -293,13 +293,19 @@ xf86AiptekSendEvents(InputInfoPtr pInfo, int r_z) + */ + + /* Keyboard 'make' (press) event */ +- xf86PostKeyEvent(pInfo->dev, i+8, TRUE, +- bAbsolute, 0, 5, +- x, y, common->currentValues.button, xTilt, yTilt); ++ xf86PostKeyEvent(pInfo->dev, i+8, TRUE ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 22 ++ , bAbsolute, 0, 5, ++ x, y, common->currentValues.button, xTilt, yTilt ++#endif ++ ); + /* Keyboard 'break' (depress) event */ +- xf86PostKeyEvent(pInfo->dev, i+8, FALSE, +- bAbsolute, 0, 5, +- x, y, common->currentValues.button, xTilt, yTilt); ++ xf86PostKeyEvent(pInfo->dev, i+8, FALSE ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 22 ++ , bAbsolute, 0, 5, ++ x, y, common->currentValues.button, xTilt, yTilt ++#endif ++ ); + break; + } + } +-- +cgit v0.10.2 + diff --git a/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1-r1.ebuild b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1-r1.ebuild new file mode 100644 index 0000000..4a72b3f --- /dev/null +++ b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1-r1.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit xorg-2 + +DESCRIPTION="Aiptek USB Digital Tablet Input Driver for Linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-xorg-server-1.18.patch +)
