Sunday, June 30, 2024

Re: quazip-qt6-1.4(archivers/quazip,qt6)

This will break updates - you don't provide a path for updates from the old quazip-qt5-$V PKGNAME to the new quazip-$V, are missing a REVISION bump to take the version number higher than the previous, and don't have conflict markers.

-- 
  Sent from a phone, apologies for poor formatting.


On 30 June 2024 11:48:21 Rafael Sadowski <rafael@sizeofvoid.org> wrote:

Add qt6 flavor to quazip.

I know there are other ways to do this, but I followed the path that
worked well for the other Qt6 FLAVORS.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/archivers/quazip/Makefile,v
diff -u -p -r1.22 Makefile
--- Makefile 6 Sep 2023 13:18:43 -0000 1.22
+++ Makefile 30 Jun 2024 10:45:30 -0000
@@ -1,26 +1,41 @@
 COMMENT = Qt/C++ wrapper for ZIP/UNZIP package
 CATEGORIES = archivers
 
+V = 1.4
 GH_ACCOUNT = stachenov
 GH_PROJECT = quazip
-V = 1.4
 GH_TAGNAME = v$V
-PKGNAME = quazip-qt5-$V
 
 SHARED_LIBS +=  quazip1-qt5               0.1 # 0.0
+SHARED_LIBS +=  quazip1-qt6               0.0 # 0.0
 
 HOMEPAGE = https://stachenov.github.io/quazip/
 MAINTAINER = Brian Callahan <bcallah@openbsd.org>
 
+FLAVORS= qt6
+FLAVOR ?=
+
 # LGPLv2.1 with static linking exception
 PERMIT_PACKAGE = Yes
 
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core bz2 m z
+MODULES = devel/cmake
+
+CONFIGURE_ARGS += -DQUAZIP_ENABLE_TESTS=ON
 
-MODULES = devel/cmake \
- x11/qt5
+LIB_DEPENDS = archivers/bzip2
 
-CONFIGURE_ARGS += -DQUAZIP_ENABLE_TESTS=ON \
- -DQUAZIP_QT_MAJOR_VERSION=5
+.if ${FLAVOR:Mqt6}
+FULLPKGNAME= quazip-qt6-${V}
+PKGNAME = quazip-qt6-$V
+WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Core5Compat bz2 m z
+MODULES += x11/qt6
+LIB_DEPENDS += x11/qt6/qt5compat
+CONFIGURE_ARGS += -DQUAZIP_QT_MAJOR_VERSION=6
+.else
+PKGNAME = quazip-qt5-$V
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core bz2 m z
+MODULES += x11/qt5
+CONFIGURE_ARGS += -DQUAZIP_QT_MAJOR_VERSION=5
+.endif
 
 .include <bsd.port.mk>
