Attachment #212729 for bug #245079

View | Details | Raw Unified | Return to bug 245079
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	nomacs
PORTVERSION=	3.14.2
PORTREVISION=	9
CATEGORIES=	graphics

MAINTAINER=	vidar@karlsen.tech
COMMENT=	Small, fast, and free image viewer

LICENSE=	GPLv3

LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
		libsysinfo.so:devel/libsysinfo \
		libopencv_highgui.so:graphics/opencv \
		libopencv_core.so:graphics/opencv-core \
		liblcms2.so:graphics/lcms2 \
		libquazip5.so:archivers/quazip

USES=		cmake compiler:c++11-lang desktop-file-utils \
		pkgconfig qt:5
USE_QT=		concurrent core gui network printsupport svg widgets \
		buildtools_build linguisttools_build qmake_build

USE_LDCONFIG=	yes

USE_GITHUB=	yes
OPTIONS_DEFAULT=	RAW TIFF

CMAKE_ARGS=		-DUSE_SYSTEM_QUAZIP=ON
CMAKE_SOURCE_PATH=	${WRKSRC}/ImageLounge

OPTIONS_DEFINE=		RAW TIFF TRANSLATIONS PLUGINS
OPTIONS_DEFAULT=	RAW TIFF TRANSLATIONS PLUGINS
OPTIONS_SUB=		yes

RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
RAW_CMAKE_BOOL=		ENABLE_RAW

TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
TIFF_CMAKE_BOOL=	ENABLE_TIFF

TRANSLATIONS_CMAKE_BOOL=	ENABLE_TRANSLATIONS
TRANSLATIONS_DESC=		Install translations

PLUGINS_GH_TUPLE=	nomacs:nomacs-plugins:3.14:plugins/ImageLounge/plugins
PLUGINS_CMAKE_ON=	ENABLE_PLUGINS

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)graphics/nomacs/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1503992141	1	TIMESTAMP = 1585235191
2	SHA256 (nomacs-nomacs-3.6.1_GH0.tar.gz) = 09b289cac51a5fdccc02aa4a60405bbbd4b5bfdb6b2a52ca5b0cb3b0f7a87068	2	SHA256 (nomacs-nomacs-3.14.2_GH0.tar.gz) = 0e9e59fac5e369c1141692b723c2139ca28d59a9b0a909f0685bc437d3aa183f
3	SIZE (nomacs-nomacs-3.6.1_GH0.tar.gz) = 28604636	3	SIZE (nomacs-nomacs-3.14.2_GH0.tar.gz) = 2169504
		4	SHA256 (nomacs-nomacs-plugins-3.14_GH0.tar.gz) = df752bc57c0136a367553457452ee5b44b35524536e5fea1b51083d4ac09b76a
		5	SIZE (nomacs-nomacs-plugins-3.14_GH0.tar.gz) = 514472

Line 0 Link Here

(-)graphics/nomacs/files/patch-ImageLounge_3rdparty_drif_drif__image.h (+11 lines)
	1	--- ImageLounge/3rdparty/drif/drif_image.h.orig 2020-03-25 14:20:37 UTC
	2	+++ ImageLounge/3rdparty/drif/drif_image.h
	3	@@ -26,7 +26,7 @@
	4	#include <stdint.h>
	5	#include <stdio.h>
	6
	7	-#if defined(Q_OS_MAC) \|\| defined(Q_OS_OPENBSD)
	8	+#if defined(Q_OS_MAC) \|\| defined(Q_OS_OPENBSD) \|\| defined(Q_OS_FREEBSD)
	9	#include <stdlib.h>
	10	#else
	11	#include <malloc.h>

Sent upstream: https://github.com/nomacs/nomacs/pull/187

From 6617595f409f13f035895f6494a4d8e14047334e Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Mon, 29 Jan 2018 12:01:50 +0100
Subject: [PATCH] cmake: Stop calling QT5_WRAP_CPP() when building quazip and
 libqpsd.

