diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-11-24 15:06:09 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-11-24 15:06:09 +0000 |
| commit | 3ddf276b3bda4b4e3b3efb58edb64d61867e58b2 (patch) | |
| tree | bc67970cb7ca43a1ac5aa5b9493973829d32ae67 /media-sound/hydrogen | |
| parent | fix build with gcc 4.7, bug #425274 (diff) | |
| download | historical-3ddf276b3bda4b4e3b3efb58edb64d61867e58b2.tar.gz historical-3ddf276b3bda4b4e3b3efb58edb64d61867e58b2.tar.bz2 historical-3ddf276b3bda4b4e3b3efb58edb64d61867e58b2.zip | |
fix build with gcc 4.7, bug #421913
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-sound/hydrogen')
| -rw-r--r-- | media-sound/hydrogen/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/hydrogen/Manifest | 19 | ||||
| -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 |
4 files changed, 44 insertions, 13 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/Manifest b/media-sound/hydrogen/Manifest index 3ef657870ee0..7d4225af5fcb 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1,17 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX hydrogen-0.9.5-use_lrdf_pkgconfig.patch 858 RMD160 8a35bc059153d92f0c138b408820777511ba24b7 SHA1 39d4907dfd5990d24ec92c365efb156cfe666763 SHA256 829b68fcc3f982463bbef09bbd7c1efd45b48f4e1da709c96146b05fe5c9e5a7 -DIST hydrogen-0.9.5.tar.gz 5239702 RMD160 851a99e4ab7eb417a61a78187a083bfd91819436 SHA1 7cb1578aac493483ca984b9f7c3918d3b264e460 SHA256 963c73ef911ec9e7589e502d17df3b794dd027d7e99a36b5115a0bb51389d9c3 -EBUILD hydrogen-0.9.5.ebuild 1895 RMD160 5da5f1286b62bc13121cb1302b78e111237f67c7 SHA1 0edc85994e98fbfdb06e2265068f81af6f68a5f5 SHA256 7ac20000b2bf8f79e65a29ae2de8bf1cd6f7886c9385cea825d9783a34efee65 -MISC ChangeLog 15440 RMD160 9c9646117d0682fb07540445c1f44857262b5fdf SHA1 45c3a6d8e41fa0a2ed548fdc714eb631fc9c8d0e SHA256 4f94e152ff1390f0e1296e9b96bc69fb4f31a79b9274698e1cd394a25686cf13 -MISC metadata.xml 245 RMD160 ed73355f5397581f4771b2ea25f16fd3853e5637 SHA1 a0e7b5c2885c4e764ef7ed793b30865f6aed8384 SHA256 05597fe58e4b04b564fe6ab688cf21d440bdace9db321e23647fa363199a401d +AUX hydrogen-0.9.5-gcc47.patch 761 SHA256 c7959b7fc9080a54184badd0bfc9aed579f2d0680059f415d0a9f56afaae8833 SHA512 ff3a06fbafdce19bf04f9fb71c04ff754e22caa36148a0f5e4a56efc53ce9b9478e9f1aeacdcc037234104762d9fce208aef351c70941b044e2d83bac4131304 WHIRLPOOL 08c21cc8e17c7818bbf0c2551c03808e11c463f9ab65bda570173c42ddff631db67d00ea1b62df311f57da5a6c463a6ce0ddf328ed55331aa5f05c1e3717bac2 +AUX hydrogen-0.9.5-use_lrdf_pkgconfig.patch 858 SHA256 829b68fcc3f982463bbef09bbd7c1efd45b48f4e1da709c96146b05fe5c9e5a7 SHA512 251a74287370f66df9eeecd3b6c7963c2614cf6b17a56fc71dc9f99077c3267a2e79469e2993ae22d017ea7f6cc7c581455c97c125e3be73860321112a67fd31 WHIRLPOOL de87409c530f8a3ce2ef959d43e46bb6462e7310660532be83d85b94ac4ab1dac50daf355d3a301923cc0ac3c4df0e691312640dcdf270ca9d03f23744db8cd5 +DIST hydrogen-0.9.5.tar.gz 5239702 SHA256 963c73ef911ec9e7589e502d17df3b794dd027d7e99a36b5115a0bb51389d9c3 SHA512 0053f0cb301c541326b66eb416dc548561a973ade993c055e7bc2acbdf28732e627a605061c8b487644026510f5b8395946bba209ddfd19230c960e9bb619f97 WHIRLPOOL 326a6716b150103fd0f40e5277d775875083a255cbea8c34fd0392dde2642410c7830c55c1bba0f62322c2f0fc68f5ca85dfe3fd6a8231223112ad89e3709c9f +EBUILD hydrogen-0.9.5.ebuild 1932 SHA256 3e95ef61337e9929eca200ee5fabb00b54ec855fe0ef51aefd6eb8d64b9ad858 SHA512 a0f5fdba8f6fb90c25b72c681b281d8aff20470a030be55b81b4d5c8ad3f7595ab3983ad04e7c7bc14346f3ff931be5d5d738e794b8c6a73d8c70c4e1ca69dcd WHIRLPOOL 4dcda17e3d98526caaba3243f32f79a09c7bfc790b73103d5f2101fe339cdf4bf666771e52a54d32c39195f13d1cfbbdfac02d784899dc0fd07ec5ed23919817 +MISC ChangeLog 15593 SHA256 689e4fd82146795a4271e344687100799cc21aac128d9cff61ed840d48a25aef SHA512 35f9d102fce4d3c5cf5843c53fb3b3b6bbaa72319ac27a352ef24c58e151d558ea9903db6f0e7145198e94af427d29024fff5fcfbe3c2c1eeebfb6f47b0fc2f9 WHIRLPOOL 53ddff45a78681473b9f1e5b57959072d7aabe8915de84f68fd81ec9f05b1e416fc9a4d687a79a12e5a38c06d58247723bcc67af9b47f23495825ed32b289106 +MISC metadata.xml 245 SHA256 05597fe58e4b04b564fe6ab688cf21d440bdace9db321e23647fa363199a401d SHA512 1c9795d99745cc86ad3c36e3a7fa2d5f26c0c56793a15e66e4a855959d15f2ab3806717370f1c4a1a003ad3853ad8849033a65c82dc1b869cf78b1503912cdda WHIRLPOOL c74120b54530ac307aa822802e027abf1389d880dc0a8e46ec9842ed0b95e7706e0a026f4bc5ec78f5a8b152f75c331803335a854a9ca00435d63125660a1064 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iJwEAQEIAAYFAk+k5YkACgkQfXuS5UK5QB28XQQAjzvhWCAuwexNrN37k+5WvnHA -NxQ6Atq/k2DNVMqBF7W/d3PNWAECbjFT+lkXbm/h8temmBs6zTcV4B2+0hC0efWC -krR75NlXaHHCpDYktyjOdA0vHu5j+XPbwz0IhEI2WhCt+V2fELQUg9yvyPcDi98X -zr9Z26HGn0epJJCcsS4= -=qv+H +iEUEAREIAAYFAlCw4lsACgkQvFcC4BYPU0r1BgCfb93prvH4GKnBtbiaH52rIYCn +RzQAl3NO1SIJPGIEEA1kJINsApcl9gk= +=lHiz -----END PGP SIGNATURE----- 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() { |