Gentoo Archives: gentoo-commits

From: "Chí-Thanh Christopher Nguyễn" <chithanh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-input-aiptek/files/, x11-drivers/xf86-input-aiptek/
Date: Sun, 29 May 2016 20:26:36
Message-Id: 1464553596.3ff230531a340ccd8b3c64ccaa8510645dcf6943.chithanh@gentoo
1 commit: 3ff230531a340ccd8b3c64ccaa8510645dcf6943
2 Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 29 20:26:36 2016 +0000
4 Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
5 CommitDate: Sun May 29 20:26:36 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff23053
7
8 x11-drivers/xf86-input-aiptek: fix building against x11-base/xorg-server-1.18
9
10 Bug: https://bugs.gentoo.org/show_bug.cgi?id=572696
11
12 Package-Manager: portage-2.2.28
13
14 .../xf86-input-aiptek-1.4.1-xorg-server-1.18.patch | 44 ++++++++++++++++++++++
15 .../xf86-input-aiptek-1.4.1-r1.ebuild | 18 +++++++++
16 2 files changed, 62 insertions(+)
17
18 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
19 new file mode 100644
20 index 0000000..d5240c3
21 --- /dev/null
22 +++ b/x11-drivers/xf86-input-aiptek/files/xf86-input-aiptek-1.4.1-xorg-server-1.18.patch
23 @@ -0,0 +1,44 @@
24 +From f075deff61d3092d6754e48a3b63d40647888a35 Mon Sep 17 00:00:00 2001
25 +From: Tobias Schlemmer <keinstein@××××××××.net>
26 +Date: Thu, 10 Mar 2016 19:13:41 +0100
27 +Subject: Fix build against current input ABI (xserver 1.18)
28 +
29 +xf86PostKeyEvent dropped the valuator arguments it wasn't using.
30 +
31 +Debian bug#813359 <https://bugs.debian.org/813359>
32 +
33 +Signed-off-by: Julien Cristau <jcristau@××××××.org>
34 +
35 +diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
36 +index 7368602..78532e4 100644
37 +--- a/src/xf86Aiptek.c
38 ++++ b/src/xf86Aiptek.c
39 +@@ -293,13 +293,19 @@ xf86AiptekSendEvents(InputInfoPtr pInfo, int r_z)
40 + */
41 +
42 + /* Keyboard 'make' (press) event */
43 +- xf86PostKeyEvent(pInfo->dev, i+8, TRUE,
44 +- bAbsolute, 0, 5,
45 +- x, y, common->currentValues.button, xTilt, yTilt);
46 ++ xf86PostKeyEvent(pInfo->dev, i+8, TRUE
47 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 22
48 ++ , bAbsolute, 0, 5,
49 ++ x, y, common->currentValues.button, xTilt, yTilt
50 ++#endif
51 ++ );
52 + /* Keyboard 'break' (depress) event */
53 +- xf86PostKeyEvent(pInfo->dev, i+8, FALSE,
54 +- bAbsolute, 0, 5,
55 +- x, y, common->currentValues.button, xTilt, yTilt);
56 ++ xf86PostKeyEvent(pInfo->dev, i+8, FALSE
57 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 22
58 ++ , bAbsolute, 0, 5,
59 ++ x, y, common->currentValues.button, xTilt, yTilt
60 ++#endif
61 ++ );
62 + break;
63 + }
64 + }
65 +--
66 +cgit v0.10.2
67 +
68
69 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
70 new file mode 100644
71 index 0000000..4a72b3f
72 --- /dev/null
73 +++ b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1-r1.ebuild
74 @@ -0,0 +1,18 @@
75 +# Copyright 1999-2016 Gentoo Foundation
76 +# Distributed under the terms of the GNU General Public License v2
77 +# $Id$
78 +
79 +EAPI=5
80 +
81 +inherit xorg-2
82 +
83 +DESCRIPTION="Aiptek USB Digital Tablet Input Driver for Linux"
84 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
85 +IUSE=""
86 +
87 +RDEPEND=""
88 +DEPEND="${RDEPEND}"
89 +
90 +PATCHES=(
91 + "${FILESDIR}"/${P}-xorg-server-1.18.patch
92 +)