From 485a29faa397ba206d18523268b54311b1063fe2 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 19 Feb 2024 10:40:01 +0800 Subject: [PATCH 1/4] dev-libs/qschematic: add 1.6.0 Signed-off-by: Huang Rui --- dev-libs/qschematic/Manifest | 1 + ...qschematic-1.6.0-gentoo-cmake-option.patch | 90 +++++++++++++++++++ dev-libs/qschematic/qschematic-1.6.0.ebuild | 68 ++++++++++++++ 3 files changed, 159 insertions(+) create mode 100644 dev-libs/qschematic/files/qschematic-1.6.0-gentoo-cmake-option.patch create mode 100644 dev-libs/qschematic/qschematic-1.6.0.ebuild diff --git a/dev-libs/qschematic/Manifest b/dev-libs/qschematic/Manifest index a69882c1f9..36408d6a5f 100644 --- a/dev-libs/qschematic/Manifest +++ b/dev-libs/qschematic/Manifest @@ -1 +1,2 @@ DIST qschematic-1.5.1.tar.gz 1510872 BLAKE2B 4ecf1200f4aa8052aa1ded75f6247b2db4db8a85383b04bc4c7cec495d5d2b3d4b93d96c6fcbdf370d5470be6e7e00c032ba26d0e9d5b1ac491c78286d25b55c SHA512 4b748397e83369764f3f1df49701ffe3dccb18713c0e2f55c1110b31c294f0205da10c06fd56ca0011e3f8f5a0a9970149ed84a586d6edd4febe18170d89723d +DIST qschematic-1.6.0.tar.gz 1511024 BLAKE2B ac2866773a27526d1449a56ed41177b9337599cd37aa7d2deda5b1136fb50ab82d1b3bf032d0e04c33e209b9eb6ad7a400aad46c61c8c4ec09473da49306cab2 SHA512 977a13e1bf1d3a517d6b75236667abc0ca463910e06d1c1f0071d134c95d95897582aafbc1fa560f69137e536e626d7025393b5a0f48b462380ded6a658dd0f4 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 new file mode 100644 index 0000000000..0d59da0bd5 --- /dev/null +++ b/dev-libs/qschematic/files/qschematic-1.6.0-gentoo-cmake-option.patch @@ -0,0 +1,90 @@ +From ea877503228e0ce17451354d47ac151cbd94dcf5 Mon Sep 17 00:00:00 2001 +From: Huang Rui +Date: Sat, 17 Feb 2024 23:30:42 +0800 +Subject: [PATCH] fix gentoo build with qt6 + +Signed-off-by: Huang Rui +--- + 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/qschematic-1.6.0.ebuild b/dev-libs/qschematic/qschematic-1.6.0.ebuild new file mode 100644 index 0000000000..ae4904fca0 --- /dev/null +++ b/dev-libs/qschematic/qschematic-1.6.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +MY_PN="QSchematic" + +inherit cmake + +DESCRIPTION="Library for creating flowcharts and engineering diagrams" +HOMEPAGE="https://github.com/simulton/QSchematic" + +if [[ "${PV}" == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/simulton/QSchematic/${MY_PN}.git" +else + SRC_URI="https://github.com/simulton/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="examples qt6 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?] +" + +DEPEND=" + ${RDEPEND} +" + +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 + ) + + cmake_src_configure +} From 084e10932ad5b4df942804531e8d379d22823d1e Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 19 Feb 2024 10:40:27 +0800 Subject: [PATCH 2/4] dev-libs/gpds: drop 1.8.3 Signed-off-by: Huang Rui --- dev-libs/gpds/Manifest | 1 - dev-libs/gpds/gpds-1.8.3.ebuild | 47 --------------------------------- 2 files changed, 48 deletions(-) delete mode 100644 dev-libs/gpds/gpds-1.8.3.ebuild diff --git a/dev-libs/gpds/Manifest b/dev-libs/gpds/Manifest index 7139fed168..ed9a6882fa 100644 --- a/dev-libs/gpds/Manifest +++ b/dev-libs/gpds/Manifest @@ -1,2 +1 @@ -DIST gpds-1.8.3.tar.gz 875674 BLAKE2B 18f4a8633960e68529255d2625d03bb652c30dc239969f97e9f1ac99031c104f3706bb55c7c755abb304889e9e6747ff76a16c4233f092f9175550280f80a6b9 SHA512 a981c2d136bd4e5cd81ddc457252fa8e87353f63bc8e00d42a8c4a9e6daa8e6b9fd5a18a11c402c1cfe9885f8ba5f995f97cb5ea2aa69e1339b02e4d66f08d43 DIST gpds-1.8.4.tar.gz 875582 BLAKE2B f4ddb017e381708f6b0de2d32fe8802cd6e79000b9d238351564b71aac2bf7045954a7244dcc06f12ed1d43aeb046d56bbfe45bc64155d42d3d025b9e48cdf2d SHA512 dcf586dbb79335667a679038d366d1314aeb46357b1d1a5907b8a492cc31560a95371ec967be0ea388ca9744d864e1740031f9f6273450bc2361bb74e76df355 diff --git a/dev-libs/gpds/gpds-1.8.3.ebuild b/dev-libs/gpds/gpds-1.8.3.ebuild deleted file mode 100644 index 308bccb737..0000000000 --- a/dev-libs/gpds/gpds-1.8.3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="A general purpose data serializer" -HOMEPAGE="https://gpds.simulton.com" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/simulton/${PN}.git" -else - SRC_URI="https://github.com/simulton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" - S="${WORKDIR}/${PN}-${PV}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="examples +spdlog static-libs test" -RESTRICT="!test? ( test )" -DEPEND="${RDEPEND}" - -DOCS=( license.txt readme.md ) - -src_prepare() { - cmake_src_prepare - use static-libs || sed -i -e '/TARGET-STATIC/d' "${S}"/lib/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DGPDS_BUILD_STATIC=$(usex static-libs) - -DGPDS_BUILD_SHARED=ON - -DGPDS_BUILD_TESTS=$(usex test) - -DGPDS_BUILD_EXAMPLES=$(usex examples) - -DGPDS_FEATURE_SPDLOG=$(usex spdlog) - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install -} From e06770293d49f1bb063a53508e89c45461dc794f Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 19 Feb 2024 10:42:17 +0800 Subject: [PATCH 3/4] dev-libs/gpds: removed unused spdlog use flag Signed-off-by: Huang Rui --- dev-libs/gpds/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/dev-libs/gpds/metadata.xml b/dev-libs/gpds/metadata.xml index fd1bd6491e..b21fd6d6de 100644 --- a/dev-libs/gpds/metadata.xml +++ b/dev-libs/gpds/metadata.xml @@ -5,9 +5,6 @@ vowstar@gmail.com Huang Rui - - Enable spdlog sink feature - simulton/gpds https://github.com/simulton/gpds/issues From 5257d1b49a6b1a0e3171f7b32aea5dfc32766b40 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 19 Feb 2024 10:43:16 +0800 Subject: [PATCH 4/4] dev-libs/qschematic: drop 1.5.1 Signed-off-by: Huang Rui --- dev-libs/qschematic/Manifest | 1 - ...qschematic-1.5.1-gentoo-cmake-option.patch | 114 ------------------ dev-libs/qschematic/qschematic-1.5.1.ebuild | 68 ----------- 3 files changed, 183 deletions(-) delete mode 100644 dev-libs/qschematic/files/qschematic-1.5.1-gentoo-cmake-option.patch delete mode 100644 dev-libs/qschematic/qschematic-1.5.1.ebuild diff --git a/dev-libs/qschematic/Manifest b/dev-libs/qschematic/Manifest index 36408d6a5f..2afb627606 100644 --- a/dev-libs/qschematic/Manifest +++ b/dev-libs/qschematic/Manifest @@ -1,2 +1 @@ -DIST qschematic-1.5.1.tar.gz 1510872 BLAKE2B 4ecf1200f4aa8052aa1ded75f6247b2db4db8a85383b04bc4c7cec495d5d2b3d4b93d96c6fcbdf370d5470be6e7e00c032ba26d0e9d5b1ac491c78286d25b55c SHA512 4b748397e83369764f3f1df49701ffe3dccb18713c0e2f55c1110b31c294f0205da10c06fd56ca0011e3f8f5a0a9970149ed84a586d6edd4febe18170d89723d DIST qschematic-1.6.0.tar.gz 1511024 BLAKE2B ac2866773a27526d1449a56ed41177b9337599cd37aa7d2deda5b1136fb50ab82d1b3bf032d0e04c33e209b9eb6ad7a400aad46c61c8c4ec09473da49306cab2 SHA512 977a13e1bf1d3a517d6b75236667abc0ca463910e06d1c1f0071d134c95d95897582aafbc1fa560f69137e536e626d7025393b5a0f48b462380ded6a658dd0f4 diff --git a/dev-libs/qschematic/files/qschematic-1.5.1-gentoo-cmake-option.patch b/dev-libs/qschematic/files/qschematic-1.5.1-gentoo-cmake-option.patch deleted file mode 100644 index c72136aed6..0000000000 --- a/dev-libs/qschematic/files/qschematic-1.5.1-gentoo-cmake-option.patch +++ /dev/null @@ -1,114 +0,0 @@ -From ea877503228e0ce17451354d47ac151cbd94dcf5 Mon Sep 17 00:00:00 2001 -From: Huang Rui -Date: Sat, 17 Feb 2024 23:30:42 +0800 -Subject: [PATCH] fix gentoo build with qt6 - -Signed-off-by: Huang Rui ---- - 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/CMakeLists.txt b/qschematic/CMakeLists.txt -index 7e80a3a445cc..8368e5742b43 100644 ---- a/qschematic/CMakeLists.txt -+++ b/qschematic/CMakeLists.txt -@@ -153,7 +153,7 @@ endif() - # Static library # - ################################################################################ - --if (QSCHEMATIC_BUILD_STATIC) -+# if (QSCHEMATIC_BUILD_STATIC) - add_library(${TARGET_STATIC} STATIC) - setup_target_common(${TARGET_STATIC}) - -@@ -161,8 +161,8 @@ if (QSCHEMATIC_BUILD_STATIC) - ${TARGET_STATIC} - PUBLIC - QSCHEMATIC_STATIC_DEFINE -- ) --endif() -+ ) -+# endif() - - - ################################################################################ -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/qschematic-1.5.1.ebuild b/dev-libs/qschematic/qschematic-1.5.1.ebuild deleted file mode 100644 index 2a272258c3..0000000000 --- a/dev-libs/qschematic/qschematic-1.5.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -MY_PN="QSchematic" - -inherit cmake - -DESCRIPTION="Library for creating flowcharts and engineering diagrams" -HOMEPAGE="https://github.com/simulton/QSchematic" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/simulton/QSchematic/${MY_PN}.git" -else - SRC_URI="https://github.com/simulton/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="examples qt6 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?] -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-1.5.1-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 - ) - - cmake_src_configure -}