Update quazip to 1.3

- Remove uncomment likes in Makefile. "make test" works quite well.
- Patch out the hardcoded version in the include path. For example:
  Instead of include/QuaZip-Qt5-1.3/quazip/ we use include/QuaZip-Qt5/quazip/.
  This safe use from updating ports that don't use the CMake module.

OK bcallah@ (maintainer)
This commit is contained in:
rsadowski 2022-08-29 13:32:29 +00:00
parent 2628d6aa03
commit e3ac217b56
4 changed files with 44 additions and 39 deletions

View File

@ -3,11 +3,11 @@ CATEGORIES = archivers
GH_ACCOUNT = stachenov
GH_PROJECT = quazip
V = 0.8.1
V = 1.3
GH_TAGNAME = v$V
PKGNAME = quazip-qt5-$V
SHARED_LIBS += quazip5 3.0 # 1.0
SHARED_LIBS += quazip1-qt5 0.0 # 0.0
HOMEPAGE = https://stachenov.github.io/quazip/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
@ -17,23 +17,10 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} Qt5Core m z
COMPILER = base-clang ports-gcc base-gcc
MODULES = devel/cmake \
x11/qt5
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
CONFIGURE_ARGS += -DQUAZIP_ENABLE_TESTS=ON \
-DQUAZIP_QT_MAJOR_VERSION=5
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (quazip-0.8.1.tar.gz) = T9pNQkjggBW1CQ0Dae+eaL3ER1qhJJT3wPbXnkMnDRQ=
SIZE (quazip-0.8.1.tar.gz) = 150584
SHA256 (quazip-1.3.tar.gz) = wSOVWc1oYMq4Cg/YH0IE5gb5Mk9wLathZrCWBnbuF1Q=
SIZE (quazip-1.3.tar.gz) = 156138

View File

@ -0,0 +1,12 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -46,7 +46,7 @@ set(QUAZIP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(QUAZIP_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(QUAZIP_LIB_FILE_NAME quazip${QuaZip_VERSION_MAJOR}-qt${QUAZIP_QT_MAJOR_VERSION})
set(QUAZIP_LIB_TARGET_NAME QuaZip)
-set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
+set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)

View File

@ -1,21 +1,27 @@
@pkgpath archivers/quazip,qt5
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
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