On 2020-01-25 3:51 PM, Stuart Henderson wrote:
On 2020/01/25 15:46, Brian Callahan wrote:
On 2020-01-25 3:25 PM, Brian Callahan wrote:
Hi ports --
rsadowski@ informed me that quazip upstream has moved, and that there
was a new version available, and that all our consumers only use the qt5
FLAVOR, and asked if I could update the quazip port.
This diff removes the qt4 pieces, leaving just a qt5 port (FLAVOR
removed).
Major bump to the shared lib, since there are symbol removals.
The tests do not seem to have been updated to work with qt5 and are not
reachable by cmake, as evidenced by the do-test target. I left the
tendrils in the port Makefile but commented out in case someone wants to
update the tests. I don't know enough Qt to make sense of what is going
wrong.
All dependent ports build OK. All have been updated to deal with the new
quazip reality.
OK?
~Brian
Just discovered this won't properly update quazip-qt5-0.7.3 to quazip-0.8.1;
hints welcome.
~Brian
The simple way is to keep the quazip-qt5 naming.
The more complex way is to add to $stem_extensions in quirks and add an
@conflict quazip-qt5-* marker to the plist.
I took the simple way, if that works for others. Seems to have the
upside of not needing to massage the dependent ports if we don't want.
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/archivers/quazip/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 12 Jul 2019 20:43:29 -0000 1.18
+++ Makefile 25 Jan 2020 21:15:15 -0000
@@ -1,55 +1,43 @@
# $OpenBSD: Makefile,v 1.18 2019/07/12 20:43:29 sthen Exp $
COMMENT = Qt/C++ wrapper for ZIP/UNZIP package
-DISTNAME = quazip-0.7.3
-REVISION = 4
CATEGORIES = archivers
-# keep those in sync
-SHARED_LIBS = quazip 2.0 # 1.0
-SHARED_LIBS += quazip5 2.0 # 1.0
+GH_ACCOUNT = stachenov
+GH_PROJECT = quazip
+GH_TAGNAME = v0.8.1
-HOMEPAGE = http://quazip.sourceforge.net/
+SHARED_LIBS += quazip5 3.0 # 1.0
+
+HOMEPAGE = https://stachenov.github.io/quazip/
MAINTAINER = Brian Callahan <bcal...@openbsd.org>
# LGPLv2.1 with static linking exception
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} m z
-
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=quazip/}
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core m z
COMPILER = base-clang ports-gcc base-gcc
-MODULES = devel/cmake devel/qmake
-# qmake.port.mk is used for tests only
-MODQMAKE_PROJECTS = qztest/qztest.pro
+MODULES = devel/cmake \
+ x11/qt5
FLAVORS = qt5
-FLAVOR ?=
-
-.if ${FLAVOR:Mqt5}
+FLAVOR ?= qt5
FULLPKGNAME = ${PKGNAME:C/-/-qt5-/}
-MODULES += x11/qt5
-WANTLIB += Qt5Core
-CONFIGURE_ARGS = -DBUILD_WITH_QT4=No
-CONFIGURE_ENV = CXXFLAGS="${CXXFLAGS} -std=c++11"
-CMAKENAME = QuaZip5
-.else
-MODULES += x11/qt4
-CONFIGURE_ARGS = -DBUILD_WITH_QT4=Yes
-CMAKENAME = QuaZip
-.endif
-
-LIBNAME = ${CMAKENAME:L}
-SUBST_VARS = CMAKENAME LIBNAME
-
-do-test:
- mkdir -p ${WRKBUILD}/qztest
- ln -sf ../lib${LIBNAME}.so.${LIBquazip_VERSION} ${WRKBUILD}/quazip/libquazip.so.${LIBquazip_VERSION}
- ${MODQMAKE_configure}
- ${MODQMAKE_build}
- cd ${WRKBUILD}/qztest; \
- env LD_LIBRARY_PATH=${WRKBUILD}/quazip ./qztest
+
+NO_TEST = Yes
+
+# Add back devel/qmake to MODULES if fixing tests
+# qmake.port.mk is used for tests only
+#MODQMAKE_PROJECTS = qztest/qztest.pro
+
+#do-test:
+# mkdir -p ${WRKBUILD}/qztest
+# ln -sf ../libquazip5.so.${LIBquazip5_VERSION} ${WRKBUILD}/quazip/libquazip5.so.${LIBquazip5_VERSION}
+# ${MODQMAKE_configure}
+# ${MODQMAKE_build}
+# cd ${WRKBUILD}/qztest; \
+# env LD_LIBRARY_PATH=${WRKBUILD}/quazip ./qztest
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/archivers/quazip/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 30 Jun 2017 22:11:09 -0000 1.6
+++ distinfo 25 Jan 2020 21:15:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (quazip-0.7.3.tar.gz) = KtTzVHRugmDUYDbN4UlsIj7Hl2UEHqKOuSDO0BXiabU=
-SIZE (quazip-0.7.3.tar.gz) = 439536
+SHA256 (quazip-0.8.1.tar.gz) = T9pNQkjggBW1CQ0Dae+eaL3ER1qhJJT3wPbXnkMnDRQ=
+SIZE (quazip-0.8.1.tar.gz) = 150584
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/archivers/quazip/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 26 Dec 2016 12:38:07 -0000 1.3
+++ pkg/PLIST 25 Jan 2020 21:15:15 -0000
@@ -1,21 +1,21 @@
@comment $OpenBSD: PLIST,v 1.3 2016/12/26 12:38:07 zhuk Exp $
-include/${LIBNAME}/
-include/${LIBNAME}/JlCompress.h
-include/${LIBNAME}/crypt.h
-include/${LIBNAME}/ioapi.h
-include/${LIBNAME}/quaadler32.h
-include/${LIBNAME}/quachecksum32.h
-include/${LIBNAME}/quacrc32.h
-include/${LIBNAME}/quagzipfile.h
-include/${LIBNAME}/quaziodevice.h
-include/${LIBNAME}/quazip.h
-include/${LIBNAME}/quazip_global.h
-include/${LIBNAME}/quazipdir.h
-include/${LIBNAME}/quazipfile.h
-include/${LIBNAME}/quazipfileinfo.h
-include/${LIBNAME}/quazipnewinfo.h
-include/${LIBNAME}/unzip.h
-include/${LIBNAME}/zip.h
-lib/lib${LIBNAME}.a
-@lib lib/lib${LIBNAME}.so.${LIBquazip_VERSION}
-share/cmake/Modules/Find${CMAKENAME}.cmake
+include/quazip5/
+include/quazip5/JlCompress.h
+include/quazip5/ioapi.h
+include/quazip5/minizip_crypt.h
+include/quazip5/quaadler32.h
+include/quazip5/quachecksum32.h
+include/quazip5/quacrc32.h
+include/quazip5/quagzipfile.h
+include/quazip5/quaziodevice.h
+include/quazip5/quazip.h
+include/quazip5/quazip_global.h
+include/quazip5/quazipdir.h
+include/quazip5/quazipfile.h
+include/quazip5/quazipfileinfo.h
+include/quazip5/quazipnewinfo.h
+include/quazip5/unzip.h
+include/quazip5/zip.h
+@static-lib lib/libquazip5.a
+@lib lib/libquazip5.so.${LIBquazip5_VERSION}
+share/cmake/Modules/FindQuaZip5.cmake
