diff options
| author |   Alexey Sokolov <alexey+gentoo@asokolov.org> | 2024-03-27 21:20:35 +0000 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-04-30 07:40:03 +0100 |
| commit | 6d0be84cca1ef8fab8ba1119cdb84cabf274992b (patch) | |
| tree | 24b38c372a47c8b5e98cd8c07a23c77f4a680f3f | |
| parent | dev-libs/qxlsx: enable qt5 by default (diff) | |
| download | gentoo-6d0be84cca1ef8fab8ba1119cdb84cabf274992b.tar.gz gentoo-6d0be84cca1ef8fab8ba1119cdb84cabf274992b.tar.bz2 gentoo-6d0be84cca1ef8fab8ba1119cdb84cabf274992b.zip | |
dev-libs/qxlsx: drop 1.4.6
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/35953
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | dev-libs/qxlsx/Manifest | 1 | ||||
| -rw-r--r-- | dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch | 26 | ||||
| -rw-r--r-- | dev-libs/qxlsx/qxlsx-1.4.6.ebuild | 60 |
3 files changed, 0 insertions, 87 deletions
diff --git a/dev-libs/qxlsx/Manifest b/dev-libs/qxlsx/Manifest index 5e17cb5068c1..f5ccfe9b1376 100644 --- a/dev-libs/qxlsx/Manifest +++ b/dev-libs/qxlsx/Manifest @@ -1,2 +1 @@ -DIST qxlsx-1.4.6.tar.gz 4705107 BLAKE2B 9329412c949d2eaaab9a1d536ca2680da0649ef8b7a07bda6f20dd3c3214db8abac458fde25f41afc8b8b22442b6b83820cefa6031ef27de857d49ebfbed774b SHA512 14651096d35889354ffc97ca80146fb6704901db210b90d5de4157ee67adddb2021a27969777369162b0f5424b31bc50596ecd86e2f6f138c329a7cf4f2161a8 DIST qxlsx-1.4.7.tar.gz 4705261 BLAKE2B 8be35b86ef7f025d5cc0875275406a65e1624592d7c8fa97d743223ab143011de9e71dc40eb62d83edc28c16c5d9e9c8092ea082cd8898db277e8a94e1ea10e6 SHA512 5ca8841413d5bddf1cec2c6eb4434ae18c533231adf32a8157790ba81c0b305c7f02a70475492a45ce11d1d6cf6e483bd30cafe8629aa564a46cb749e1b43f43 diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch b/dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch deleted file mode 100644 index 90dd81fb8c88..000000000000 --- a/dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/QtExcel/QXlsx/pull/279 - -From 8c3e6633e3c901bc5a5cd477383421b0980dcd26 Mon Sep 17 00:00:00 2001 -From: Alexey Sokolov <sokolov@google.com> -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 deleted file mode 100644 index b00b67caf83e..000000000000 --- a/dev-libs/qxlsx/qxlsx-1.4.6.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# 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 -} |