From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5DBC513829B for ; Sun, 29 May 2016 20:26:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8709F234008; Sun, 29 May 2016 20:26:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 16AEB234008 for ; Sun, 29 May 2016 20:26:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D76923408F9 for ; Sun, 29 May 2016 20:26:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF026180 for ; Sun, 29 May 2016 20:26:30 +0000 (UTC) From: "Chí-Thanh Christopher Nguyễn" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chí-Thanh Christopher Nguyễn" Message-ID: <1464553596.3ff230531a340ccd8b3c64ccaa8510645dcf6943.chithanh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-input-aiptek/files/, x11-drivers/xf86-input-aiptek/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/xf86-input-aiptek/files/xf86-input-aiptek-1.4.1-xorg-server-1.18.patch x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1-r1.ebuild X-VCS-Directories: x11-drivers/xf86-input-aiptek/files/ x11-drivers/xf86-input-aiptek/ X-VCS-Committer: chithanh X-VCS-Committer-Name: Chí-Thanh Christopher Nguyễn X-VCS-Revision: 3ff230531a340ccd8b3c64ccaa8510645dcf6943 X-VCS-Branch: master Date: Sun, 29 May 2016 20:26:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 703c88f7-617d-4417-ab95-35e9a3a2e75b X-Archives-Hash: 4700bdee0de24828c131b7b4b3686325 commit: 3ff230531a340ccd8b3c64ccaa8510645dcf6943 Author: Chí-Thanh Christopher Nguyễn gentoo org> AuthorDate: Sun May 29 20:26:36 2016 +0000 Commit: Chí-Thanh Christopher Nguyễn gentoo 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 +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 + +Signed-off-by: Julien Cristau + +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 +)