git: 525acacff2ac - main - archivers/quazip: Update to 1.5

From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Thu, 06 Mar 2025 06:34:26 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=525acacff2ac46e6b3589554f714788918ac1848

commit 525acacff2ac46e6b3589554f714788918ac1848
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2025-03-06 04:45:43 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
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)