diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile index 842b0ae8469..ccc6460ce13 100644 --- a/graphics/nomacs/Makefile +++ b/graphics/nomacs/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.17 2018/07/15 21:24:56 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.18 2018/09/06 16:20:52 rsadowski Exp $ COMMENT = small and fast Qt image viewer GH_ACCOUNT = nomacs GH_PROJECT = nomacs GH_TAGNAME = 3.10.2 +REVISION = 0 CATEGORIES = graphics @@ -17,17 +18,16 @@ SHARED_LIBS += nomacsCore 3.0 # 3.3 # GPLv3 PERMIT_PACKAGE_CDROM = Yes -WANTLIB += Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5PrintSupport -WANTLIB += Qt5Svg Qt5Widgets c exiv2 lcms2 m opencv_core opencv_imgproc -WANTLIB += pthread raw tiff quazip -WANTLIB += ${COMPILER_LIBCXX} +WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5Gui Qt5Network +WANTLIB += Qt5PrintSupport Qt5Svg Qt5Widgets c exiv2 lcms2 m opencv_core +WANTLIB += opencv_imgproc quazip5 raw tiff MODULES = devel/cmake \ x11/qt5 \ RUN_DEPENDS = devel/desktop-file-utils -LIB_DEPENDS = archivers/quazip \ +LIB_DEPENDS = archivers/quazip,qt5 \ graphics/exiv2 \ graphics/lcms2 \ graphics/libraw \ diff --git a/graphics/nomacs/patches/patch-cmake_Unix_cmake b/graphics/nomacs/patches/patch-cmake_Unix_cmake index f9fc04b03b3..56df26b7ef3 100644 --- a/graphics/nomacs/patches/patch-cmake_Unix_cmake +++ b/graphics/nomacs/patches/patch-cmake_Unix_cmake @@ -1,4 +1,4 @@ -$OpenBSD: patch-cmake_Unix_cmake,v 1.5 2018/07/03 05:06:54 rsadowski Exp $ +$OpenBSD: patch-cmake_Unix_cmake,v 1.6 2018/09/06 16:20:52 rsadowski Exp $ - Avoid forced linkage with libstdc++. - drop CMake calls to QT5_WRAP_CPP() @@ -15,3 +15,12 @@ Index: cmake/Unix.cmake add_definitions(-DWITH_LIBRAW) endif() endif(ENABLE_RAW) +@@ -103,7 +104,7 @@ if(ENABLE_QUAZIP) + if(USE_SYSTEM_QUAZIP) + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + +- find_package(QuaZIP REQUIRED) ++ find_package(QuaZip5 REQUIRED) + if(NOT QUAZIP_FOUND) + message(FATAL_ERROR "QUAZIP not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP") + else()