Update diff to use QuaZip 1.3. Comments, ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/nomacs/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile 11 Mar 2022 19:22:54 -0000 1.31
+++ Makefile 27 Aug 2022 04:57:56 -0000
@@ -3,6 +3,7 @@ COMMENT = small and fast Qt image viewer
GH_ACCOUNT = nomacs
GH_PROJECT = nomacs
GH_TAGNAME = 3.17.2206
+REVISION = 0
CATEGORIES = graphics
@@ -17,7 +18,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5Gui Qt5Network
WANTLIB += Qt5PrintSupport Qt5Svg Qt5Widgets c exiv2 lcms2 m opencv_core
-WANTLIB += opencv_imgproc quazip5 raw tiff
+WANTLIB += opencv_imgproc quazip1-qt5 raw tiff z
MODULES = devel/cmake \
x11/qt5 \
@@ -26,7 +27,7 @@ RUN_DEPENDS = devel/desktop-file-utils
x11/gtk+3,-guic \
x11/qt5/qtimageformats
-LIB_DEPENDS = archivers/quazip \
+LIB_DEPENDS = archivers/quazip>=1.3 \
graphics/exiv2 \
graphics/lcms2 \
graphics/libraw \
@@ -42,8 +43,10 @@ WRKDIST = ${WRKDIR}/${PKGNAME}/ImageLou
NO_TEST = Yes
+CXXFLAGS += -I${LOCALBASE}/include/QuaZip-Qt5/
+
pre-configure:
find ${WRKSRC} -type f -name "*.cpp" -exec sed -i \
- 's,<quazip/JlCompress.h>,<quazip5/JlCompress.h>,' {} \;
+ 's,<quazip5/JlCompress.h>,<quazip/JlCompress.h>,' {} \;
.include <bsd.port.mk>
Index: patches/patch-cmake_Unix_cmake
===================================================================
RCS file: patches/patch-cmake_Unix_cmake
diff -N patches/patch-cmake_Unix_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cmake_Unix_cmake 27 Aug 2022 04:57:56 -0000
@@ -0,0 +1,26 @@
+Index: cmake/Unix.cmake
+--- cmake/Unix.cmake.orig
++++ cmake/Unix.cmake
+@@ -94,7 +94,6 @@ unset(QUAZIP_LIBS CACHE)
+ unset(QUAZIP_BUILD_DIRECTORY CACHE)
+ unset(QUAZIP_DEPENDENCY CACHE)
+ unset(QUAZIP_FOUND CACHE)
+-unset(QUAZIP_LIBRARIES CACHE)
+
+ unset(QUAZIP_HEADERS CACHE)
+ unset(QUAZIP_SOURCES CACHE)
+@@ -104,11 +103,12 @@ if(ENABLE_QUAZIP)
+ if(USE_SYSTEM_QUAZIP)
+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+- find_package(QuaZip5 QUIET)
+- if(NOT QUAZIP_FOUND)
++ find_package(QuaZip-Qt5 QUIET)
++ if(NOT QuaZip-Qt5_FOUND)
+ message(FATAL_ERROR "QUAZIP not found. It's mandatory when used
with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
+ else()
+ add_definitions(-DWITH_QUAZIP)
++ set(QUAZIP_LIBRARIES "QuaZip::QuaZip")
+ endif()
+ else()
+ find_package(ZLIB REQUIRED)
