commit: 6b8d780919350819948cfbd3239aa7f5aa6c084a Author: Huang Rui <vowstar <AT> gmail <DOT> com> AuthorDate: Fri Jul 4 17:22:47 2025 +0000 Commit: Rui Huang <vowstar <AT> gmail <DOT> com> CommitDate: Fri Jul 4 17:22:47 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b8d7809
dev-libs/qschematic: add 3.0.2, drop 1.6.0 Signed-off-by: Huang Rui <vowstar <AT> gmail.com> dev-libs/qschematic/Manifest | 2 +- .../qschematic-1.6.0-gentoo-cmake-option.patch | 90 ---------------------- dev-libs/qschematic/metadata.xml | 3 - ...ematic-1.6.0.ebuild => qschematic-3.0.2.ebuild} | 25 ++---- 4 files changed, 7 insertions(+), 113 deletions(-) diff --git a/dev-libs/qschematic/Manifest b/dev-libs/qschematic/Manifest index 2afb627606..e83c15df22 100644 --- a/dev-libs/qschematic/Manifest +++ b/dev-libs/qschematic/Manifest @@ -1 +1 @@ -DIST qschematic-1.6.0.tar.gz 1511024 BLAKE2B ac2866773a27526d1449a56ed41177b9337599cd37aa7d2deda5b1136fb50ab82d1b3bf032d0e04c33e209b9eb6ad7a400aad46c61c8c4ec09473da49306cab2 SHA512 977a13e1bf1d3a517d6b75236667abc0ca463910e06d1c1f0071d134c95d95897582aafbc1fa560f69137e536e626d7025393b5a0f48b462380ded6a658dd0f4 +DIST qschematic-3.0.2.tar.gz 1561046 BLAKE2B a8bacdf67185adf18b41452d7cadbbc0e3cea7ffee11defcde7e7aeb0d4f06b57a59a0a304b3f26f6a805315934ec305f546cd13013577839bda9ac5aafa0c32 SHA512 6183dc5524f9bbffe27f8e4c2ad54a31aa91f935d9154c748a708094522c16149a75ce83e1852c15b586c3bff30d1a5f89ef9d36be8a678c5aa6c19c546697e6 diff --git a/dev-libs/qschematic/files/qschematic-1.6.0-gentoo-cmake-option.patch b/dev-libs/qschematic/files/qschematic-1.6.0-gentoo-cmake-option.patch deleted file mode 100644 index 0d59da0bd5..0000000000 --- a/dev-libs/qschematic/files/qschematic-1.6.0-gentoo-cmake-option.patch +++ /dev/null @@ -1,90 +0,0 @@ -From ea877503228e0ce17451354d47ac151cbd94dcf5 Mon Sep 17 00:00:00 2001 -From: Huang Rui <[email protected]> -Date: Sat, 17 Feb 2024 23:30:42 +0800 -Subject: [PATCH] fix gentoo build with qt6 - -Signed-off-by: Huang Rui <[email protected]> ---- - CMakeLists.txt | 1 + - demo/CMakeLists.txt | 2 ++ - qschematic/CMakeLists.txt | 6 +++--- - qschematic/external.cmake | 2 ++ - qschematic/qschematic-config.cmake.in | 3 +++ - 5 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 926b55adb8ee..7ece589f33f0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,6 +17,7 @@ option(QSCHEMATIC_BUILD_STATIC "Whether to build a static library" ON) - option(QSCHEMATIC_BUILD_SHARED "Whether to build a shared library" ${OPTION_BUILD_SHARED_DEFAULT}) - option(QSCHEMATIC_BUILD_DEMO "Whether to build the demo project" ON) - option(QSCHEMATIC_DEPENDENCY_GPDS_DOWNLOAD "Whether to pull the GPDS dependency via FetchContent" ON) -+option(QSCHEMATIC_BUILD_QT6 "Whether to build with QT6" ON) - - # User settings - set(QSCHEMATIC_DEPENDENCY_GPDS_TARGET "gpds::gpds-static" CACHE STRING "The CMake target of the GPDS library to use") -diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt -index b077470fe4d3..1f81a9c8ee8b 100644 ---- a/demo/CMakeLists.txt -+++ b/demo/CMakeLists.txt -@@ -2,11 +2,13 @@ - include(../qschematic/external.cmake) - - # Qt -+if (QSCHEMATIC_BUILD_QT6) - find_package( - Qt6 - COMPONENTS - PrintSupport - ) -+endif() - if (NOT Qt6_FOUND) - find_package( - Qt5 -diff --git a/qschematic/external.cmake b/qschematic/external.cmake -index 80aae6c29b94..7e57f0852ac5 100644 ---- a/qschematic/external.cmake -+++ b/qschematic/external.cmake -@@ -35,6 +35,7 @@ endif() - ######################################################################################################################## - - # Try to find Qt6 -+if (QSCHEMATIC_BUILD_QT6) - find_package( - Qt6 - COMPONENTS -@@ -42,6 +43,7 @@ find_package( - Gui - Widgets - ) -+endif() - - # If Qt6 was not found, fallback to Qt5 - # Require minimum Qt 5.15 for versionless cmake targets. This can be relaxed down to Qt 5.6 (?) if needed by modifying -diff --git a/qschematic/qschematic-config.cmake.in b/qschematic/qschematic-config.cmake.in -index 7452408bcd09..5b2a14a4c9c2 100644 ---- a/qschematic/qschematic-config.cmake.in -+++ b/qschematic/qschematic-config.cmake.in -@@ -6,8 +6,10 @@ include(CMakeFindDependencyMacro) - - set(QSCHEMATIC_DEPENDENCY_GPDS_DOWNLOAD @QSCHEMATIC_DEPENDENCY_GPDS_DOWNLOAD@) - set(QSCHEMATIC_DEPENDENCY_GPDS_MINIMUM_VERSION @QSCHEMATIC_DEPENDENCY_GPDS_MINIMUM_VERSION@) -+set(QSCHEMATIC_BUILD_QT6 @QSCHEMATIC_BUILD_QT6@) - - # Qt -+if (QSCHEMATIC_BUILD_QT6) - find_dependency( - Qt6 - COMPONENTS -@@ -15,6 +17,7 @@ find_dependency( - Gui - Widgets - ) -+endif() - if (NOT Qt6_FOUND) - find_dependency( - Qt5 5.15 --- -2.43.2 - diff --git a/dev-libs/qschematic/metadata.xml b/dev-libs/qschematic/metadata.xml index a7e051e5ce..9106f9a59b 100644 --- a/dev-libs/qschematic/metadata.xml +++ b/dev-libs/qschematic/metadata.xml @@ -5,9 +5,6 @@ <email>[email protected]</email> <name>Huang Rui</name> </maintainer> - <use> - <flag name="qt6">Build with Qt6 support</flag> - </use> <upstream> <remote-id type="github">simulton/QSchematic</remote-id> <bugs-to>https://github.com/simulton/QSchematic/issues</bugs-to> diff --git a/dev-libs/qschematic/qschematic-1.6.0.ebuild b/dev-libs/qschematic/qschematic-3.0.2.ebuild similarity index 68% rename from dev-libs/qschematic/qschematic-1.6.0.ebuild rename to dev-libs/qschematic/qschematic-3.0.2.ebuild index ae4904fca0..f63000553e 100644 --- a/dev-libs/qschematic/qschematic-1.6.0.ebuild +++ b/dev-libs/qschematic/qschematic-3.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,25 +20,17 @@ fi LICENSE="MIT" SLOT="0" -IUSE="examples qt6 static-libs test wayland +X" +IUSE="examples static-libs test wayland +X" RESTRICT="!test? ( test )" REQUIRED_USE=" examples? ( static-libs ) test? ( static-libs ) " RDEPEND=" - !qt6? ( - >=dev-qt/qtcore-5.15:5= - >=dev-qt/qtgui-5.15:5=[jpeg,png,wayland?,X?] - >=dev-qt/qtsvg-5.15:5 - >=dev-qt/qtwidgets-5.15:5[png,X?] - ) - qt6? ( - >=dev-qt/qtbase-6.5:6=[gui,wayland?,widgets,X?] - >=dev-qt/qtimageformats-6.5:6 - >=dev-qt/qtsvg-6.5:6 - ) - >=dev-libs/gpds-1.8.1[static-libs?] + >=dev-qt/qtbase-6.5:6=[gui,wayland?,widgets,X?] + >=dev-qt/qtimageformats-6.5:6 + >=dev-qt/qtsvg-6.5:6 + >=dev-libs/gpds-1.8.4[static-libs?] " DEPEND=" @@ -49,17 +41,12 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}/${PN}-1.6.0-gentoo-cmake-option.patch" -) - src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DQSCHEMATIC_DEPENDENCY_GPDS_TARGET:STRING="gpds::gpds-shared" -DQSCHEMATIC_DEPENDENCY_GPDS_DOWNLOAD=OFF -DQSCHEMATIC_BUILD_DEMO=$(usex examples) - -DQSCHEMATIC_BUILD_QT6=$(usex qt6) -DQSCHEMATIC_BUILD_STATIC=$(usex static-libs) -DQSCHEMATIC_BUILD_SHARED=ON )
