summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2019-08-10 11:13:27 +1000
committerMichael Palimaka <kensington@gentoo.org>2019-08-10 11:13:52 +1000
commit846af216a621a08e183997ba8489f846bb2e66ff (patch)
tree302594f119b67344def25f9351a1e6e763ffc010 /media-gfx/nomacs/files
parentdev-libs/oniguruma: arm64 stable (bug #691832) (diff)
downloadgentoo-846af216a621a08e183997ba8489f846bb2e66ff.tar.gz
gentoo-846af216a621a08e183997ba8489f846bb2e66ff.tar.bz2
gentoo-846af216a621a08e183997ba8489f846bb2e66ff.zip
media-gfx/nomacs: backport upstream patch solving gcc9 build failure
Closes: https://bugs.gentoo.org/686226 Package-Manager: Portage-2.3.69, Repoman-2.3.17 Signed-off-by: Michael Palimaka <kensington@gentoo.org>
Diffstat (limited to 'media-gfx/nomacs/files')
-rw-r--r--media-gfx/nomacs/files/nomacs-3.12-gcc9.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch b/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch
new file mode 100644
index 00000000000..ccf6ea31d9d
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.12-gcc9.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 a/ImageLounge/src/DkCore/DkMetaData.cpp b/ImageLounge/src/DkCore/DkMetaData.cpp
+index 7540f7b9..fe2bc7ec 100644
+--- a/src/DkCore/DkMetaData.cpp
++++ b/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 a/ImageLounge/src/DkGui/DkNoMacs.cpp b/ImageLounge/src/DkGui/DkNoMacs.cpp
+index edda14cd..8fcdb59c 100644
+--- a/src/DkGui/DkNoMacs.cpp
++++ b/src/DkGui/DkNoMacs.cpp
+@@ -99,6 +99,8 @@
+
+ #include <assert.h>
+
++#include <iostream>
++
+ namespace nmc {
+
+ DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {
+--
+2.21.0
+