cmake/Utils.cmake already sets CMAKE_AUTOMOC to on.

Calling QT5_WRAP_CPP() used to be just redundant, as QUAZIP_MOC_SRC and
LIBQPSD_MOC_SRC were never actually added as source dependencies in
MacBuildTarget.cmake and UnixBuildTarget.cmake. In other words, CMake's own
automoc infrastructure was actually being used and the moc invocations from
QT5_WRAP_CPP() were not being made at all.

Starting with Qt 5.9.4, calling QT5_WRAP_CPP() disables the AUTOMOC property
on the macro's input files, which means neither CMake's automoc
infrastructure not QT5_WRAP_CPP()'s code were being used and we ended up
with several 'undefined reference to vtable' errors when linking.
--- cmake/Unix.cmake.orig	2017-03-24 14:47:13 UTC
+++ cmake/Unix.cmake
@@ -97,7 +97,6 @@ unset(QUAZIP_LIBRARIES CACHE)

 unset(QUAZIP_HEADERS CACHE)
 unset(QUAZIP_SOURCES CACHE)
-unset(QUAZIP_MOCS CACHE)
 unset(QT_ROOT CACHE)

 if(ENABLE_QUAZIP)
@@ -116,9 +115,7 @@ if(ENABLE_QUAZIP)

     file(GLOB QUAZIP_SOURCES "3rdparty/quazip-0.7/quazip/*.c" "3rdparty/quazip-0.7/quazip/*.cpp")
     file(GLOB QUAZIP_HEADERS "3rdparty/quazip-0.7/quazip/*.h")
-    file(GLOB QUAZIP_MOCS "3rdparty/quazip-0.7/quazip/*.h")

-    QT5_WRAP_CPP(QUAZIP_MOC_SRC ${QUAZIP_MOCS})
     add_definitions(-DWITH_QUAZIP)
   endif(USE_SYSTEM_QUAZIP)
 endif(ENABLE_QUAZIP)
