[gentoo-commits] repo/gentoo:master commit in: media-libs/quarter/, media-libs/quarter/files/

2024-02-23 Thread Maciej Mrozowski
commit: 3dc724c8a5caca3e0cb6d8367509e056572ab86b
Author: Maciej Mrozowski  gentoo  org>
AuthorDate: Sat Feb 24 04:43:16 2024 +
Commit: Maciej Mrozowski  gentoo  org>
CommitDate: Sat Feb 24 04:44:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dc724c8

media-libs/quarter: add 1.2.1

Signed-off-by: Maciej Mrozowski  gentoo.org>

 media-libs/quarter/Manifest|  1 +
 media-libs/quarter/files/quarter-1.2.1-cmake.patch | 25 +++
 media-libs/quarter/quarter-1.2.1.ebuild| 85 ++
 3 files changed, 111 insertions(+)

diff --git a/media-libs/quarter/Manifest b/media-libs/quarter/Manifest
index 6030874d214b..b9ee613d254d 100644
--- a/media-libs/quarter/Manifest
+++ b/media-libs/quarter/Manifest
@@ -1 +1,2 @@
 DIST quarter-1.1.0-src.tar.gz 724762 BLAKE2B 
8f1f0025706c4502ea178c09204e442b9c52148371863a5a49640ba751084cca9ca464398ee171729d85e8fc2f3fe3ea9d5f0492d114d810527601936abbd1e0
 SHA512 
2b2649132c66c709e3d5df2a99d621fb9cf61424c5376a5ca6a016ee5c7514841f8bbe390d1acc7b94688a86b56304ed12fb98840e11933162ac6ccb3f3d681c
+DIST quarter-1.2.1-src.tar.gz 737236 BLAKE2B 
91b332eb36ac1911449b923aabf6913a1901306c258f8e430f0c589774d1ad5991916863f14d6c3d35898a9756f7c68bd30287defe5deb04036f2dce4b8f135f
 SHA512 
454e99ae8f65c9d8e425aaabc02f218357db4e4447a481680f75301d4102864c77da58a48144f2a9211d4de0bd9962b394ad48a832e89674291b94778e5ff96d

diff --git a/media-libs/quarter/files/quarter-1.2.1-cmake.patch 
b/media-libs/quarter/files/quarter-1.2.1-cmake.patch
new file mode 100644
index ..761ba4fb5081
--- /dev/null
+++ b/media-libs/quarter/files/quarter-1.2.1-cmake.patch
@@ -0,0 +1,25 @@
+diff -ruN quarter/CMakeLists.txt my/CMakeLists.txt
+--- quarter/CMakeLists.txt 2024-02-05 00:29:17.0 +0100
 my/CMakeLists.txt  2024-02-24 05:23:51.451634039 +0100
+@@ -96,17 +96,17 @@
+ 
+ if(QUARTER_USE_QT6)
+   if(QUARTER_BUILD_PLUGIN)
+-find_package(Qt6 COMPONENTS Widgets UiTools OpenGL OpenGLWidgets Designer 
QUIET)
++find_package(Qt6 COMPONENTS Widgets UiTools OpenGL OpenGLWidgets Designer 
REQUIRED)
+   else()
+-find_package(Qt6 COMPONENTS Widgets UiTools OpenGL OpenGLWidgets QUIET)
++find_package(Qt6 COMPONENTS Widgets UiTools OpenGL OpenGLWidgets REQUIRED)
+   endif()
+ endif()
+ 
+ if(NOT Qt6_FOUND AND QUARTER_USE_QT5)
+   if(QUARTER_BUILD_PLUGIN)
+-find_package(Qt5 COMPONENTS Widgets UiTools OpenGL Designer QUIET)
++find_package(Qt5 COMPONENTS Widgets UiTools OpenGL Designer REQUIRED)
+   else()
+-find_package(Qt5 COMPONENTS Widgets UiTools OpenGL QUIET)
++find_package(Qt5 COMPONENTS Widgets UiTools OpenGL REQUIRED)
+   endif()
+ endif()
+ 

