commit: c4355cec1759e84d558cc48b5e69d321070db95b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 2 20:21:05 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Mar 1 16:33:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4355cec
dev-libs/quazip: drop 1.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/quazip/Manifest | 1 - dev-libs/quazip/files/quazip-1.2-cmake.patch | 79 ---------------------------- dev-libs/quazip/quazip-1.2.ebuild | 48 ----------------- 3 files changed, 128 deletions(-) diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest index 7cc50b7cd451..cfc41e935d48 100644 --- a/dev-libs/quazip/Manifest +++ b/dev-libs/quazip/Manifest @@ -1,2 +1 @@ -DIST quazip-1.2.tar.gz 155878 BLAKE2B cfd5505509863dfdfcc88cf9f50aeff0ee0c1391412dc8aeb34ab020debd8a29279563323a0ca13a8d3b8b026518f5d079b8fa989aca20a9bec083c6dd4e3695 SHA512 3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386 DIST quazip-1.4.tar.gz 157819 BLAKE2B bb0ec2ebd31d6ce5e2a19fc1b13570d57aa1438ff192621543ab6aec4e85f76677863d37efbe0bc59e3530ce023586440081cd47f069b4dcbac55118d12f8668 SHA512 38ce3aa77df1fd92229454e56b7290c066d1e319afa36a9f8ec8477004ae94df682e8f454f13cdaf586a1d0b0e033fe698081033a19536ecd53dd1e4b0204af9 diff --git a/dev-libs/quazip/files/quazip-1.2-cmake.patch b/dev-libs/quazip/files/quazip-1.2-cmake.patch deleted file mode 100644 index e8bfdf7807cc..000000000000 --- a/dev-libs/quazip/files/quazip-1.2-cmake.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d141ac016ad587b052886b17b42c8c4dc77aba98 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Sat, 20 Feb 2021 22:53:46 +0100 -Subject: [PATCH] Use CTest module provided BUILD_TESTING (default: ON) - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 32 +++++++++++++++++++------------- - 1 file changed, 19 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c42816..5d52baf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,9 +11,10 @@ set(QUAZIP_LIB_SOVERSION 1.0.0) - option(BUILD_SHARED_LIBS "" ON) - option(QUAZIP_INSTALL "" ON) - option(QUAZIP_USE_QT_ZLIB "" OFF) --option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF) - set(QUAZIP_QT_MAJOR_VERSION 5 CACHE STRING "Qt version to use (4 or 5), defaults to 5") - -+include(CTest) -+ - if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE RELEASE) - endif() -@@ -30,23 +31,29 @@ set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION}) - set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}) - - if(QUAZIP_QT_MAJOR_VERSION EQUAL 6) -- find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat -- OPTIONAL_COMPONENTS Network Test) -+ find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat) - set(QUAZIP_LIB_LIBRARIES Qt6::Core Qt6::Core5Compat) -- set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test) - set(QUAZIP_PKGCONFIG_REQUIRES Qt6Core) -+ if (BUILD_TESTING) -+ find_package(Qt6 REQUIRED COMPONENTS Network Test) -+ set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test) -+ endif() - elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5) -- find_package(Qt5 REQUIRED COMPONENTS Core -- OPTIONAL_COMPONENTS Network Test) -+ find_package(Qt5 REQUIRED COMPONENTS Core) - set(QUAZIP_LIB_LIBRARIES Qt5::Core) -- set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test) -- set(QUAZIP_PKGCONFIG_REQUIRES Qt5Core) -+ set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt5Core") -+ if (BUILD_TESTING) -+ find_package(Qt5 REQUIRED COMPONENTS Network Test) -+ set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test) -+ endif() - elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4) -- find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore -- OPTIONAL_COMPONENTS QtNetwork QtTest) -+ find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore) - set(QUAZIP_LIB_LIBRARIES Qt4::QtCore) -- set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest) - set(QUAZIP_PKGCONFIG_REQUIRES QtCore) -+ if (BUILD_TESTING) -+ find_package(Qt4 REQUIRED COMPONENTS Network Test) -+ set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest) -+ endif() - else() - message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported") - endif() -@@ -67,8 +74,7 @@ endif() - - add_subdirectory(quazip) - --if(QUAZIP_ENABLE_TESTS) -+if(BUILD_TESTING) - message(STATUS "Building QuaZip tests") -- enable_testing() - add_subdirectory(qztest) - endif() --- -2.34.1 - diff --git a/dev-libs/quazip/quazip-1.2.ebuild b/dev-libs/quazip/quazip-1.2.ebuild deleted file mode 100644 index e0d53de5bc70..000000000000 --- a/dev-libs/quazip/quazip-1.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package" -HOMEPAGE="https://stachenov.github.io/quazip/"; -SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/1" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-qt/qtcore:5 - sys-libs/zlib[minizip] -" -DEPEND="${COMMON_DEPEND} - test? ( - dev-qt/qtnetwork:5 - dev-qt/qttest:5 - ) -" -RDEPEND="${COMMON_DEPEND} - !=dev-libs/quazip-1.1-r0:1 -" - -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) - -src_configure() { - local mycmakeargs=( - -DQUAZIP_QT_MAJOR_VERSION=5 - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - use test && cmake_build qztest -}