Index: pkg/PFRAG.no-qt6
===================================================================
RCS file: pkg/PFRAG.no-qt6
diff -N pkg/PFRAG.no-qt6
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.no-qt6 30 Jun 2024 10:45:30 -0000
@@ -0,0 +1,27 @@
+@pkgpath archivers/quazip,qt5
+include/QuaZip-Qt5/
+include/QuaZip-Qt5/quazip/
+include/QuaZip-Qt5/quazip/JlCompress.h
+include/QuaZip-Qt5/quazip/ioapi.h
+include/QuaZip-Qt5/quazip/minizip_crypt.h
+include/QuaZip-Qt5/quazip/quaadler32.h
+include/QuaZip-Qt5/quazip/quachecksum32.h
+include/QuaZip-Qt5/quazip/quacrc32.h
+include/QuaZip-Qt5/quazip/quagzipfile.h
+include/QuaZip-Qt5/quazip/quaziodevice.h
+include/QuaZip-Qt5/quazip/quazip.h
+include/QuaZip-Qt5/quazip/quazip_global.h
+include/QuaZip-Qt5/quazip/quazip_qt_compat.h
+include/QuaZip-Qt5/quazip/quazipdir.h
+include/QuaZip-Qt5/quazip/quazipfile.h
+include/QuaZip-Qt5/quazip/quazipfileinfo.h
+include/QuaZip-Qt5/quazip/quazipnewinfo.h
+include/QuaZip-Qt5/quazip/unzip.h
+include/QuaZip-Qt5/quazip/zip.h
+lib/cmake/QuaZip-Qt5/
+lib/cmake/QuaZip-Qt5/QuaZip-Qt5Config.cmake
+lib/cmake/QuaZip-Qt5/QuaZip-Qt5ConfigVersion.cmake
+lib/cmake/QuaZip-Qt5/QuaZip-Qt5_SharedTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/QuaZip-Qt5/QuaZip-Qt5_SharedTargets.cmake
+@lib lib/libquazip1-qt5.so.${LIBquazip1-qt5_VERSION}
+lib/pkgconfig/quazip1-qt5.pc
Index: pkg/PFRAG.qt6
===================================================================
RCS file: pkg/PFRAG.qt6
diff -N pkg/PFRAG.qt6
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.qt6 30 Jun 2024 10:45:30 -0000
@@ -0,0 +1,27 @@
+include/QuaZip-Qt6/
+include/QuaZip-Qt6/quazip/
+include/QuaZip-Qt6/quazip/JlCompress.h
+include/QuaZip-Qt6/quazip/ioapi.h
+include/QuaZip-Qt6/quazip/minizip_crypt.h
+include/QuaZip-Qt6/quazip/quaadler32.h
+include/QuaZip-Qt6/quazip/quachecksum32.h
+include/QuaZip-Qt6/quazip/quacrc32.h
+include/QuaZip-Qt6/quazip/quagzipfile.h
+include/QuaZip-Qt6/quazip/quaziodevice.h
+include/QuaZip-Qt6/quazip/quazip.h
+include/QuaZip-Qt6/quazip/quazip_global.h
+include/QuaZip-Qt6/quazip/quazip_qt_compat.h
+include/QuaZip-Qt6/quazip/quazipdir.h
+include/QuaZip-Qt6/quazip/quazipfile.h
+include/QuaZip-Qt6/quazip/quazipfileinfo.h
+include/QuaZip-Qt6/quazip/quazipnewinfo.h
+include/QuaZip-Qt6/quazip/unzip.h
+include/QuaZip-Qt6/quazip/zip.h
+lib/cmake/
+lib/cmake/QuaZip-Qt6/
+lib/cmake/QuaZip-Qt6/QuaZip-Qt6Config.cmake
+lib/cmake/QuaZip-Qt6/QuaZip-Qt6ConfigVersion.cmake
+lib/cmake/QuaZip-Qt6/QuaZip-Qt6_SharedTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/QuaZip-Qt6/QuaZip-Qt6_SharedTargets.cmake
+@lib lib/libquazip1-qt6.so.${LIBquazip1-qt6_VERSION}
+lib/pkgconfig/quazip1-qt6.pc
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/archivers/quazip/pkg/PLIST,v
diff -u -p -r1.6 PLIST
--- pkg/PLIST 29 Aug 2022 13:32:29 -0000 1.6
+++ pkg/PLIST 30 Jun 2024 10:45:30 -0000
@@ -1,27 +1,2 @@
-@pkgpath archivers/quazip,qt5
-include/QuaZip-Qt5/
-include/QuaZip-Qt5/quazip/
-include/QuaZip-Qt5/quazip/JlCompress.h
-include/QuaZip-Qt5/quazip/ioapi.h
-include/QuaZip-Qt5/quazip/minizip_crypt.h
-include/QuaZip-Qt5/quazip/quaadler32.h
-include/QuaZip-Qt5/quazip/quachecksum32.h
-include/QuaZip-Qt5/quazip/quacrc32.h
-include/QuaZip-Qt5/quazip/quagzipfile.h
-include/QuaZip-Qt5/quazip/quaziodevice.h
-include/QuaZip-Qt5/quazip/quazip.h
-include/QuaZip-Qt5/quazip/quazip_global.h
-include/QuaZip-Qt5/quazip/quazip_qt_compat.h
-include/QuaZip-Qt5/quazip/quazipdir.h
-include/QuaZip-Qt5/quazip/quazipfile.h
-include/QuaZip-Qt5/quazip/quazipfileinfo.h
-include/QuaZip-Qt5/quazip/quazipnewinfo.h
-include/QuaZip-Qt5/quazip/unzip.h
-include/QuaZip-Qt5/quazip/zip.h
-lib/cmake/QuaZip-Qt5/
-lib/cmake/QuaZip-Qt5/QuaZip-Qt5Config.cmake
-lib/cmake/QuaZip-Qt5/QuaZip-Qt5ConfigVersion.cmake
-lib/cmake/QuaZip-Qt5/QuaZip-Qt5_SharedTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QuaZip-Qt5/QuaZip-Qt5_SharedTargets.cmake
-@lib lib/libquazip1-qt5.so.${LIBquazip1-qt5_VERSION}
-lib/pkgconfig/quazip1-qt5.pc
+%%qt6%%
+!%%qt6%%

No comments:

Post a Comment