gentoo resync : 18.08.2019

3 files changed, 42 insertions, 1 deletions

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 9de3a4c23da4..6e674047487d 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,3 +1,4 @@
+AUX nomacs-3.12-gcc9.patch 1098 BLAKE2B 70e4900d2670b9e4ca9f6ae12f4720a0bc25eabdf0ba09729801428cd6f12d5655db15c3ee3a9c2e5c6f5ae5cac6cf77fd6d1730a39ceda8a713a32f989bed8e SHA512 d653c666345f50c83f199aaeec61e4e481124787f5dad53d89ed06f920e0f20beebb4a56e550665c61af3b1718d6fb24092f98b7f0d99e6ab6eb98d5995093be
 DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
-EBUILD nomacs-3.12.ebuild 1273 BLAKE2B e16331ab550098f3f680672034e59d0d5667589bd54a929f381ea40df753d33486fde632f181cd5baeba819048bb2bf10b1828be3a7c491728697fb9fa8ff829 SHA512 cd0138e1e4701843355b2b48a8a989fc67cef0f45da2487297d2bfaa6003ddfb2e4927e40f35db86af6ed18243f33f63054e68b245ed36695d209d2cae65239f
+EBUILD nomacs-3.12.ebuild 1315 BLAKE2B aea9616d9268a710139f8018f21b6beb2f7f976b5f7d9ebc5bbf7a4f844867dc9b737bc8a1c3d0c56feef80289af2487a14468034cb2f5386443ab0ac9804a7d SHA512 5f6f2ca97866dd134dcb65884d5d83a61f85ce86c90b8ad3fcb0a274f300d7227a50f09a0050727b7abe5ce9ab43e2e6c869944abaf2dc06463a4686bf6fc05e
 MISC metadata.xml 531 BLAKE2B fc54042c41205b0a44c1b2dcd266e1311b306ee928149b3806e16260be85a65bf0da0716706653f82ff3dc83351fca6a68ca47930a08f3d170d00416515e2eac SHA512 ac9d022d7b0883217b77513e6d913ed816e414402cd4028428f6b239d97c8f5eaab48d709821675529af8a5a3d945105997235dcb63b826fd669f1b5fb2660a4
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 000000000000..ccf6ea31d9d5
--- /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
+
diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild b/media-gfx/nomacs/nomacs-3.12.ebuild
index 32fc7db491a3..17e8151bfcf1 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=(