Gentoo Archives: gentoo-commits

From: Maciej Mrozowski <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/quarter/, media-libs/quarter/files/
Date: Tue, 06 Oct 2020 18:21:55
Message-Id: 1602008475.8499034b0d9d25f019c826ee368d74244279ec1a.reavertm@gentoo
1 commit: 8499034b0d9d25f019c826ee368d74244279ec1a
2 Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 6 18:20:12 2020 +0000
4 Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 6 18:21:15 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8499034b
7
8 media-libs/quarter: fix compilation with USE=-designer
9
10 Closes: https://bugs.gentoo.org/746869
11 Package-Manager: Portage-3.0.4, Repoman-3.0.1
12 Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
13
14 media-libs/quarter/files/quarter-1.1.0-cmake.patch | 16 ++++++++++++++++
15 media-libs/quarter/quarter-1.1.0.ebuild | 6 +++++-
16 2 files changed, 21 insertions(+), 1 deletion(-)
17
18 diff --git a/media-libs/quarter/files/quarter-1.1.0-cmake.patch b/media-libs/quarter/files/quarter-1.1.0-cmake.patch
19 new file mode 100644
20 index 00000000000..73c6473354a
21 --- /dev/null
22 +++ b/media-libs/quarter/files/quarter-1.1.0-cmake.patch
23 @@ -0,0 +1,16 @@
24 +diff -ruN quarter/CMakeLists.txt quarter-my/CMakeLists.txt
25 +--- quarter/CMakeLists.txt 2019-12-25 19:44:38.000000000 +0100
26 ++++ quarter-my/CMakeLists.txt 2020-10-06 20:16:47.094206772 +0200
27 +@@ -90,7 +90,11 @@
28 + find_package(Spacenav)
29 +
30 + if(QUARTER_USE_QT5)
31 +- find_package(Qt5 COMPONENTS Widgets UiTools OpenGL Designer REQUIRED)
32 ++ if(QUARTER_BUILD_PLUGIN)
33 ++ find_package(Qt5 COMPONENTS Widgets UiTools OpenGL Designer REQUIRED)
34 ++ else()
35 ++ find_package(Qt5 COMPONENTS Widgets OpenGL REQUIRED)
36 ++ endif()
37 + endif()
38 +
39 + if(Qt5_FOUND)
40
41 diff --git a/media-libs/quarter/quarter-1.1.0.ebuild b/media-libs/quarter/quarter-1.1.0.ebuild
42 index d52e90e73ea..71fc4f42430 100644
43 --- a/media-libs/quarter/quarter-1.1.0.ebuild
44 +++ b/media-libs/quarter/quarter-1.1.0.ebuild
45 @@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
46
47 S="${WORKDIR}/quarter"
48
49 +PATCHES=(
50 + "${FILESDIR}"/${PN}-1.1.0-cmake.patch
51 +)
52 +
53 DOCS=(AUTHORS ChangeLog NEWS README)
54
55 src_configure() {
56 @@ -47,7 +51,7 @@ src_configure() {
57 local mycmakeargs=(
58 -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
59 -DQUARTER_BUILD_SHARED_LIBS=ON
60 - -DQUARTER_BUILD_PLUGIN=ON
61 + -DQUARTER_BUILD_PLUGIN=$(usex designer)
62 -DQUARTER_BUILD_EXAMPLES=OFF
63 -DQUARTER_BUILD_DOCUMENTATION=$(usex doc)
64 -DQUARTER_BUILD_INTERNAL_DOCUMENTATION=OFF