diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-11-24 15:06:02 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-11-24 15:06:02 +0000 |
| commit | cb6e49ff1e983f7c97131ba7c1cabde76b19065f (patch) | |
| tree | bb9a169e158687d29a7c511fc8e32f1f880f6a46 /media-sound | |
| parent | fix build with gcc 4.7, bug #425274 (diff) | |
| download | gentoo-2-cb6e49ff1e983f7c97131ba7c1cabde76b19065f.tar.gz gentoo-2-cb6e49ff1e983f7c97131ba7c1cabde76b19065f.tar.bz2 gentoo-2-cb6e49ff1e983f7c97131ba7c1cabde76b19065f.zip | |
fix build with gcc 4.7, bug #421913
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/hydrogen/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch | 27 | ||||
| -rw-r--r-- | media-sound/hydrogen/hydrogen-0.9.5.ebuild | 5 |
3 files changed, 35 insertions, 3 deletions
diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog index 39770bc62331..06ce02ef1e4b 100644 --- a/media-sound/hydrogen/ChangeLog +++ b/media-sound/hydrogen/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/hydrogen # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.101 2012/05/05 08:31:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.102 2012/11/24 15:06:02 aballier Exp $ + + 24 Nov 2012; Alexis Ballier <aballier@gentoo.org> hydrogen-0.9.5.ebuild, + +files/hydrogen-0.9.5-gcc47.patch: + fix build with gcc 4.7, bug #421913 05 May 2012; Michał Górny <mgorny@gentoo.org> hydrogen-0.9.5.ebuild: dev-util/pkgconfig -> virtual/pkgconfig diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch new file mode 100644 index 000000000000..3ea43e36e3cd --- /dev/null +++ b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch @@ -0,0 +1,27 @@ +Build with gcc 4.7 +https://bugs.gentoo.org/show_bug.cgi?id=421913 + +Index: hydrogen-0.9.5/gui/src/MainForm.cpp +=================================================================== +--- hydrogen-0.9.5.orig/gui/src/MainForm.cpp ++++ hydrogen-0.9.5/gui/src/MainForm.cpp +@@ -70,6 +70,7 @@ using namespace H2Core; + + #include <memory> + #include <cassert> ++#include <unistd.h> + + using namespace std; + using namespace H2Core; +Index: hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp +=================================================================== +--- hydrogen-0.9.5.orig/gui/src/SongEditor/SongEditor.cpp ++++ hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp +@@ -21,6 +21,7 @@ + */ + + #include <assert.h> ++#include <unistd.h> + #include <algorithm> + #include <memory> + diff --git a/media-sound/hydrogen/hydrogen-0.9.5.ebuild b/media-sound/hydrogen/hydrogen-0.9.5.ebuild index 5f9076fad048..c8ce9c431fd5 100644 --- a/media-sound/hydrogen/hydrogen-0.9.5.ebuild +++ b/media-sound/hydrogen/hydrogen-0.9.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.5.ebuild,v 1.6 2012/05/05 08:31:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.5.ebuild,v 1.7 2012/11/24 15:06:02 aballier Exp $ EAPI=4 inherit eutils multilib flag-o-matic toolchain-funcs @@ -31,7 +31,8 @@ src_prepare() { sed -i -e '/cppflags +=/d' Sconstruct || die epatch \ patches/portaudio.patch \ - "${FILESDIR}"/${P}-use_lrdf_pkgconfig.patch + "${FILESDIR}"/${P}-use_lrdf_pkgconfig.patch \ + "${FILESDIR}"/${P}-gcc47.patch } src_compile() { |