[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Michael Palimaka]

commit:     846af216a621a08e183997ba8489f846bb2e66ff
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 01:13:27 2019 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 01:13:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846af216

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 <AT> gentoo.org>

 media-gfx/nomacs/files/nomacs-3.12-gcc9.patch | 39 +++++++++++++++++++++++++++
 media-gfx/nomacs/nomacs-3.12.ebuild           |  1 +
 2 files changed, 40 insertions(+)

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@g.o>
+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
+

diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild b/media-gfx/nomacs/nomacs-3.12.ebuild
index 32fc7db491a..17e8151bfcf 100644
--- a/media-gfx/nomacs/nomacs-3.12.ebuild
+++ b/media-gfx/nomacs/nomacs-3.12.ebuild
@@ -45,6 +45,7 @@ BDEPEND="
 S="${WORKDIR}/${P}/ImageLounge"
 
 DOCS=( src/changelog.txt )
+PATCHES=( "${FILESDIR}/${P}-gcc9.patch" )
 
 src_configure() {
 	local mycmakeargs=(