From b037f3d103e531382d60a57513e9f4781405690e Mon Sep 17 00:00:00 2001 From: Matthias von Faber Date: Sun, 20 Oct 2019 08:14:51 +0200 Subject: [PATCH 1/2] nomacs: fix build --- srcpkgs/nomacs/patches/fix-build.patch | 39 ++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 srcpkgs/nomacs/patches/fix-build.patch diff --git a/srcpkgs/nomacs/patches/fix-build.patch b/srcpkgs/nomacs/patches/fix-build.patch new file mode 100644 index 00000000000..d927eaf523f --- /dev/null +++ b/srcpkgs/nomacs/patches/fix-build.patch @@ -0,0 +1,39 @@ +From 37805e3bc8753970127db101f4aa0c061bc5a70d Mon Sep 17 00:00:00 2001 +From: Michael Palimaka +Date: Sun, 9 Jun 2019 19:15:28 +1000 +Subject: [PATCH] Fix build with GCC9 + +--- + ImageLounge/src/DkCore/DkMetaData.cpp | 2 ++ + ImageLounge/src/DkGui/DkNoMacs.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git ImageLounge/src/DkCore/DkMetaData.cpp ImageLounge/src/DkCore/DkMetaData.cpp +index d195757e..affec7be 100644 +--- ImageLounge/src/DkCore/DkMetaData.cpp ++++ ImageLounge/src/DkCore/DkMetaData.cpp +@@ -42,6 +42,8 @@ + #include + #pragma warning(pop) // no warnings from includes - end + ++#include ++ + namespace nmc { + + // DkMetaDataT -------------------------------------------------------------------- +diff --git ImageLounge/src/DkGui/DkNoMacs.cpp ImageLounge/src/DkGui/DkNoMacs.cpp +index 6a412f70..bbfba233 100644 +--- ImageLounge/src/DkGui/DkNoMacs.cpp ++++ ImageLounge/src/DkGui/DkNoMacs.cpp +@@ -96,6 +96,8 @@ + #include + #endif + ++#include ++ + namespace nmc { + + DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) { +-- +2.23.0 + From 8979ecccc5b2a910c6d4db03c866f7af4bd9a884 Mon Sep 17 00:00:00 2001 From: Matthias von Faber Date: Sun, 20 Oct 2019 08:14:51 +0200 Subject: [PATCH 2/2] nomacs: enable translations --- srcpkgs/nomacs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template index ba4dac7af21..7f825a118c7 100644 --- a/srcpkgs/nomacs/template +++ b/srcpkgs/nomacs/template @@ -1,10 +1,10 @@ # Template file for 'nomacs' pkgname=nomacs version=3.12 -revision=2 +revision=3 build_wrksrc=ImageLounge build_style=cmake -configure_args="-DUSE_SYSTEM_QUAZIP=1" +configure_args="-DENABLE_TRANSLATIONS=1 -DUSE_SYSTEM_QUAZIP=1" hostmakedepends="pkg-config qt5-qmake qt5-host-tools quazip-devel" makedepends="qt5-tools-devel qt5-svg-devel exiv2-devel libopencv-devel libraw-devel quazip-devel"