diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-05-01 00:00:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-05-01 00:00:05 +0100 |
| commit | 3d12b65aa1b4bb8b02b1f8d3e77bccf230b79a09 (patch) | |
| tree | cb6347688c91bfbdebe49a78a55dad3d72cc193e /dev-libs/qxlsx | |
| parent | 4c2b70adc6484c35ff05e412de08a7b7f50cfb34 (diff) | |
gentoo auto-resync : 01:05:2024 - 00:00:04
Diffstat (limited to 'dev-libs/qxlsx')
| -rw-r--r-- | dev-libs/qxlsx/Manifest | 5 | ||||
| -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 | ||||
| -rw-r--r-- | dev-libs/qxlsx/qxlsx-1.4.7.ebuild | 2 |
4 files changed, 2 insertions, 91 deletions
diff --git a/dev-libs/qxlsx/Manifest b/dev-libs/qxlsx/Manifest index 5198a6a27efd..6a8e2bdf15d7 100644 --- a/dev-libs/qxlsx/Manifest +++ b/dev-libs/qxlsx/Manifest @@ -1,6 +1,3 @@ -AUX qxlsx-1.4.6-headers.patch 811 BLAKE2B bc1ff1b9e265a7d895a36dd1b21fc241169f783b0b37ec4ede278717891702a1f821392d3c22e9d2dc1ce1c181679825f0b432026c0729c300fd819f8ea8f55b SHA512 631bb364052405a68177482976c0520e938ae8087408c23a8d1e4fbdfeee4141767d4e2cd53e9353b2b375299a64d9a05eda32878896cf5546c5b424f93fad1d -DIST qxlsx-1.4.6.tar.gz 4705107 BLAKE2B 9329412c949d2eaaab9a1d536ca2680da0649ef8b7a07bda6f20dd3c3214db8abac458fde25f41afc8b8b22442b6b83820cefa6031ef27de857d49ebfbed774b SHA512 14651096d35889354ffc97ca80146fb6704901db210b90d5de4157ee67adddb2021a27969777369162b0f5424b31bc50596ecd86e2f6f138c329a7cf4f2161a8 DIST qxlsx-1.4.7.tar.gz 4705261 BLAKE2B 8be35b86ef7f025d5cc0875275406a65e1624592d7c8fa97d743223ab143011de9e71dc40eb62d83edc28c16c5d9e9c8092ea082cd8898db277e8a94e1ea10e6 SHA512 5ca8841413d5bddf1cec2c6eb4434ae18c533231adf32a8157790ba81c0b305c7f02a70475492a45ce11d1d6cf6e483bd30cafe8629aa564a46cb749e1b43f43 -EBUILD qxlsx-1.4.6.ebuild 1046 BLAKE2B 7fe9d3c733b040fe542d97327f4dfecf7cbe7f64717302525182d1c83aa6fa1b4d8c5cd42f0733437dcf959383640d013cc2cb2cbb524cee9ee47435ca345050 SHA512 6d9f5b38e45346a9e24825e003693e2873220b94cf754457226bb586455509d562cd142d08a967d5718d01c2ed2bd8fef7556fa13137f37cfd20d555e6fb898a -EBUILD qxlsx-1.4.7.ebuild 992 BLAKE2B 2b5755cad43a7a66bee06661e28cdf3bfdd97714db085c45c9db0a54bcfd2959144a53ce28f4da1bb4d95601ca4020129cb441e2ab1365b1e17f7c37ad954b62 SHA512 906be7a2e30db8623dae4998d535c676e8ba3700ef83c339b6eab24a431653d424e8441a637c4fb1d6b8d2ca277ce7eda770750fcc46ba1212b4392b00495bb1 +EBUILD qxlsx-1.4.7.ebuild 993 BLAKE2B 0ad989e2b2910ec12f99533c14e2d85d21dd6566e28db29adb88ddae476a46cd5165c29a3bd74e13412b271a342a3b18cbf5de8cc38961ed23ca2b32e6bd3ede SHA512 c360d10afdb1e620e2c279e6e5b24b5c8221a444cb419880e0a28422491a4133ac9a3045f8b7ed4913788aa041f1edcc9d336cec7a51fc1d9cd7f75c2474cebb MISC metadata.xml 451 BLAKE2B 72b39f0c97bb2d329e87abf678364a963a0e1cceda24106ed304f50258418595349f2b88ad5d34b82677dda655d20b05176d7bd8b2e2ca2215bcf1264b5412cc SHA512 5e9172c378f82bd9fbe16f8acbc877934ebac97d5603ad471f5ad0e4c729f69fb7942125ad7cd70047a28b78b63f3fc670023018cee113061ed2a668c5fd2897 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 -} diff --git a/dev-libs/qxlsx/qxlsx-1.4.7.ebuild b/dev-libs/qxlsx/qxlsx-1.4.7.ebuild index e11dac21a2ef..328515ace716 100644 --- a/dev-libs/qxlsx/qxlsx-1.4.7.ebuild +++ b/dev-libs/qxlsx/qxlsx-1.4.7.ebuild @@ -15,7 +15,7 @@ LICENSE="MIT" SLOT="0/0.1.4.4" KEYWORDS="amd64 ppc ppc64 ~riscv x86" -IUSE="qt5 qt6" +IUSE="+qt5 qt6" REQUIRED_USE="|| ( qt5 qt6 )" RDEPEND=" |