From nobody Thu Mar 06 06:34:26 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z7flk6tm9z5pZLp; Thu, 06 Mar 2025 06:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z7flk2RBbz43j3; Thu, 06 Mar 2025 06:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741242866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h3CrI/Z/8FUAFVOSoobmyirtUrVzkwWxVJ6keqo91vA=; b=U4bsb+rwKuxX7vpIRhwqy7eoL1bSopgN8nTsOKy8drnXd2PCIQx+VbVvreVkN1eGDNLggS tqsPR9Y1dREnE65fTN0p9fOjZ0P8NOTKAK4bTpFm7z1bNnDzFzokflyjiOHg8eQrwaZnfM HzKHgxDjiybzASHemMa8wTPxqgk3BlEQADfHCAw/xMKvAmKIqeLQBw5rQNk04SfjG8ysSq 9xeDqF5613szsLlFf1BfjOrN8EjbMXNkR/gduhMuKpDxgZbVL3xiWNytJ5rPmfMWEtUN4h Ds3kYwrLqNNfmZQ/us0Qdge9XX2PxDAXUMPdwcwJysQcMfPbGgzghUTuRwkXaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741242866; a=rsa-sha256; cv=none; b=DJX2gHT3hZ4c/WVJg0p7Gqc//MCNf3CjqA5tO5Q9LI89CfYAUpmN3420tWku2tmL+xMndp 0lJBMpgz+o3AreqfUOCbZSaH2bjg5myYSu0n2IfU0hGoN2Gn2vJ3g+I/jQbPPo6KbdSTtI J+n1HYS7As2azmgSG/spmoFuncuR2bq4DLi1Z9P3npwcdpZ8csdqU+0Nal9nxs9QoLuh+V rCnuScvw62sFY+KDqhtt3S//xevrmKCG/29vrUx9Qaq16IsE2iu3muT2ZQkWWq46vKQdUk /jRsit4Gz2y6rO4a2V4pOvu/Jngbr/b4/t9/Hcl2hYmJtmGCPimE0Cc4bxx3rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741242866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h3CrI/Z/8FUAFVOSoobmyirtUrVzkwWxVJ6keqo91vA=; b=G0VN+PrszzggraK8Wv0YrCtIm4ISul9Wtucbunj0Qq6AyjtElyjEAUCL3A2m3Rn8z74SWR u9E+yhjx7O1Fo81KNwQbRTLJQG6Ovtg8MHPAxeF5ZKU288klm+ZUoFGrO821LFnhzGObmR wb9GDyqJ/mOyrCl3itMmllg7/SG/VWKc+2yFKkNfWSY4rEpudQOim0MI3vvAGVIptOD+/B ZUwCu1JDU5b2AXzRrl+Mko1ddn1L7u6+2swW8Ty21NPmh61gNqOeX5FI5PM3LuQ+Vp4NNa L6PLRSENkKHkjjNub/Hq0PX6Mrmnr67lM8t/h2M6Zjc0XGMEtDKv4V0jU8TyQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z7flk1xK5zgSy; Thu, 06 Mar 2025 06:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5266YQp3014625; Thu, 6 Mar 2025 06:34:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5266YQia014623; Thu, 6 Mar 2025 06:34:26 GMT (envelope-from git) Date: Thu, 6 Mar 2025 06:34:26 GMT Message-Id: <202503060634.5266YQia014623@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 525acacff2ac - main - archivers/quazip: Update to 1.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 525acacff2ac46e6b3589554f714788918ac1848 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=525acacff2ac46e6b3589554f714788918ac1848 commit 525acacff2ac46e6b3589554f714788918ac1848 Author: Jason E. Hale AuthorDate: 2025-03-06 04:45:43 +0000 Commit: Jason E. Hale CommitDate: 2025-03-06 06:34:16 +0000 archivers/quazip: Update to 1.5 Update LICENSE. This is LGPL 2.1 or later. Add regression testing support. https://github.com/stachenov/quazip/releases/tag/v1.5 --- archivers/quazip/Makefile | 14 ++++++++------ archivers/quazip/distinfo | 6 +++--- archivers/quazip/files/patch-CMakeLists.txt | 19 +++++++++++++++++++ 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/archivers/quazip/Makefile b/archivers/quazip/Makefile index 0b69e749378a..810c16739626 100644 --- a/archivers/quazip/Makefile +++ b/archivers/quazip/Makefile @@ -1,7 +1,6 @@ PORTNAME= quazip DISTVERSIONPREFIX= v -DISTVERSION= 1.4 -PORTREVISION= 1 +DISTVERSION= 1.5 CATEGORIES= archivers PKGNAMESUFFIX= -${FLAVOR} @@ -14,17 +13,20 @@ LICENSE= LGPL21 FLAVORS= qt5 qt6 FLAVOR?= qt5 -USES= cmake compiler:c++11-lang cpe qt:${FLAVOR:S/qt//} +USES= cmake:testing compiler:c++${"${FLAVOR:Mqt6}" != "":?17:14}-lang \ + cpe pathfix qt:${FLAVOR:S/qt//} CPE_VENDOR= quazip_project USE_GITHUB= yes GH_ACCOUNT= stachenov USE_LDCONFIG= yes -_USE_QT_qt5= core network \ - buildtools:build testlib:build qmake:build -_USE_QT_qt6= base 5compat +_USE_QT_qt5= core \ + buildtools:build qmake:build \ + network:test testlib:test +_USE_QT_qt6= 5compat base USE_QT= ${_USE_QT_${FLAVOR}} CMAKE_ARGS= -DQUAZIP_QT_MAJOR_VERSION=${FLAVOR:S/qt//} +CMAKE_TESTING_ON= QUAZIP_ENABLE_TESTS PLIST_SUB= QTVER_SUFFIX=${FLAVOR:S/qt//} \ QUAZIP_VERSION=${DISTVERSION} diff --git a/archivers/quazip/distinfo b/archivers/quazip/distinfo index 66a8072c9e55..5703a64ed129 100644 --- a/archivers/quazip/distinfo +++ b/archivers/quazip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674492405 -SHA256 (stachenov-quazip-v1.4_GH0.tar.gz) = 79633fd3a18e2d11a7d5c40c4c79c1786ba0c74b59ad752e8429746fe1781dd6 -SIZE (stachenov-quazip-v1.4_GH0.tar.gz) = 157819 +TIMESTAMP = 1741233300 +SHA256 (stachenov-quazip-v1.5_GH0.tar.gz) = 405b72b6e76c8987ff41a762523b8f64876ba406d8a831d268ee0b63f1369582 +SIZE (stachenov-quazip-v1.5_GH0.tar.gz) = 171006 diff --git a/archivers/quazip/files/patch-CMakeLists.txt b/archivers/quazip/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..4aee78aca17a --- /dev/null +++ b/archivers/quazip/files/patch-CMakeLists.txt @@ -0,0 +1,19 @@ +OPTIONAL_COMPONENTS never worked quite right with Qt5 when REQUIRED was also +passed to find_package(). If an optional component is not found, it results +in an error. + +--- CMakeLists.txt.orig 2025-03-06 04:56:05 UTC ++++ CMakeLists.txt +@@ -90,8 +90,10 @@ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5) + set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test) + set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt6Core") + elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5) +- find_package(Qt5 REQUIRED COMPONENTS Core +- OPTIONAL_COMPONENTS Network Test) ++ find_package(Qt5 REQUIRED COMPONENTS Core) ++ if(QUAZIP_ENABLE_TESTS) ++ find_package(Qt5 REQUIRED COMPONENTS Network Test) ++ endif() + message(STATUS "Found Qt version ${Qt5_VERSION} at ${Qt5_DIR}") + set(QUAZIP_QT_ZLIB_COMPONENT Zlib) + set(QUAZIP_LIB_LIBRARIES Qt5::Core)