* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/qschematic/, dev-libs/qschematic/files/
@ 2023-11-21 15:05 David Roman
0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2023-11-21 15:05 UTC (permalink / raw
To: gentoo-commits
commit: e43fd4312cbd8f0decbe83f31a4d87699b4be710
Author: Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Tue Nov 21 02:57:54 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Nov 21 02:57:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e43fd431
dev-libs/qschematic: new package, add 1.5.0
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>
dev-libs/qschematic/Manifest | 1 +
.../qschematic-1.5.0-gentoo-cmake-option.patch | 128 +++++++++++++++++++++
dev-libs/qschematic/metadata.xml | 31 +++++
dev-libs/qschematic/qschematic-1.5.0.ebuild | 67 +++++++++++
4 files changed, 227 insertions(+)
diff --git a/dev-libs/qschematic/Manifest b/dev-libs/qschematic/Manifest
new file mode 100644
index 0000000000..97fbdad4b5
--- /dev/null
+++ b/dev-libs/qschematic/Manifest
@@ -0,0 +1 @@
+DIST qschematic-1.5.0.tar.gz 1509508 BLAKE2B b2850e0b31e1d44f750488b94d47beaf606981d77bfbb070b44beb235c531bf190d1e3edcafb214737dc376d74d5e08405a8b3844c9746f9dce9731484685ca8 SHA512 a5ad0a5068c0bed1307c89134814c68192e4af19067d221d27086585f93360307a1293ee7c63021b21c0348f3859a18d6dcd50b3e2e0fe19fd32bf4928942cd4
diff --git a/dev-libs/qschematic/files/qschematic-1.5.0-gentoo-cmake-option.patch b/dev-libs/qschematic/files/qschematic-1.5.0-gentoo-cmake-option.patch
new file mode 100644
index 0000000000..229b93a727
--- /dev/null
+++ b/dev-libs/qschematic/files/qschematic-1.5.0-gentoo-cmake-option.patch
@@ -0,0 +1,128 @@
+From 9beb6fcc19a27bd7a280420bdac8a95b650316ed Mon Sep 17 00:00:00 2001
+From: Huang Rui <vowstar@gmail.com>
+Date: Tue, 21 Nov 2023 10:25:53 +0800
+Subject: [PATCH] build: add build options for gentoo
+
+Signed-off-by: Huang Rui <vowstar@gmail.com>
+---
+ CMakeLists.txt | 2 ++
+ demo/CMakeLists.txt | 2 ++
+ qschematic/CMakeLists.txt | 10 ++++++----
+ qschematic/external.cmake | 2 ++
+ qschematic/qschematic-config.cmake.in | 3 +++
+ 5 files changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a265d7e523f..bfe5cfe8d8bf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,8 @@ project(
+ # User options
+ 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)
++option(QSCHEMATIC_BUILD_STATIC "Whether to build static library" 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 6c315c2894b2..db206dd156ac 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 ec56b33ad264..6b4d353127bc 100644
+--- a/qschematic/CMakeLists.txt
++++ b/qschematic/CMakeLists.txt
+@@ -150,7 +150,6 @@ setup_target_common(${TARGET_SHARED})
+ ################################################################################
+ # Static library #
+ ################################################################################
+-
+ add_library(${TARGET_STATIC} STATIC)
+ setup_target_common(${TARGET_STATIC})
+
+@@ -160,7 +159,6 @@ target_compile_definitions(
+ QSCHEMATIC_STATIC_DEFINE
+ )
+
+-
+ ################################################################################
+ # Install #
+ ################################################################################
+@@ -171,10 +169,14 @@ include(CMakePackageConfigHelpers)
+ set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/qschematic)
+
+ # Targets
++if (QSCHEMATIC_BUILD_STATIC)
++ set(INSTALL_TARGETS ${INSTALL_TARGETS} ${TARGET_STATIC} ${TARGET_SHARED})
++else()
++ set(INSTALL_TARGETS ${INSTALL_TARGETS} ${TARGET_SHARED})
++endif()
+ install(
+ TARGETS
+- ${TARGET_STATIC}
+- ${TARGET_SHARED}
++ ${INSTALL_TARGETS}
+ EXPORT qschematic-targets
+ FILE_SET
+ HEADERS
+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.42.1
+
diff --git a/dev-libs/qschematic/metadata.xml b/dev-libs/qschematic/metadata.xml
new file mode 100644
index 0000000000..a7e051e5ce
--- /dev/null
+++ b/dev-libs/qschematic/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>vowstar@gmail.com</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>
+ <changelog>https://github.com/simulton/QSchematic/releases</changelog>
+ </upstream>
+ <longdescription lang="en">
+ QSchematic is a library to draw diagrams and schematics with Qt. It uses
+ Qt's graphics view framework.
+ The library provides base classes for objects such as nodes and wires
+ and implements logic to move objects around while keeping the wires
+ connected, generating netlists and so on. A typical application would
+ include this library and subclass the Item class to implement custom
+ items.
+ </longdescription>
+ <longdescription lang="zh">
+ QSchematic 是一个基于 Qt 的图形视图框架的绘制图表和原理图的库。
+ 该库为节点和连线等对象提供基类，并实现在保持连线连接的同时移动对象的逻
+ 辑、生成网表等。典型的应用程序包含此库，并允许继承 Item 类以实现自定义
+ 项。
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-libs/qschematic/qschematic-1.5.0.ebuild b/dev-libs/qschematic/qschematic-1.5.0.ebuild
new file mode 100644
index 0000000000..39c94b151e
--- /dev/null
+++ b/dev-libs/qschematic/qschematic-1.5.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 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 ~ppc ~ppc64 ~riscv ~sparc ~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.6.0[static-libs?]
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.5.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)
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/qschematic/, dev-libs/qschematic/files/
2024-02-17 15:42 [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/qschematic/files/, dev-libs/qschematic/ Rui Huang
@ 2024-02-17 15:48 ` Rui Huang
0 siblings, 0 replies; 4+ messages in thread
From: Rui Huang @ 2024-02-17 15:48 UTC (permalink / raw
To: gentoo-commits
commit: f11479fcc8e387be3b7ef9d38cfe536687f4c375
Author: Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Sat Feb 17 15:42:08 2024 +0000
Commit: Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Sat Feb 17 15:42:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f11479fc
dev-libs/qschematic: drop 1.5.0
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>
dev-libs/qschematic/Manifest | 1 -
.../qschematic-1.5.0-gentoo-cmake-option.patch | 128 ---------------------
dev-libs/qschematic/qschematic-1.5.0.ebuild | 67 -----------
3 files changed, 196 deletions(-)
diff --git a/dev-libs/qschematic/Manifest b/dev-libs/qschematic/Manifest
index 5d853e34f4..a69882c1f9 100644
--- a/dev-libs/qschematic/Manifest
+++ b/dev-libs/qschematic/Manifest
@@ -1,2 +1 @@
-DIST qschematic-1.5.0.tar.gz 1509508 BLAKE2B b2850e0b31e1d44f750488b94d47beaf606981d77bfbb070b44beb235c531bf190d1e3edcafb214737dc376d74d5e08405a8b3844c9746f9dce9731484685ca8 SHA512 a5ad0a5068c0bed1307c89134814c68192e4af19067d221d27086585f93360307a1293ee7c63021b21c0348f3859a18d6dcd50b3e2e0fe19fd32bf4928942cd4
DIST qschematic-1.5.1.tar.gz 1510872 BLAKE2B 4ecf1200f4aa8052aa1ded75f6247b2db4db8a85383b04bc4c7cec495d5d2b3d4b93d96c6fcbdf370d5470be6e7e00c032ba26d0e9d5b1ac491c78286d25b55c SHA512 4b748397e83369764f3f1df49701ffe3dccb18713c0e2f55c1110b31c294f0205da10c06fd56ca0011e3f8f5a0a9970149ed84a586d6edd4febe18170d89723d
diff --git a/dev-libs/qschematic/files/qschematic-1.5.0-gentoo-cmake-option.patch b/dev-libs/qschematic/files/qschematic-1.5.0-gentoo-cmake-option.patch
deleted file mode 100644
index 229b93a727..0000000000
--- a/dev-libs/qschematic/files/qschematic-1.5.0-gentoo-cmake-option.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 9beb6fcc19a27bd7a280420bdac8a95b650316ed Mon Sep 17 00:00:00 2001
-From: Huang Rui <vowstar@gmail.com>
-Date: Tue, 21 Nov 2023 10:25:53 +0800
-Subject: [PATCH] build: add build options for gentoo
-
-Signed-off-by: Huang Rui <vowstar@gmail.com>
----
- CMakeLists.txt | 2 ++
- demo/CMakeLists.txt | 2 ++
- qschematic/CMakeLists.txt | 10 ++++++----
- qschematic/external.cmake | 2 ++
- qschematic/qschematic-config.cmake.in | 3 +++
- 5 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a265d7e523f..bfe5cfe8d8bf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,6 +11,8 @@ project(
- # User options
- 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)
-+option(QSCHEMATIC_BUILD_STATIC "Whether to build static library" 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 6c315c2894b2..db206dd156ac 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 ec56b33ad264..6b4d353127bc 100644
---- a/qschematic/CMakeLists.txt
-+++ b/qschematic/CMakeLists.txt
-@@ -150,7 +150,6 @@ setup_target_common(${TARGET_SHARED})
- ################################################################################
- # Static library #
- ################################################################################
--
- add_library(${TARGET_STATIC} STATIC)
- setup_target_common(${TARGET_STATIC})
-
-@@ -160,7 +159,6 @@ target_compile_definitions(
- QSCHEMATIC_STATIC_DEFINE
- )
-
--
- ################################################################################
- # Install #
- ################################################################################
-@@ -171,10 +169,14 @@ include(CMakePackageConfigHelpers)
- set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/qschematic)
-
- # Targets
-+if (QSCHEMATIC_BUILD_STATIC)
-+ set(INSTALL_TARGETS ${INSTALL_TARGETS} ${TARGET_STATIC} ${TARGET_SHARED})
-+else()
-+ set(INSTALL_TARGETS ${INSTALL_TARGETS} ${TARGET_SHARED})
-+endif()
- install(
- TARGETS
-- ${TARGET_STATIC}
-- ${TARGET_SHARED}
-+ ${INSTALL_TARGETS}
- EXPORT qschematic-targets
- FILE_SET
- HEADERS
-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.42.1
-
diff --git a/dev-libs/qschematic/qschematic-1.5.0.ebuild b/dev-libs/qschematic/qschematic-1.5.0.ebuild
deleted file mode 100644
index 7fd45211ca..0000000000
--- a/dev-libs/qschematic/qschematic-1.5.0.ebuild
+++ /dev/null
@@ -1,67 +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.6.0[static-libs?]
-"
-
-DEPEND="
- ${RDEPEND}
-"
-
-BDEPEND="
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.5.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)
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/qschematic/, dev-libs/qschematic/files/
@ 2024-02-19 2:44 Rui Huang
2024-02-19 2:44 ` [gentoo-commits] repo/proj/guru:master " Rui Huang
0 siblings, 1 reply; 4+ messages in thread
From: Rui Huang @ 2024-02-19 2:44 UTC (permalink / raw
To: gentoo-commits
commit: 485a29faa397ba206d18523268b54311b1063fe2
Author: Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Mon Feb 19 02:40:01 2024 +0000
Commit: Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Mon Feb 19 02:40:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=485a29fa
dev-libs/qschematic: add 1.6.0
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>
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(+)
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 <vowstar@gmail.com>
+Date: Sat, 17 Feb 2024 23:30:42 +0800
+Subject: [PATCH] fix gentoo build with qt6
+
+Signed-off-by: Huang Rui <vowstar@gmail.com>
+---
+ 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/qschematic/, dev-libs/qschematic/files/
2024-02-19 2:44 [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/qschematic/, dev-libs/qschematic/files/ Rui Huang
@ 2024-02-19 2:44 ` Rui Huang
0 siblings, 0 replies; 4+ messages in thread
From: Rui Huang @ 2024-02-19 2:44 UTC (permalink / raw
To: gentoo-commits
commit: 485a29faa397ba206d18523268b54311b1063fe2
Author: Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Mon Feb 19 02:40:01 2024 +0000
Commit: Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Mon Feb 19 02:40:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=485a29fa
dev-libs/qschematic: add 1.6.0
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>
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(+)
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 <vowstar@gmail.com>
+Date: Sat, 17 Feb 2024 23:30:42 +0800
+Subject: [PATCH] fix gentoo build with qt6
+
+Signed-off-by: Huang Rui <vowstar@gmail.com>
+---
+ 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-19 2:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-19 2:44 [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/qschematic/, dev-libs/qschematic/files/ Rui Huang
2024-02-19 2:44 ` [gentoo-commits] repo/proj/guru:master " Rui Huang
-- strict thread matches above, loose matches on Subject: below --
2024-02-17 15:42 [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/qschematic/files/, dev-libs/qschematic/ Rui Huang
2024-02-17 15:48 ` [gentoo-commits] repo/proj/guru:master commit in: dev-libs/qschematic/, dev-libs/qschematic/files/ Rui Huang
2023-11-21 15:05 David Roman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox