Update to quazip-0.8.1
Remove the qt5 FLAVOR; qt5 is the only supported/used version these days. Disable the tests; they've not been updated for qt5 and aren't accessible from the standard cmake build system. Update all dependent ports to cope with the FLAVOR removal. Requested by rsadowski@; improvements by sthen@
This commit is contained in:
bcallah
parent
7049a963e6
commit
61a1b882b3
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.98 2019/12/21 14:17:59 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.99 2020/01/25 22:57:56 bcallah Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += arc
|
||||
@ -57,7 +57,6 @@
|
||||
SUBDIR += py-rarfile
|
||||
SUBDIR += py-rarfile,python3
|
||||
SUBDIR += quazip
|
||||
SUBDIR += quazip,qt5
|
||||
SUBDIR += ripole
|
||||
SUBDIR += ruby-minitar
|
||||
SUBDIR += rzip
|
||||
|
||||
@ -1,55 +1,41 @@
|
||||
# $OpenBSD: Makefile,v 1.18 2019/07/12 20:43:29 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.19 2020/01/25 22:57:56 bcallah 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
|
||||
V = 0.8.1
|
||||
GH_TAGNAME = v$V
|
||||
PKGNAME = quazip-qt5-$V
|
||||
|
||||
HOMEPAGE = http://quazip.sourceforge.net/
|
||||
SHARED_LIBS += quazip5 3.0 # 1.0
|
||||
|
||||
HOMEPAGE = https://stachenov.github.io/quazip/
|
||||
MAINTAINER = Brian Callahan <bcallah@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
|
||||
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
|
||||
#MODQMAKE_PROJECTS = qztest/qztest.pro
|
||||
|
||||
FLAVORS = qt5
|
||||
FLAVOR ?=
|
||||
|
||||
.if ${FLAVOR:Mqt5}
|
||||
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
|
||||
#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>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,21 +1,22 @@
|
||||
@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
|
||||
@comment $OpenBSD: PLIST,v 1.4 2020/01/25 22:57:56 bcallah Exp $
|
||||
@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
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2019/07/12 20:46:15 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2020/01/25 22:57:56 bcallah Exp $
|
||||
|
||||
COMMENT = free chess database and analyzer
|
||||
DISTNAME = chessx-1.4.6
|
||||
CATEGORIES = games
|
||||
HOMEPAGE = http://chessx.sourceforge.net/
|
||||
REVISION = 3
|
||||
REVISION = 4
|
||||
|
||||
# GPLv2+
|
||||
PERMIT_PACKAGE = Yes
|
||||
@ -18,7 +18,7 @@ EXTRACT_SUFX = .tgz
|
||||
|
||||
MODULES = x11/qt5 devel/qmake
|
||||
RUN_DEPENDS = devel/desktop-file-utils
|
||||
LIB_DEPENDS = archivers/quazip,qt5 \
|
||||
LIB_DEPENDS = archivers/quazip \
|
||||
x11/qt5/qtmultimedia \
|
||||
x11/qt5/qtsvg
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.40 2019/11/20 12:57:05 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.41 2020/01/25 22:57:56 bcallah Exp $
|
||||
|
||||
COMMENT = OpenStreetMap editor
|
||||
REVISION = 0
|
||||
|
||||
GH_ACCOUNT = openstreetmap
|
||||
GH_PROJECT = merkaartor
|
||||
@ -23,7 +24,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
|
||||
LIB_DEPENDS = devel/proj \
|
||||
x11/qt5/qtwebkit \
|
||||
x11/qt5/qtsvg \
|
||||
archivers/quazip,qt5 \
|
||||
archivers/quazip \
|
||||
geo/gdal
|
||||
|
||||
MODQMAKE_ARGS = SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.37 2019/11/28 21:31:07 rsadowski Exp $
|
||||
# $OpenBSD: Makefile,v 1.38 2020/01/25 22:57:56 bcallah Exp $
|
||||
|
||||
COMMENT = advanced drawing and image manipulation
|
||||
|
||||
VERSION = 4.2.8.2
|
||||
DISTNAME = krita-${VERSION}
|
||||
REVISION = 0
|
||||
|
||||
SHARED_LIBS += kritabasicflakes 2.0 # 16.0
|
||||
SHARED_LIBS += kritacolord 1.0 # 16.0
|
||||
@ -66,7 +67,7 @@ RUN_DEPENDS += devel/desktop-file-utils \
|
||||
x11/gtk+3,-guic \
|
||||
x11/qt5/qtquickcontrols
|
||||
|
||||
LIB_DEPENDS += archivers/quazip,qt5 \
|
||||
LIB_DEPENDS += archivers/quazip \
|
||||
devel/boost \
|
||||
devel/gsl \
|
||||
devel/kf5/karchive \
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.25 2020/01/18 09:05:40 rsadowski Exp $
|
||||
# $OpenBSD: Makefile,v 1.26 2020/01/25 22:57:56 bcallah Exp $
|
||||
|
||||
COMMENT = small and fast Qt image viewer
|
||||
|
||||
GH_ACCOUNT = nomacs
|
||||
GH_PROJECT = nomacs
|
||||
GH_TAGNAME = 3.12
|
||||
REVISION = 1
|
||||
REVISION = 2
|
||||
|
||||
CATEGORIES = graphics
|
||||
|
||||
@ -28,7 +28,7 @@ MODULES = devel/cmake \
|
||||
RUN_DEPENDS = devel/desktop-file-utils \
|
||||
x11/qt5/qtimageformats
|
||||
|
||||
LIB_DEPENDS = archivers/quazip,qt5 \
|
||||
LIB_DEPENDS = archivers/quazip \
|
||||
graphics/exiv2 \
|
||||
graphics/lcms2 \
|
||||
graphics/libraw \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user