@@ -132,6 +129,4 @@ IF(USE_SYSTEM_LIBQPSD)
 ELSE()
 	file(GLOB LIBQPSD_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.cpp")
 	file(GLOB LIBQPSD_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
-	file(GLOB LIBQPSD_MOCS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
-	QT5_WRAP_CPP(LIBQPSD_MOC_SRC ${LIBQPSD_MOCS})
 ENDIF(USE_SYSTEM_LIBQPSD)

Lines 1-11 Link Here

(-)graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake (-11 lines)
1	--- cmake/UnixBuildTarget.cmake.orig 2017-08-29 07:50:23 UTC
2	+++ cmake/UnixBuildTarget.cmake
3	@@ -80,7 +80,7 @@ install(FILES ${NOMACS_QM} DESTINATION share/nomacs/tr
4	# manpage
5	install(FILES Readme/nomacs.1 DESTINATION share/man/man1)
6	# appdata
7	-install(FILES nomacs.appdata.xml DESTINATION /usr/share/appdata/)
8	+install(FILES nomacs.appdata.xml DESTINATION share/appdata/)
9
10	# "make dist" target
11	string(TOLOWER ${PROJECT_NAME} CPACK_PACKAGE_NAME)




--- src/DkCore/DkMetaData.cpp.orig	2019-07-07 07:58:56 UTC
+++ src/DkCore/DkMetaData.cpp
@@ -40,6 +40,7 @@
 #include <QVector2D>
 #include <QApplication>
 #pragma warning(pop)		// no warnings from includes - end
+#include <iostream>
 
 namespace nmc {
 
@@ -1262,7 +1263,7 @@ void DkMetaDataT::printMetaData() const {
 
 	std::string xmpPacket;
 	if (0 != Exiv2::XmpParser::encode(xmpPacket, xmpData)) {
-		throw Exiv2::Error(1, "Failed to serialize XMP data");
+		throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, "Failed to serialize XMP data");
 	}
 	std::cout << xmpPacket << "\n";
 }




/wrkdirs/usr/ports/graphics/nomacs/work/nomacs-3.6.1/ImageLounge/src/DkCore/DkPluginManager.cpp:371:13: warning: '&&' within '||' [-Wlogical-op-parentheses]
        else if (p && p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch) {
                 ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~
/wrkdirs/usr/ports/graphics/nomacs/work/nomacs-3.6.1/ImageLounge/src/DkCore/DkPluginManager.cpp:371:13: note: place parentheses around the '&&' expression to silence this warning
        else if (p && p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch) {
                   ^
                 (                                                            )

--- src/DkCore/DkPluginManager.cpp.orig	2019-07-07 07:04:23 UTC
+++ src/DkCore/DkPluginManager.cpp
@@ -368,7 +368,7 @@ void DkPluginContainer::run() {
 		connect(vPlugin->getViewPort(), SIGNAL(showToolbar(QToolBar*, bool)), vPlugin->getMainWindow(), SLOT(showToolbar(QToolBar*, bool)));
 		emit runPlugin(vPlugin, false);
 	}
-	else if (p && p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch) {
+	else if (p && (p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch)) {
 
 		QAction* a = qobject_cast<QAction*>(QObject::sender());
 




bin/nomacs
lib/libnomacsCore.so
lib/libnomacsCore.so.3
lib/libnomacsCore.so.3.14.0
share/appdata/nomacs.appdata.xml
share/applications/nomacs.desktop
share/man/man1/nomacs.1.gz
share/metainfo/nomacs.appdata.xml
%%DATADIR%%/Image Lounge/themes/Dark-Theme.css
%%DATADIR%%/Image Lounge/themes/Light-Theme.css
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_af.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_als.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ar.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_az.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_bg.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_br_pt.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_bs.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ca.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_cs.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_da.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_de.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_el.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_en.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_es.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_et.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_fi.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_fr.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_he.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_hi.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_hr.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_hu.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_id.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_it.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ja.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ko.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_nl.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_no.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_pl.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_pt.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ro.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ru.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sk.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sl.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sr.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sv.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_tr.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_tw_zh.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_uk.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_vi.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_zh.qm
%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_zh_CN.qm
share/pixmaps/nomacs.svg
%%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so
%%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so.3
%%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so.3.14.0
%%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so
%%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so.3
%%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so.3.14.0
%%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so
%%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so.3
%%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so.3.14.0
%%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so
%%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so.3
%%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so.3.14.0

Return to bug 245079

Lines 1-39 Link Here

(-)graphics/nomacs/Makefile (-13 / +20 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= nomacs	3	PORTNAME= nomacs
4	PORTVERSION= 3.6.1	4	PORTVERSION= 3.14.2
5	PORTREVISION= 9
6	CATEGORIES= graphics	5	CATEGORIES= graphics
7		6
8	MAINTAINER= ports@FreeBSD.org	7	MAINTAINER= vidar@karlsen.tech
9	COMMENT= Small, fast, and free image viewer	8	COMMENT= Small, fast, and free image viewer
10		9
11	LICENSE= GPLv3	10	LICENSE= GPLv3
12		11
13	LIB_DEPENDS= libexiv2.so:graphics/exiv2 \	12	LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
14	libsysinfo.so:devel/libsysinfo \
15	libopencv_highgui.so:graphics/opencv \	13	libopencv_highgui.so:graphics/opencv \
16	libopencv_core.so:graphics/opencv-core \	14	libopencv_core.so:graphics/opencv-core \
17	liblcms2.so:graphics/lcms2 \	15	liblcms2.so:graphics/lcms2 \
18	libtbb.so:devel/tbb	16	libquazip5.so:archivers/quazip
19		17
20	USES= cmake compiler:c++11-lang desktop-file-utils dos2unix \	18	USES= cmake compiler:c++11-lang desktop-file-utils \
21	pkgconfig qt:5 tar:bzip2	19	pkgconfig qt:5
22	USE_QT= concurrent core gui network printsupport svg widgets \	20	USE_QT= concurrent core gui network printsupport svg widgets \
23	buildtools_build linguisttools_build qmake_build	21	buildtools_build linguisttools_build qmake_build
24		22
25	DOS2UNIX_REGEX= .*\.(cpp\|h\|txt)	23	USE_LDCONFIG= yes
26		24
27	OPTIONS_DEFINE= RAW TIFF	25	USE_GITHUB= yes
28	OPTIONS_DEFAULT= RAW TIFF
29		26
		27	CMAKE_ARGS= -DUSE_SYSTEM_QUAZIP=ON
		28	CMAKE_SOURCE_PATH= ${WRKSRC}/ImageLounge
		29
		30	OPTIONS_DEFINE= RAW TIFF TRANSLATIONS PLUGINS
		31	OPTIONS_DEFAULT= RAW TIFF TRANSLATIONS PLUGINS
		32	OPTIONS_SUB= yes
		33
30	RAW_LIB_DEPENDS= libraw.so:graphics/libraw	34	RAW_LIB_DEPENDS= libraw.so:graphics/libraw
31	RAW_CMAKE_BOOL= ENABLE_RAW	35	RAW_CMAKE_BOOL= ENABLE_RAW
32		36
33	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff	37	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
34	TIFF_CMAKE_BOOL= ENABLE_TIFF	38	TIFF_CMAKE_BOOL= ENABLE_TIFF
35		39
36	USE_GITHUB= yes	40	TRANSLATIONS_CMAKE_BOOL= ENABLE_TRANSLATIONS
37	WRKSRC_SUBDIR= ImageLounge	41	TRANSLATIONS_DESC= Install translations
38		42
		43	PLUGINS_GH_TUPLE= nomacs:nomacs-plugins:3.14:plugins/ImageLounge/plugins
		44	PLUGINS_CMAKE_ON= ENABLE_PLUGINS
		45
39	.include <bsd.port.mk>	46	.include <bsd.port.mk>

Lines 1-47 Link Here

(-)graphics/nomacs/files/patch-cmake_Unix.cmake (-47 lines)
1	Sent upstream: https://github.com/nomacs/nomacs/pull/187
2
3	From 6617595f409f13f035895f6494a4d8e14047334e Mon Sep 17 00:00:00 2001
4	From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
5	Date: Mon, 29 Jan 2018 12:01:50 +0100
6	Subject: [PATCH] cmake: Stop calling QT5_WRAP_CPP() when building quazip and
7	libqpsd.
8
9	cmake/Utils.cmake already sets CMAKE_AUTOMOC to on.
10
11	Calling QT5_WRAP_CPP() used to be just redundant, as QUAZIP_MOC_SRC and
12	LIBQPSD_MOC_SRC were never actually added as source dependencies in
13	MacBuildTarget.cmake and UnixBuildTarget.cmake. In other words, CMake's own
14	automoc infrastructure was actually being used and the moc invocations from
15	QT5_WRAP_CPP() were not being made at all.
16
17	Starting with Qt 5.9.4, calling QT5_WRAP_CPP() disables the AUTOMOC property
18	on the macro's input files, which means neither CMake's automoc
19	infrastructure not QT5_WRAP_CPP()'s code were being used and we ended up
20	with several 'undefined reference to vtable' errors when linking.
21	--- cmake/Unix.cmake.orig 2017-03-24 14:47:13 UTC
22	+++ cmake/Unix.cmake
23	@@ -97,7 +97,6 @@ unset(QUAZIP_LIBRARIES CACHE)
24
25	unset(QUAZIP_HEADERS CACHE)
26	unset(QUAZIP_SOURCES CACHE)
27	-unset(QUAZIP_MOCS CACHE)
28	unset(QT_ROOT CACHE)
29
30	if(ENABLE_QUAZIP)
31	@@ -116,9 +115,7 @@ if(ENABLE_QUAZIP)
32
33	file(GLOB QUAZIP_SOURCES "3rdparty/quazip-0.7/quazip/.c" "3rdparty/quazip-0.7/quazip/.cpp")
34	file(GLOB QUAZIP_HEADERS "3rdparty/quazip-0.7/quazip/*.h")
35	- file(GLOB QUAZIP_MOCS "3rdparty/quazip-0.7/quazip/*.h")
36
37	- QT5_WRAP_CPP(QUAZIP_MOC_SRC ${QUAZIP_MOCS})
38	add_definitions(-DWITH_QUAZIP)
39	endif(USE_SYSTEM_QUAZIP)
40	endif(ENABLE_QUAZIP)
41	@@ -132,6 +129,4 @@ IF(USE_SYSTEM_LIBQPSD)
42	ELSE()
43	file(GLOB LIBQPSD_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.cpp")
44	file(GLOB LIBQPSD_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
45	- file(GLOB LIBQPSD_MOCS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
46	- QT5_WRAP_CPP(LIBQPSD_MOC_SRC ${LIBQPSD_MOCS})
47	ENDIF(USE_SYSTEM_LIBQPSD)

Lines 1-19 Link Here

(-)graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp (-19 lines)
1	--- src/DkCore/DkMetaData.cpp.orig 2019-07-07 07:58:56 UTC
2	+++ src/DkCore/DkMetaData.cpp
3	@@ -40,6 +40,7 @@
4	#include <QVector2D>
5	#include <QApplication>
6	#pragma warning(pop) // no warnings from includes - end
7	+#include <iostream>
8
9	namespace nmc {
10
11	@@ -1262,7 +1263,7 @@ void DkMetaDataT::printMetaData() const {
12
13	std::string xmpPacket;
14	if (0 != Exiv2::XmpParser::encode(xmpPacket, xmpData)) {
15	- throw Exiv2::Error(1, "Failed to serialize XMP data");
16	+ throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, "Failed to serialize XMP data");
17	}
18	std::cout << xmpPacket << "\n";
19	}

Lines 1-19 Link Here

(-)graphics/nomacs/files/patch-src_DkCore_DkPluginManager.cpp (-19 lines)
1	/wrkdirs/usr/ports/graphics/nomacs/work/nomacs-3.6.1/ImageLounge/src/DkCore/DkPluginManager.cpp:371:13: warning: '&&' within '\|\|' [-Wlogical-op-parentheses]
2	else if (p && p->interfaceType() == DkPluginInterface::interface_basic \|\| p->interfaceType() == DkPluginInterface::interface_batch) {
3	~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~
4	/wrkdirs/usr/ports/graphics/nomacs/work/nomacs-3.6.1/ImageLounge/src/DkCore/DkPluginManager.cpp:371:13: note: place parentheses around the '&&' expression to silence this warning
5	else if (p && p->interfaceType() == DkPluginInterface::interface_basic \|\| p->interfaceType() == DkPluginInterface::interface_batch) {
6	^
7	( )
8
9	--- src/DkCore/DkPluginManager.cpp.orig 2019-07-07 07:04:23 UTC
10	+++ src/DkCore/DkPluginManager.cpp
11	@@ -368,7 +368,7 @@ void DkPluginContainer::run() {
12	connect(vPlugin->getViewPort(), SIGNAL(showToolbar(QToolBar, bool)), vPlugin->getMainWindow(), SLOT(showToolbar(QToolBar, bool)));
13	emit runPlugin(vPlugin, false);
14	}
15	- else if (p && p->interfaceType() == DkPluginInterface::interface_basic \|\| p->interfaceType() == DkPluginInterface::interface_batch) {
16	+ else if (p && (p->interfaceType() == DkPluginInterface::interface_basic \|\| p->interfaceType() == DkPluginInterface::interface_batch)) {
17
18	QAction* a = qobject_cast<QAction*>(QObject::sender());
19

Lines 1-33 Link Here

(-)graphics/nomacs/pkg-plist (-27 / +57 lines)
1	bin/nomacs	1	bin/nomacs
2	lib/libnomacsCore.so	2	lib/libnomacsCore.so
3	lib/libnomacsCore.so.3	3	lib/libnomacsCore.so.3
4	lib/libnomacsCore.so.3.6.0	4	lib/libnomacsCore.so.3.14.0
5	share/appdata/nomacs.appdata.xml
6	share/applications/nomacs.desktop	5	share/applications/nomacs.desktop
7	share/man/man1/nomacs.1.gz	6	share/man/man1/nomacs.1.gz
8	%%DATADIR%%/translations/nomacs_als.qm	7	share/metainfo/nomacs.appdata.xml
9	%%DATADIR%%/translations/nomacs_ar.qm	8	%%DATADIR%%/Image Lounge/themes/Dark-Theme.css
10	%%DATADIR%%/translations/nomacs_az.qm	9	%%DATADIR%%/Image Lounge/themes/Light-Theme.css
11	%%DATADIR%%/translations/nomacs_bg.qm	10	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_af.qm
12	%%DATADIR%%/translations/nomacs_bs.qm	11	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_als.qm
13	%%DATADIR%%/translations/nomacs_cs.qm	12	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ar.qm
14	%%DATADIR%%/translations/nomacs_de.qm	13	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_az.qm
15	%%DATADIR%%/translations/nomacs_en.qm	14	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_bg.qm
16	%%DATADIR%%/translations/nomacs_es.qm	15	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_br_pt.qm
17	%%DATADIR%%/translations/nomacs_fr.qm	16	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_bs.qm
18	%%DATADIR%%/translations/nomacs_hr.qm	17	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ca.qm
19	%%DATADIR%%/translations/nomacs_it.qm	18	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_cs.qm
20	%%DATADIR%%/translations/nomacs_ja.qm	19	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_da.qm
21	%%DATADIR%%/translations/nomacs_ko.qm	20	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_de.qm
22	%%DATADIR%%/translations/nomacs_nl.qm	21	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_el.qm
23	%%DATADIR%%/translations/nomacs_pl.qm	22	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_en.qm
24	%%DATADIR%%/translations/nomacs_pt.qm	23	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_es.qm
25	%%DATADIR%%/translations/nomacs_ru.qm	24	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_et.qm
26	%%DATADIR%%/translations/nomacs_sk.qm	25	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_fi.qm
27	%%DATADIR%%/translations/nomacs_sl.qm	26	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_fr.qm
28	%%DATADIR%%/translations/nomacs_sr.qm	27	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_he.qm
29	%%DATADIR%%/translations/nomacs_sv.qm	28	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_hi.qm
30	%%DATADIR%%/translations/nomacs_tr.qm	29	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_hr.qm
31	%%DATADIR%%/translations/nomacs_uk.qm	30	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_hu.qm
32	%%DATADIR%%/translations/nomacs_zh.qm	31	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_id.qm
		32	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_it.qm
		33	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ja.qm
		34	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ko.qm
		35	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_nl.qm
		36	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_no.qm
		37	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_pl.qm
		38	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_pt.qm
		39	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ro.qm
		40	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ru.qm
		41	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sk.qm
		42	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sl.qm
		43	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sr.qm
		44	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sv.qm
		45	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_tr.qm
		46	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_tw_zh.qm
		47	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_uk.qm
		48	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_vi.qm
		49	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_zh.qm
		50	%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_zh_CN.qm
33	share/pixmaps/nomacs.svg	51	share/pixmaps/nomacs.svg
		52	%%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so
		53	%%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so.3
		54	%%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so.3.14.0
		55	%%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so
		56	%%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so.3
		57	%%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so.3.14.0
		58	%%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so
		59	%%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so.3
		60	%%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so.3.14.0
		61	%%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so
		62	%%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so.3
		63	%%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so.3.14.0