diff --git a/archivers/quazip/Makefile b/archivers/quazip/Makefile index 528e56b2b4ba..edf69259567b 100644 --- a/archivers/quazip/Makefile +++ b/archivers/quazip/Makefile @@ -1,36 +1,36 @@ PORTNAME= quazip DISTVERSIONPREFIX= v -DISTVERSION= 1.7.0 +DISTVERSION= 1.7.1 CATEGORIES= archivers PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= Qt/C++ wrapper for ZIP/UNZIP package WWW= https://github.com/stachenov/quazip LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING FLAVORS= qt6 qt5 FLAVOR?= qt6 USES= cmake:testing compiler:c++${"${FLAVOR:Mqt6}" != "":?17:14}-lang \ cpe qt:${FLAVOR:S/qt//} CPE_VENDOR= quazip_project USE_GITHUB= yes GH_ACCOUNT= stachenov USE_LDCONFIG= yes _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_VER=${DISTVERSION:R} \ QUAZIP_VERSION=${DISTVERSION} .include diff --git a/archivers/quazip/distinfo b/archivers/quazip/distinfo index ebfe5f78da32..a09572ec6d87 100644 --- a/archivers/quazip/distinfo +++ b/archivers/quazip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1780137463 -SHA256 (stachenov-quazip-v1.7.0_GH0.tar.gz) = 61c73926d4e98bf4c38becc15ba10437ab2af9e746a3982b86f7d720bd5823b4 -SIZE (stachenov-quazip-v1.7.0_GH0.tar.gz) = 194967 +TIMESTAMP = 1780350272 +SHA256 (stachenov-quazip-v1.7.1_GH0.tar.gz) = e3c7220e66d9f8024ef4aa98befb2592fea219a01736a400b07b11aa60964d02 +SIZE (stachenov-quazip-v1.7.1_GH0.tar.gz) = 195227 diff --git a/archivers/quazip/files/patch-CMakeLists.txt b/archivers/quazip/files/patch-CMakeLists.txt index 4aee78aca17a..bb4fb23eeda3 100644 --- a/archivers/quazip/files/patch-CMakeLists.txt +++ b/archivers/quazip/files/patch-CMakeLists.txt @@ -1,19 +1,22 @@ 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.orig 2026-05-31 11:09:35 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") +@@ -82,10 +82,12 @@ if(QUAZIP_QT_MAJOR_VERSION EQUAL 6) + set(QUAZIP_QT_ZLIB_HEADER_COMPONENT ZlibPrivate) + set(QUAZIP_LIB_LIBRARIES Qt6::Core ) + set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Network Qt6::Test) +- set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt6Core") ++ set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt6Core, Qt6Core5Compat") 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) diff --git a/archivers/quazip/pkg-plist b/archivers/quazip/pkg-plist index 8565553cb9f9..f8c08ba7ab74 100644 --- a/archivers/quazip/pkg-plist +++ b/archivers/quazip/pkg-plist @@ -1,28 +1,29 @@ include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/JlCompress.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/QuaCompress.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/QuaExtract.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/ioapi.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/minizip_crypt.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quaadler32.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quachecksum32.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quacrc32.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quagzipfile.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quaziodevice.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazip.h +include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazip_config.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazip_global.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazip_qt_compat.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazip_textcodec.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazipdir.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazipfile.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazipfileinfo.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazipnewinfo.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/unzip.h include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/zip.h lib/cmake/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/QuaZip-Qt%%QTVER_SUFFIX%%Config.cmake lib/cmake/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/QuaZip-Qt%%QTVER_SUFFIX%%ConfigVersion.cmake lib/cmake/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/QuaZip-Qt%%QTVER_SUFFIX%%_SharedTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/QuaZip-Qt%%QTVER_SUFFIX%%_SharedTargets.cmake lib/libquazip1-qt%%QTVER_SUFFIX%%.so lib/libquazip1-qt%%QTVER_SUFFIX%%.so.%%QUAZIP_VER%% lib/libquazip1-qt%%QTVER_SUFFIX%%.so.%%QUAZIP_VERSION%% libdata/pkgconfig/quazip1-qt%%QTVER_SUFFIX%%.pc