summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2017-09-26 20:10:25 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2017-09-26 20:10:25 +0200
commit2753ebbdac800866fed8a2c7bf8a9da7eba9b151 (patch)
tree4dab9a2cd807245d61b8ee63a0c131aba872f777
parentmedia-gfx/iscan: version bump, bug 596942 (diff)
downloadgentoo-2753ebbdac800866fed8a2c7bf8a9da7eba9b151.tar.gz
gentoo-2753ebbdac800866fed8a2c7bf8a9da7eba9b151.tar.bz2
gentoo-2753ebbdac800866fed8a2c7bf8a9da7eba9b151.zip
media-sound/hydrogen: Add build fix for gcc-6, bug 598124
Thanks to Carlos Salvador Pérez Salgado for the patch. Closes: https://bugs.gentoo.org/598124 Package-Manager: Portage-2.3.10, Repoman-2.3.3
-rw-r--r--media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch12
-rw-r--r--media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild5
2 files changed, 15 insertions, 2 deletions
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
new file mode 100644
index 000000000000..586e82af22a1
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
@@ -0,0 +1,12 @@
+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
+--- hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp 2011-01-29 00:33:23.000000000 +0100
++++ hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp 2017-09-26 20:07:31.128723252 +0200
+@@ -980,7 +980,7 @@
+
+ std::string playlistInfoFile = patternname;
+ std::ifstream verify( playlistInfoFile.c_str() , std::ios::in | std::ios::binary );
+- if ( verify == NULL ) {
++ if ( !verify ) {
+ //ERRORLOG( "Load Playlist: Data file " + playlistInfoFile + " not found." );
+ return NULL;
+ }
diff --git a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
index 04efe86d0561..0a19547038c7 100644
--- a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -31,7 +31,8 @@ src_prepare() {
epatch \
patches/portaudio.patch \
"${FILESDIR}"/${P}-use_lrdf_pkgconfig.patch \
- "${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-gcc47.patch \
+ "${FILESDIR}"/${P}-gcc6.patch
}
src_compile() {