Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/spnavcfg/
Date: Wed, 06 Apr 2022 20:45:35
Message-Id: 1649277827.bd348c2ca05bc5201e5fc40e5b358ab04e522e31.sping@gentoo
1 commit: bd348c2ca05bc5201e5fc40e5b358ab04e522e31
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 6 20:41:52 2022 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 6 20:43:47 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd348c2c
7
8 x11-misc/spnavcfg: Make 1.0 compile without qtchooser installed
9
10 Closes: https://bugs.gentoo.org/836948
11 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13
14 x11-misc/spnavcfg/spnavcfg-1.0.ebuild | 10 ++++++++--
15 1 file changed, 8 insertions(+), 2 deletions(-)
16
17 diff --git a/x11-misc/spnavcfg/spnavcfg-1.0.ebuild b/x11-misc/spnavcfg/spnavcfg-1.0.ebuild
18 index f2b2fbed5906..d49c3125f96a 100644
19 --- a/x11-misc/spnavcfg/spnavcfg-1.0.ebuild
20 +++ b/x11-misc/spnavcfg/spnavcfg-1.0.ebuild
21 @@ -3,7 +3,7 @@
22
23 EAPI=7
24
25 -inherit toolchain-funcs
26 +inherit toolchain-funcs qmake-utils
27
28 DESCRIPTION="GTK-based GUI to configure a space navigator device"
29 HOMEPAGE="http://spacenav.sourceforge.net/"
30 @@ -29,5 +29,11 @@ src_configure() {
31 }
32
33 src_compile() {
34 - emake CC="$(tc-getCC)"
35 + local args=(
36 + CC="$(tc-getCC)"
37 + MOC="$(qt5_get_bindir)/moc"
38 + RCC="$(qt5_get_bindir)/rcc"
39 + UIC="$(qt5_get_bindir)/uic"
40 + )
41 + emake "${args[@]}"
42 }