commit: 4cd77a278a7e789dfbaf52fc46118a2ca6f2b69d Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Mon Jul 3 21:41:23 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Jul 26 07:42:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cd77a27
dev-libs/qxlsx: add 1.4.6 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> dev-libs/qxlsx/Manifest | 1 + dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch | 26 +++++++++++ dev-libs/qxlsx/qxlsx-1.4.6.ebuild | 60 ++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) diff --git a/dev-libs/qxlsx/Manifest b/dev-libs/qxlsx/Manifest index fe1303dabde0..e48f449397f6 100644 --- a/dev-libs/qxlsx/Manifest +++ b/dev-libs/qxlsx/Manifest @@ -1 +1,2 @@ DIST qxlsx-1.4.5.tar.gz 4705008 BLAKE2B dd853a20109c9d9dcd5757bbb436e620191eb1fb95c441b1ce3a119bd99397f6206da37b6d770c84e8717c75ce9ad1da4b82397030da02c49a092d958ebef261 SHA512 5ec63c210b12c037acd9f3cc4d351b9bd488add65872a27cca536117349ac2c2501649cb7c2f35e1ee95289e98bf9e9fea6554aef1379deafb50c5016ed21fe5 +DIST qxlsx-1.4.6.tar.gz 4705107 BLAKE2B 9329412c949d2eaaab9a1d536ca2680da0649ef8b7a07bda6f20dd3c3214db8abac458fde25f41afc8b8b22442b6b83820cefa6031ef27de857d49ebfbed774b SHA512 14651096d35889354ffc97ca80146fb6704901db210b90d5de4157ee67adddb2021a27969777369162b0f5424b31bc50596ecd86e2f6f138c329a7cf4f2161a8 diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch b/dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch new file mode 100644 index 000000000000..90dd81fb8c88 --- /dev/null +++ b/dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch @@ -0,0 +1,26 @@ +https://github.com/QtExcel/QXlsx/pull/279 + +From 8c3e6633e3c901bc5a5cd477383421b0980dcd26 Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov <[email protected]> +Date: Mon, 17 Apr 2023 23:43:59 +0100 +Subject: [PATCH] Fix #278 + +There's no real reason to install the same headers twice, but at least +now clients of the library can build again +--- + QXlsx/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt +index 4fa7f7f..074922a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -179,7 +179,7 @@ PRIVATE + ${QXLSX_HEADERPATH} + PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header> +- $<INSTALL_INTERFACE:include/QXlsx> ++ $<INSTALL_INTERFACE:include/QXlsxQt${QT_VERSION_MAJOR}> + ) + + set_target_properties(QXlsx PROPERTIES diff --git a/dev-libs/qxlsx/qxlsx-1.4.6.ebuild b/dev-libs/qxlsx/qxlsx-1.4.6.ebuild new file mode 100644 index 000000000000..e30b9d9087f2 --- /dev/null +++ b/dev-libs/qxlsx/qxlsx-1.4.6.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multibuild cmake + +DESCRIPTION="Excel file(*.xlsx) reader/writer library using Qt" + +HOMEPAGE="https://github.com/QtExcel/QXlsx"; +SRC_URI="https://github.com/QtExcel/QXlsx/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +# soversion +SLOT="0/0.1.4.4" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" + +IUSE="qt5 qt6" +REQUIRED_USE="|| ( qt5 qt6 )" + +RDEPEND=" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5= + ) + qt6? ( + dev-qt/qtbase:6=[gui] + ) +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/QXlsx-${PV}/QXlsx" + +PATCHES=( + "${FILESDIR}/qxlsx-1.4.6-headers.patch" +) + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_configure() { + my_src_configure() { + local mycmakeargs=( + -DQT_VERSION_MAJOR="${MULTIBUILD_VARIANT/qt/}" + ) + + cmake_src_configure + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_install() { + multibuild_foreach_variant cmake_src_install +}
