From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] nomacs: fix build, enable translations
Date: Sun, 20 Oct 2019 08:32:45 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-15637@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
There is a new pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/nomacs
https://github.com/void-linux/void-packages/pull/15637
nomacs: fix build, enable translations
Fixes #14271
A patch file from https://github.com/void-linux/void-packages/pull/15637.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/nomacs-15637.patch --]
[-- Type: text/x-diff, Size: 2629 bytes --]
From b037f3d103e531382d60a57513e9f4781405690e Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
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 <kensington@gentoo.org>
+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 <QApplication>
+ #pragma warning(pop) // no warnings from includes - end
+
++#include <iostream>
++
+ 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 <QWinTaskbarButton>
+ #endif
+
++#include <iostream>
++
+ namespace nmc {
+
+ DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {
+--
+2.23.0
+
From 8979ecccc5b2a910c6d4db03c866f7af4bd9a884 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
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"
next reply other threads:[~2019-10-20 6:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-20 6:32 voidlinux-github [this message]
2019-10-20 9:14 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-15637@inbox.vuxu.org \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).