Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/pencil/, media-gfx/pencil/files/
Date: Mon, 12 Oct 2020 12:38:57
Message-Id: 1602506323.52cd4be180d6752ead4e842aaa89356266a0c6a0.bkohler@gentoo
1 commit: 52cd4be180d6752ead4e842aaa89356266a0c6a0
2 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 12 12:38:08 2020 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 12 12:38:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52cd4be1
7
8 media-gfx/pencil: add upstream patch to skip building tests
9
10 Closes: https://bugs.gentoo.org/747877
11
12 Package-Manager: Portage-3.0.8, Repoman-3.0.1
13 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
14
15 .../files/pencil-0.6.5-skip-building-tests.patch | 53 ++++++++++++++++++++++
16 media-gfx/pencil/pencil-0.6.5.ebuild | 3 +-
17 2 files changed, 55 insertions(+), 1 deletion(-)
18
19 diff --git a/media-gfx/pencil/files/pencil-0.6.5-skip-building-tests.patch b/media-gfx/pencil/files/pencil-0.6.5-skip-building-tests.patch
20 new file mode 100644
21 index 00000000000..dd7c80f2893
22 --- /dev/null
23 +++ b/media-gfx/pencil/files/pencil-0.6.5-skip-building-tests.patch
24 @@ -0,0 +1,53 @@
25 +From f949445894fa6da9eaa9f26f54bac59888822011 Mon Sep 17 00:00:00 2001
26 +From: Matt Chang <chchwy@×××××.com>
27 +Date: Wed, 5 Aug 2020 15:06:29 +1000
28 +Subject: [PATCH] qmake CONFIG+=NO_TESTS to skip building tests
29 +
30 +---
31 + pencil2d.pro | 24 ++++++++++++------------
32 + 1 file changed, 12 insertions(+), 12 deletions(-)
33 +
34 +diff --git a/pencil2d.pro b/pencil2d.pro
35 +index f9fbca5a2..e1bc4a179 100644
36 +--- a/pencil2d.pro
37 ++++ b/pencil2d.pro
38 +@@ -4,22 +4,23 @@
39 +
40 + TEMPLATE = subdirs
41 +
42 +-SUBDIRS = \ # sub-project names
43 +- core_lib \
44 +- app \
45 +- tests
46 +-
47 + # build the project sequentially as listed in SUBDIRS !
48 + CONFIG += ordered
49 +
50 +-# where to find the sub projects - give the folders
51 ++SUBDIRS += core_lib
52 + core_lib.subdir = core_lib
53 +-app.subdir = app
54 +-tests.subdir = tests
55 +
56 +-# what subproject depends on others
57 +-app.depends = core_lib
58 +-tests.depends = core_lib
59 ++SUBDIRS += app
60 ++app.subdir = app
61 ++app.depends = core_lib
62 ++
63 ++SUBDIRS += tests
64 ++tests.subdir = tests
65 ++tests.depends = core_lib
66 ++
67 ++NO_TESTS {
68 ++ SUBDIRS -= tests
69 ++}
70 +
71 + TRANSLATIONS += translations/pencil.ts \
72 + translations/pencil_ar.ts \
73 +@@ -48,4 +49,3 @@ TRANSLATIONS += translations/pencil.ts \
74 + translations/pencil_zh_CN.ts \
75 + translations/pencil_zh_TW.ts
76 +
77 +-macx: LIBS += -framework AppKit
78
79 diff --git a/media-gfx/pencil/pencil-0.6.5.ebuild b/media-gfx/pencil/pencil-0.6.5.ebuild
80 index ecd137f12e3..e4872b8d9df 100644
81 --- a/media-gfx/pencil/pencil-0.6.5.ebuild
82 +++ b/media-gfx/pencil/pencil-0.6.5.ebuild
83 @@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
84 "
85
86 S="${WORKDIR}/${P/_/-}"
87 +PATCHES="${FILESDIR}/${P}-skip-building-tests.patch"
88
89 src_prepare() {
90 default
91 @@ -38,7 +39,7 @@ src_prepare() {
92 }
93
94 src_configure() {
95 - eqmake5 PREFIX=/usr
96 + eqmake5 PREFIX=/usr $(usex test "" "CONFIG+=NO_TESTS")
97 }
98
99 src_install() {