commit:     8499034b0d9d25f019c826ee368d74244279ec1a
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 18:20:12 2020 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 18:21:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8499034b

media-libs/quarter: fix compilation with USE=-designer

Closes: https://bugs.gentoo.org/746869
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>

 media-libs/quarter/files/quarter-1.1.0-cmake.patch | 16 ++++++++++++++++
 media-libs/quarter/quarter-1.1.0.ebuild            |  6 +++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/media-libs/quarter/files/quarter-1.1.0-cmake.patch 
b/media-libs/quarter/files/quarter-1.1.0-cmake.patch
new file mode 100644
index 00000000000..73c6473354a
--- /dev/null
+++ b/media-libs/quarter/files/quarter-1.1.0-cmake.patch
@@ -0,0 +1,16 @@
+diff -ruN quarter/CMakeLists.txt quarter-my/CMakeLists.txt
+--- quarter/CMakeLists.txt     2019-12-25 19:44:38.000000000 +0100
++++ quarter-my/CMakeLists.txt  2020-10-06 20:16:47.094206772 +0200
+@@ -90,7 +90,11 @@
+ find_package(Spacenav)
+ 
+ if(QUARTER_USE_QT5)
+-  find_package(Qt5 COMPONENTS Widgets UiTools OpenGL Designer REQUIRED)
++  if(QUARTER_BUILD_PLUGIN)
++    find_package(Qt5 COMPONENTS Widgets UiTools OpenGL Designer REQUIRED)
++  else()
++    find_package(Qt5 COMPONENTS Widgets OpenGL REQUIRED)
++  endif()
+ endif()
+ 
+ if(Qt5_FOUND)

diff --git a/media-libs/quarter/quarter-1.1.0.ebuild 
b/media-libs/quarter/quarter-1.1.0.ebuild
index d52e90e73ea..71fc4f42430 100644
--- a/media-libs/quarter/quarter-1.1.0.ebuild
+++ b/media-libs/quarter/quarter-1.1.0.ebuild
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/quarter"
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.1.0-cmake.patch
+)
+
 DOCS=(AUTHORS ChangeLog NEWS README)
 
 src_configure() {
@@ -47,7 +51,7 @@ src_configure() {
        local mycmakeargs=(
                -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
                -DQUARTER_BUILD_SHARED_LIBS=ON
-               -DQUARTER_BUILD_PLUGIN=ON
+               -DQUARTER_BUILD_PLUGIN=$(usex designer)
                -DQUARTER_BUILD_EXAMPLES=OFF
                -DQUARTER_BUILD_DOCUMENTATION=$(usex doc)
                -DQUARTER_BUILD_INTERNAL_DOCUMENTATION=OFF

Reply via email to