| 1 |
commit: 2753ebbdac800866fed8a2c7bf8a9da7eba9b151 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 26 18:10:25 2017 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 26 18:10:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2753ebbd |
| 7 |
|
| 8 |
media-sound/hydrogen: Add build fix for gcc-6, bug 598124 |
| 9 |
|
| 10 |
Thanks to Carlos Salvador Pérez Salgado for the patch. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/598124 |
| 13 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
| 14 |
|
| 15 |
media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch | 12 ++++++++++++ |
| 16 |
media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild | 5 +++-- |
| 17 |
2 files changed, 15 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..586e82af22a |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch |
| 24 |
@@ -0,0 +1,12 @@ |
| 25 |
+diff -ruN hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp |
| 26 |
+--- hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp 2011-01-29 00:33:23.000000000 +0100 |
| 27 |
++++ hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp 2017-09-26 20:07:31.128723252 +0200 |
| 28 |
+@@ -980,7 +980,7 @@ |
| 29 |
+ |
| 30 |
+ std::string playlistInfoFile = patternname; |
| 31 |
+ std::ifstream verify( playlistInfoFile.c_str() , std::ios::in | std::ios::binary ); |
| 32 |
+- if ( verify == NULL ) { |
| 33 |
++ if ( !verify ) { |
| 34 |
+ //ERRORLOG( "Load Playlist: Data file " + playlistInfoFile + " not found." ); |
| 35 |
+ return NULL; |
| 36 |
+ } |
| 37 |
|
| 38 |
diff --git a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild |
| 39 |
index 04efe86d056..0a19547038c 100644 |
| 40 |
--- a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild |
| 41 |
+++ b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild |
| 42 |
@@ -1,4 +1,4 @@ |
| 43 |
-# Copyright 1999-2013 Gentoo Foundation |
| 44 |
+# Copyright 1999-2017 Gentoo Foundation |
| 45 |
# Distributed under the terms of the GNU General Public License v2 |
| 46 |
|
| 47 |
EAPI=4 |
| 48 |
@@ -31,7 +31,8 @@ src_prepare() { |
| 49 |
epatch \ |
| 50 |
patches/portaudio.patch \ |
| 51 |
"${FILESDIR}"/${P}-use_lrdf_pkgconfig.patch \ |
| 52 |
- "${FILESDIR}"/${P}-gcc47.patch |
| 53 |
+ "${FILESDIR}"/${P}-gcc47.patch \ |
| 54 |
+ "${FILESDIR}"/${P}-gcc6.patch |
| 55 |
} |
| 56 |
|
| 57 |
src_compile() { |
Archives