Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/spacenavd/files/, app-misc/spacenavd/
Date: Sat, 01 Feb 2020 20:52:54
Message-Id: 1580590309.d9784cad7cb1f6d63e15238c371b5aac9317a008.sping@gentoo
1 commit: d9784cad7cb1f6d63e15238c371b5aac9317a008
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 1 20:51:49 2020 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 1 20:51:49 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9784cad
7
8 app-misc/spacenavd: Fix USE=-X for 0.7
9
10 Closes: https://bugs.gentoo.org/707732
11 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
12 Package-Manager: Portage-2.3.84, Repoman-2.3.20
13
14 .../spacenavd/files/spacenavd-0.7-no-x11.patch | 24 ++++++++++++++++++++++
15 app-misc/spacenavd/spacenavd-0.7.ebuild | 1 +
16 2 files changed, 25 insertions(+)
17
18 diff --git a/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch b/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch
19 new file mode 100644
20 index 00000000000..8dbdb7df315
21 --- /dev/null
22 +++ b/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch
23 @@ -0,0 +1,24 @@
24 +From 3168b1dedf88c9026683ed43ea337814003d6802 Mon Sep 17 00:00:00 2001
25 +From: John Tsiombikas <nuclear@××××××××××.org>
26 +Date: Sat, 1 Feb 2020 22:08:43 +0200
27 +Subject: [PATCH] add a USE_X11 ifdef around the call to drop_xinput in
28 + src/dev.c to fix non-X11 build. This should fix github issue #19.
29 +
30 +---
31 + src/dev.c | 2 ++
32 + 1 file changed, 2 insertions(+)
33 +
34 +diff --git a/src/dev.c b/src/dev.c
35 +index 8b72932..2074895 100644
36 +--- a/src/dev.c
37 ++++ b/src/dev.c
38 +@@ -88,7 +88,9 @@ int init_devices(void)
39 + return -1;
40 + }
41 +
42 ++#ifdef USE_X11
43 + drop_xinput();
44 ++#endif
45 + return 0;
46 + }
47 +
48
49 diff --git a/app-misc/spacenavd/spacenavd-0.7.ebuild b/app-misc/spacenavd/spacenavd-0.7.ebuild
50 index 6a4e1d73add..4c5a57fdbfa 100644
51 --- a/app-misc/spacenavd/spacenavd-0.7.ebuild
52 +++ b/app-misc/spacenavd/spacenavd-0.7.ebuild
53 @@ -19,6 +19,7 @@ DEPEND="${RDEPEND}"
54
55 PATCHES=(
56 "${FILESDIR}"/${P}-gcc10.patch
57 + "${FILESDIR}"/${P}-no-x11.patch
58 )
59
60 pkg_setup() {