diff --git a/media-libs/quarter/quarter-1.2.1.ebuild 
b/media-libs/quarter/quarter-1.2.1.ebuild
new file mode 100644
index ..fed6f66a6843
--- /dev/null
+++ b/media-libs/quarter/quarter-1.2.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_P=${P/quarter/Quarter}
+
+HOMEPAGE="https://github.com/coin3d/coin/wiki;
+DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt"
+SRC_URI="https://github.com/coin3d/quarter/releases/download/v${PV}/${P}-src.tar.gz;
+S="${WORKDIR}/quarter"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug designer doc man qt6 qthelp"
+
+REQUIRED_USE="
+   man? ( doc )
+   qthelp? ( doc )
+"
+
+RDEPEND="
+   media-libs/coin
+   virtual/opengl
+   !qt6? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtopengl:5
+   designer? ( dev-qt/designer:5 )
+   )
+   qt6? (
+   dev-qt/qtbase:6[gui,opengl,widgets]
+   dev-qt/qttools:6[widgets]
+   designer? ( dev-qt/qttools:6[designer] )
+   )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+   virtual/pkgconfig
+   doc? (
+   app-text/doxygen[dot]
+   !qt6? (
+   qthelp? ( dev-qt/qthelp:5 )
+   )
+   qt6? (
+   qthelp? ( dev-qt/qttools:6[assistant] )
+   )
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.2.1-cmake.patch
+   "${FILESDIR}"/${PN}-1.1.0-find-qhelpgenerator-binary.patch
+)
+
+DOCS=(AUTHORS NEWS README.md)
+
+src_prepare() {
+   cmake_src_prepare
+   sed -e 's|/lib$|/lib@LIB_SUFFIX@|' \
+   -i Quarter.pc.cmake.in || die
+}
+
+src_configure() {
+   use debug && append-cppflags -DQUARTER_DEBUG=1
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+   -DQUARTER_BUILD_SHARED_LIBS=ON
+   -DQUARTER_BUILD_PLUGIN=$(usex designer)
+   -DQUARTER_BUILD_EXAMPLES=OFF
+   -DQUARTER_BUILD_DOCUMENTATION=$(usex doc)
+   

[gentoo-commits] repo/gentoo:master commit in: media-libs/quarter/, media-libs/quarter/files/

2022-04-05 Thread Andreas Sturmlechner
commit: c3cd4b1d2689bc9564a001819d659b4f4027ab26
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Apr  2 13:18:12 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr  5 18:46:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3cd4b1d

media-libs/quarter: find qhelpgenerator without qtchooser

Update to EAPI 8
Fix pkgconfig file

Closes: https://bugs.gentoo.org/836340
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24866
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../quarter-1.1.0-find-qhelpgenerator-binary.patch | 22 +++
 media-libs/quarter/metadata.xml|  4 ++
 media-libs/quarter/quarter-1.1.0-r1.ebuild | 71 ++
 3 files changed, 97 insertions(+)

diff --git 
a/media-libs/quarter/files/quarter-1.1.0-find-qhelpgenerator-binary.patch 
b/media-libs/quarter/files/quarter-1.1.0-find-qhelpgenerator-binary.patch
new file mode 100644
index ..6fe804551e72
--- /dev/null
+++ b/media-libs/quarter/files/quarter-1.1.0-find-qhelpgenerator-binary.patch
@@ -0,0 +1,22 @@
+From 04994984239e18ea68af04734c4c8a1324bc0ac6 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sat, 2 Apr 2022 15:00:42 +0200
+Subject: [PATCH] find qhelpgenerator binary
+
+Signed-off-by: Bernd Waibel 
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -204,7 +204,9 @@ if(QUARTER_BUILD_DOCUMENTATION)
+ endif()
+   endif()
+   if(QUARTER_BUILD_DOC_QTHELP)
+-find_program(QHG_LOCATION NAMES qhelpgenerator qhelpgenerator-qt5 DOC "Qt 
qhelpgenerator")
++get_target_property(qt_qmake_location Qt5::qmake LOCATION)
++get_filename_component(qt_bin_dir "${qt_qmake_location}" PATH)
++find_program(QHG_LOCATION NAMES qhelpgenerator qhelpgenerator-qt5 DOC "Qt 
qhelpgenerator" HINTS "${qt_bin_dir}")
+ if(NOT QHG_LOCATION)
+   message(FATAL_ERROR "Missing program Qt qhelpgenerator")
+ else()
+-- 
+2.35.1
+

diff --git a/media-libs/quarter/metadata.xml b/media-libs/quarter/metadata.xml
index 9ef4a04c87ad..7ff09935d569 100644
--- a/media-libs/quarter/metadata.xml
+++ b/media-libs/quarter/metadata.xml
@@ -5,6 +5,10 @@
 reave...@gentoo.org
 Feel free to maintain/fix
   
+  
+waebbl-gen...@posteo.net
+Bernd Waibel
+  
   
   Quarter is a light-weight glue library that provides seamless
   integration between Systems in Motions's Coin high-level 3D

diff --git a/media-libs/quarter/quarter-1.1.0-r1.ebuild 
b/media-libs/quarter/quarter-1.1.0-r1.ebuild
new file mode 100644
index ..9ccb1a4a1aac
--- /dev/null
+++ b/media-libs/quarter/quarter-1.1.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_P=${P/quarter/Quarter}
+
+HOMEPAGE="https://github.com/coin3d/coin/wiki;
+DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt"
+SRC_URI="https://github.com/coin3d/quarter/releases/download/${MY_P}/${P}-src.tar.gz;
+S="${WORKDIR}/quarter"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug designer doc man qthelp"
+
+REQUIRED_USE="
+   man? ( doc )
+   qthelp? ( doc )
+"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtopengl:5
+   dev-qt/qtwidgets:5
+   media-libs/coin
+   virtual/opengl
+   designer? ( dev-qt/designer:5 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen[dot]
+   qthelp? ( dev-qt/qthelp:5 )
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.1.0-cmake.patch
+   "${FILESDIR}"/${PN}-1.1.0-find-qhelpgenerator-binary.patch
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README)
+
+src_prepare() {
+   cmake_src_prepare
+   sed -e 's|/lib$|/lib@LIB_SUFFIX@|' \
+   -i Quarter.pc.cmake.in || die
+}
+
+src_configure() {
+   use debug && append-cppflags -DQUARTER_DEBUG=1
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+   -DQUARTER_BUILD_SHARED_LIBS=ON
+   -DQUARTER_BUILD_PLUGIN=$(usex designer)
+   -DQUARTER_BUILD_EXAMPLES=OFF
+   -DQUARTER_BUILD_DOCUMENTATION=$(usex doc)
+   -DQUARTER_BUILD_INTERNAL_DOCUMENTATION=OFF
+   -DQUARTER_BUILD_DOC_MAN=$(usex man)
+   -DQUARTER_BUILD_DOC_QTHELP=$(usex qthelp)
+   -DQUARTER_BUILD_DOC_CHM=OFF
+   -DQUARTER_USE_QT5=ON
+   )
+   cmake_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/quarter/, media-libs/quarter/files/

2020-10-06 Thread Maciej Mrozowski
commit: 8499034b0d9d25f019c826ee368d74244279ec1a
Author: Maciej Mrozowski  gentoo  org>
AuthorDate: Tue Oct  6 18:20:12 2020 +
Commit: Maciej Mrozowski  gentoo  org>
CommitDate: Tue Oct  6 18:21:15 2020 +
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  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 000..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.0 +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