[gentoo-commits] repo/gentoo:master commit in: media-sound/helm/files/, media-sound/helm/

[Alexis Ballier]

commit:     a3b4b54a208b3b18e6e2915cb354e209c63cffe6
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Thu May 25 05:22:48 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu May 25 16:10:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b4b54a

media-sound/helm: Fix building with GCC-6

Bug: https://bugs.gentoo.org/show_bug.cgi?id=594480
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-sound/helm/files/helm-0.4.1-gcc6.patch | 24 ++++++++++++++++++++++++
 media-sound/helm/helm-0.4.1-r1.ebuild        |  3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/media-sound/helm/files/helm-0.4.1-gcc6.patch b/media-sound/helm/files/helm-0.4.1-gcc6.patch
new file mode 100644
index 00000000000..efb54f0b5c5
--- /dev/null
+++ b/media-sound/helm/files/helm-0.4.1-gcc6.patch
@@ -0,0 +1,24 @@
+From 9a94165d8c400e45d617bf2d7cb657a477f43915 Mon Sep 17 00:00:00 2001
+From: Hodorgasm <nsane457@×××××.com>
+Date: Tue, 20 Sep 2016 17:33:14 -0400
+Subject: [PATCH] Assume there exists lround if compiling with g++ in C++11 or
+ later
+
+
GCC-6 doesn't define HAVE_LROUND, but lround is valid in C++ in dialects >= c++11.
+---
+ JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c b/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c
+index 87e2321e6..512b8279c 100644
+--- a/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c
++++ b/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c
+@@ -50,7 +50,7 @@
+ 
+ #ifndef FLAC__INTEGER_ONLY_LIBRARY
+ 
+-#if !defined(HAVE_LROUND)
++#if (!defined(__GNUC__) && !defined(HAVE_LROUND)) || __cplusplus < 201103L
+ #if defined(_MSC_VER)
+ #include <float.h>
+ #define copysign _copysign

diff --git a/media-sound/helm/helm-0.4.1-r1.ebuild b/media-sound/helm/helm-0.4.1-r1.ebuild
index 9ac626e661c..e4687ef57be 100644
--- a/media-sound/helm/helm-0.4.1-r1.ebuild
+++ b/media-sound/helm/helm-0.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}"
 DOCS="README.md"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc6.patch
 	rm patches/Synth/.DS_Store || die
 	sed -e 's|/usr/lib/|/usr/'$(get_libdir)'/|' -i Makefile || die
 	epatch_user