[gentoo-commits] repo/gentoo:master commit in: media-libs/quarter/files/, media-libs/quarter/
commit: c8ef34ddd37770a4f8fc310bdef642fc0a6e1e64
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Mar 25 11:40:37 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Mar 25 12:38:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8ef34dd
media-libs/quarter: drop 1.1.0-r1
Closes: https://bugs.gentoo.org/926343
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/quarter/Manifest| 1 -
media-libs/quarter/files/quarter-1.1.0-cmake.patch | 16 -
media-libs/quarter/quarter-1.1.0-r1.ebuild | 71 --
3 files changed, 88 deletions(-)
diff --git a/media-libs/quarter/Manifest b/media-libs/quarter/Manifest
index b9ee613d254d..ca729b80d38e 100644
--- a/media-libs/quarter/Manifest
+++ b/media-libs/quarter/Manifest
@@ -1,2 +1 @@
-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.1.0-cmake.patch
b/media-libs/quarter/files/quarter-1.1.0-cmake.patch
deleted file mode 100644
index 73c6473354a0..
--- a/media-libs/quarter/files/quarter-1.1.0-cmake.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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-r1.ebuild
b/media-libs/quarter/quarter-1.1.0-r1.ebuild
deleted file mode 100644
index 19d83834e7e1..
--- a/media-libs/quarter/quarter-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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/${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-text/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/files/
commit: ee19808bd15dec8d35f4f3cdd45fb9b4fb7359af
Author: Maciej Mrozowski gentoo org>
AuthorDate: Thu Feb 29 01:50:36 2024 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Thu Feb 29 01:53:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee19808b
media-libs/quarter: patch 1.2.1 to not require Qt5UiTools, fixes #925352
Signed-off-by: Maciej Mrozowski gentoo.org>
Closes: https://bugs.gentoo.org/925352
media-libs/quarter/files/quarter-1.2.1-cmake.patch | 23 +++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/media-libs/quarter/files/quarter-1.2.1-cmake.patch
b/media-libs/quarter/files/quarter-1.2.1-cmake.patch
index 761ba4fb5081..88770dc384d8 100644
--- a/media-libs/quarter/files/quarter-1.2.1-cmake.patch
+++ b/media-libs/quarter/files/quarter-1.2.1-cmake.patch
@@ -1,6 +1,6 @@
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
my/CMakeLists.txt 2024-02-29 02:46:06.768299838 +0100
@@ -96,17 +96,17 @@
if(QUARTER_USE_QT6)
@@ -9,7 +9,7 @@ diff -ruN quarter/CMakeLists.txt my/CMakeLists.txt
+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)
++find_package(Qt6 COMPONENTS Widgets OpenGL OpenGLWidgets REQUIRED)
endif()
endif()
@@ -19,7 +19,24 @@ diff -ruN quarter/CMakeLists.txt my/CMakeLists.txt
+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)
++find_package(Qt5 COMPONENTS Widgets OpenGL REQUIRED)
endif()
endif()
+@@ -116,14 +116,14 @@
+ endif()
+
+ if(Qt6_FOUND)
+- set(QUARTER_QT_TARGETS Qt6::Widgets Qt6::UiTools Qt6::OpenGL
Qt6::OpenGLWidgets)
++ set(QUARTER_QT_TARGETS Qt6::Widgets Qt6::OpenGL Qt6::OpenGLWidgets)
+ set(QUARTER_PLUGIN_QT_TARGETS Qt6::Designer)
+ string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR
"${Qt6Core_VERSION_STRING}")
+ string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR
"${Qt6Core_VERSION_STRING}")
+ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH
"${Qt6Core_VERSION_STRING}")
+ set(QUARTER_PKG_DEPS "${QUARTER_PKG_DEPS} Qt6Widgets Qt6UiTools Qt6OpenGL
Qt6OpenGLWidgets Qt6Designer")
+ elseif(Qt5_FOUND)
+- set(QUARTER_QT_TARGETS Qt5::Widgets Qt5::UiTools Qt5::OpenGL)
++ set(QUARTER_QT_TARGETS Qt5::Widgets Qt5::OpenGL)
+ set(QUARTER_PLUGIN_QT_TARGETS Qt5::Designer)
+ string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR
"${Qt5Core_VERSION_STRING}")
+ string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR
"${Qt5Core_VERSION_STRING}")
