From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2D4EB15808D for ; Wed, 20 Apr 2022 10:16:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B00E4E090E; Wed, 20 Apr 2022 10:16:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81B8DE090E for ; Wed, 20 Apr 2022 10:16:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC75E341333 for ; Wed, 20 Apr 2022 10:16:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2798C177 for ; Wed, 20 Apr 2022 10:16:20 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1650449777.c504c1ac975808a05b9928a5297133e12a7a9607.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/, dev-libs/quazip/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/quazip/Manifest dev-libs/quazip/files/quazip-1.3-cmake.patch dev-libs/quazip/quazip-1.3.ebuild X-VCS-Directories: dev-libs/quazip/files/ dev-libs/quazip/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: c504c1ac975808a05b9928a5297133e12a7a9607 X-VCS-Branch: master Date: Wed, 20 Apr 2022 10:16:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ac912754-1292-4e9b-b816-4bd96fc34012 X-Archives-Hash: d2a4a08652a3efef43b0423cb9868b4f commit: c504c1ac975808a05b9928a5297133e12a7a9607 Author: Thiago Donato Ferreira gmail com> AuthorDate: Tue Apr 19 22:21:55 2022 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Wed Apr 20 10:16:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c504c1ac dev-libs/quazip: 1.3 version bump Closes: https://bugs.gentoo.org/839264 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Thiago Donato Ferreira gmail.com> Closes: https://github.com/gentoo/gentoo/pull/25119 Signed-off-by: Andrew Ammerlaan gentoo.org> dev-libs/quazip/Manifest | 1 + dev-libs/quazip/files/quazip-1.3-cmake.patch | 84 ++++++++++++++++++++++++++++ dev-libs/quazip/quazip-1.3.ebuild | 47 ++++++++++++++++ 3 files changed, 132 insertions(+) diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest index dbe68bf12763..f382b0c66d22 100644 --- a/dev-libs/quazip/Manifest +++ b/dev-libs/quazip/Manifest @@ -1 +1,2 @@ DIST quazip-1.2.tar.gz 155878 BLAKE2B cfd5505509863dfdfcc88cf9f50aeff0ee0c1391412dc8aeb34ab020debd8a29279563323a0ca13a8d3b8b026518f5d079b8fa989aca20a9bec083c6dd4e3695 SHA512 3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386 +DIST quazip-1.3.tar.gz 156138 BLAKE2B a9002bdfab39fc1516160b0073fd3d59a65a66eda98240b9a2936d4423b21b40dd9360122950a54dc18236bc2aaf4e1e2d761ba145f6dbd5014cf72a287fbb3b SHA512 3861a9084059576ff2690e8b911394b0286a60542ab021a4cc588537a60ea3a186ed7903c76544698001fa383dfd0de96bdfed433abaefc44158d3b30ab16fe2 diff --git a/dev-libs/quazip/files/quazip-1.3-cmake.patch b/dev-libs/quazip/files/quazip-1.3-cmake.patch new file mode 100644 index 000000000000..016bd97f1dc0 --- /dev/null +++ b/dev-libs/quazip/files/quazip-1.3-cmake.patch @@ -0,0 +1,84 @@ +From 9d9e4e7c2076f0ab1a482ae32203aa336dc4ba9b Mon Sep 17 00:00:00 2001 +From: Thiago Donato Ferreira +Date: Mon, 18 Apr 2022 12:08:55 -0300 +Subject: [PATCH] Add CTest patch + +Signed-off-by: Thiago Donato Ferreira +--- + CMakeLists.txt | 32 +++++++++++++++++++------------- + 1 file changed, 19 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3eaf1a..71f2748 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,6 @@ set(QUAZIP_LIB_SOVERSION 1.3.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 the default value of `${QUAZIP_QT_MAJOR_VERSION}`. + # We search quietly for Qt6, Qt5 and Qt4 in that order. +@@ -34,6 +33,8 @@ endif() + + set(QUAZIP_QT_MAJOR_VERSION ${QT_VERSION_MAJOR} CACHE STRING "Qt version to use (4, 5 or 6), defaults to ${QT_VERSION_MAJOR}") + ++include(CTest) ++ + if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE RELEASE) + endif() +@@ -50,23 +51,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 "zlib, 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 "zlib, 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 "zlib, 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() +@@ -88,8 +95,7 @@ endif() + + add_subdirectory(quazip) + +-if(QUAZIP_ENABLE_TESTS) ++if(BUILD_TESTING) + message(STATUS "Building QuaZip tests") +- enable_testing() + add_subdirectory(qztest) + endif() +-- +2.35.1 + diff --git a/dev-libs/quazip/quazip-1.3.ebuild b/dev-libs/quazip/quazip-1.3.ebuild new file mode 100644 index 000000000000..43b0ab41e9e2 --- /dev/null +++ b/dev-libs/quazip/quazip-1.3.ebuild @@ -0,0 +1,47 @@ +# 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=( + -DBUILD_TESTING=$(usex test) + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + use test && cmake_build qztest +}