Update nomacs to the latest stable version. Works very well with the
upcoming opencv3 update and also the black theme works.
Manual patch committed upstream.
RS
Index: Makefile
===
RCS file: /cvs/ports/graphics/nomacs/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile8 Mar 2019 20:00:47 - 1.21
+++ Makefile10 Mar 2019 14:20:54 -
@@ -4,8 +4,7 @@ COMMENT = small and fast Qt image viewer
GH_ACCOUNT = nomacs
GH_PROJECT = nomacs
-GH_TAGNAME = 3.10.2
-REVISION = 2
+GH_TAGNAME = 3.12
CATEGORIES = graphics
@@ -13,7 +12,7 @@ HOMEPAGE =https://nomacs.org
MAINTAINER = Rafael Sadowski
-SHARED_LIBS += nomacsCore3.0 # 3.3
+SHARED_LIBS += nomacsCore4.0 # 3.3
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/graphics/nomacs/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo15 Jul 2018 21:24:56 - 1.9
+++ distinfo10 Mar 2019 14:20:54 -
@@ -1,2 +1,2 @@
-SHA256 (nomacs-3.10.2.tar.gz) = ztkAoVSL5v7O9dGObtW9vJs+t0nt9iPFIzJ3mKdKTsA=
-SIZE (nomacs-3.10.2.tar.gz) = 32302506
+SHA256 (nomacs-3.12.tar.gz) = 9KMhaebAy5OZcdonMuTWfG4uZJUG2htVv8lJY6JigP8=
+SIZE (nomacs-3.12.tar.gz) = 1736648
Index: patches/patch-3rdparty_drif_drif_image_h
===
RCS file: patches/patch-3rdparty_drif_drif_image_h
diff -N patches/patch-3rdparty_drif_drif_image_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-3rdparty_drif_drif_image_h10 Mar 2019 14:20:54 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: 3rdparty/drif/drif_image.h
+--- 3rdparty/drif/drif_image.h.orig
3rdparty/drif/drif_image.h
+@@ -26,7 +26,7 @@
+ #include
+ #include
+
+-#ifdef Q_OS_MAC
++#if defined(Q_OS_MAC) || defined(Q_OS_OPENBSD)
+ #include
+ #else
+ #include
Index: patches/patch-cmake_UnixBuildTarget_cmake
===
RCS file: patches/patch-cmake_UnixBuildTarget_cmake
diff -N patches/patch-cmake_UnixBuildTarget_cmake
--- patches/patch-cmake_UnixBuildTarget_cmake 29 Jan 2018 22:33:07 -
1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.5 2018/01/29 22:33:07
rsadowski Exp $
-Index: cmake/UnixBuildTarget.cmake
cmake/UnixBuildTarget.cmake.orig
-+++ cmake/UnixBuildTarget.cmake
-@@ -79,7 +79,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix
- # translations
- install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations)
- # manpage
--install(FILES Readme/nomacs.1 DESTINATION share/man/man1)
-+if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-+install(FILES Readme/nomacs.1 DESTINATION man/man1)
-+else()
-+install(FILES Readme/nomacs.1 DESTINATION share/man/man1)
-+endif()
- # appdata
- install(FILES nomacs.appdata.xml DESTINATION share/metainfo/)
-
Index: patches/patch-cmake_Unix_cmake
===
RCS file: /cvs/ports/graphics/nomacs/patches/patch-cmake_Unix_cmake,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-cmake_Unix_cmake
--- patches/patch-cmake_Unix_cmake 6 Sep 2018 16:20:52 - 1.6
+++ patches/patch-cmake_Unix_cmake 10 Mar 2019 14:20:54 -
@@ -1,13 +1,11 @@
$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()
--- https://github.com/nomacs/nomacs/pull/187
Index: cmake/Unix.cmake
--- cmake/Unix.cmake.orig
+++ cmake/Unix.cmake
-@@ -66,6 +66,7 @@ if(ENABLE_RAW)
+@@ -67,6 +67,7 @@ if(ENABLE_RAW)
if(NOT LIBRAW_FOUND)
message(FATAL_ERROR "libraw not found. It's mandatory when used
with ENABLE_RAW enabled")
else()
@@ -15,12 +13,3 @@ 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()
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/nomacs/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST 3 Jul 2018 05:06:54 - 1.7
+++ pkg/PLIST 10 Mar 2019 14:20:54 -
@@ -6,35 +6,38 @@ share/applications/nomacs.desktop
share/metainfo/
share/metainfo/nomacs.appdata.xml
share/nomacs/
-share/nomacs/translations/
-share/nomacs/translations/nomacs_als.qm
