From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1104824-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id E8C2A138334
for <garchives@archives.gentoo.org>; Sat, 10 Aug 2019 01:14:09 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E5641E07F6;
Sat, 10 Aug 2019 01:14:08 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id CA25AE07F6
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Aug 2019 01:14:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 3B9E43497BB
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Aug 2019 01:14:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5397A62C
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Aug 2019 01:14:05 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1565399632.846af216a621a08e183997ba8489f846bb2e66ff.kensington@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/nomacs/files/nomacs-3.12-gcc9.patch media-gfx/nomacs/nomacs-3.12.ebuild
X-VCS-Directories: media-gfx/nomacs/files/ media-gfx/nomacs/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: 846af216a621a08e183997ba8489f846bb2e66ff
X-VCS-Branch: master
Date: Sat, 10 Aug 2019 01:14:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0569a307-d813-4240-b44b-a111fe2c5c6f
X-Archives-Hash: 5bb58033747149c0503b99649b246c7a
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@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 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=(