Fix build with gcc-4.7 (bug #414145 by David Kredba).

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 29 insertions, 11 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 91948f500174..e58d26757aca 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.101 2012/05/05 08:05:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.102 2012/05/31 15:13:42 radhermit Exp $
+
+  31 May 2012; Tim Harder <radhermit@gentoo.org> ardour-2.8.12.ebuild,
+  +files/ardour-2.8.12-gcc47.patch:
+  Fix build with gcc-4.7 (bug #414145 by David Kredba).
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> ardour-2.8.12.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 8e8c6dbd2525..7339dcf44e8e 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ardour-2.8.11-flags.patch 926 RMD160 34041cec7cfc8129a9ac2317b4503012597b3c32 SHA1 abf40321d624e54b19f0b1c3ade462470d9167b1 SHA256 1b4762c15c329dbc89dba7149358ba5f82670f4d3e550dc166d55dda4e243304
 AUX ardour-2.8.11-soundtouch.patch 710 RMD160 af40c5ef37ebef6f924fd4560f54f43cf31ecfc8 SHA1 ae729d0332d7fd486b13bd2dacfe95e9f9f0d7a5 SHA256 4e62791188a3435b69ef0b679a80de880b4156f690f59acb2ee9b23053e0752e
+AUX ardour-2.8.12-gcc47.patch 181 RMD160 d6e810376346447a962cd039ee4a7117e5a8607e SHA1 f309ea7fa5d7aea77cca2a4464424f1e84f0f44c SHA256 bc854c1e6efb100c3a21346fa0bb1f9dbf6cf50bd62010fd903c61bd42d67bee
 AUX ardour-2.8.12-syslibs.patch 3800 RMD160 0b95f55ddb3c071ff96cde430d0e27c431e7026e SHA1 71325836029b1ba99cb453f50aadb20f52771ce4 SHA256 badff28ce208ad42caf5b0dd1abb66705048d463974f3cb3eebf8d6225b5c07d
 DIST ardour-2.8.12.tar.bz2 3397775 RMD160 7e26f4c953ec5b6f9a243f79bc5f8b5294c426b9 SHA1 bca81cac38f5c603472c9bd33f5d4d4094e5ca14 SHA256 f51514910f7734823a13b35823bbdc9d709252bad65c65b34c17efe1d3975be4
-EBUILD ardour-2.8.12.ebuild 1955 RMD160 6f5f10de9d317084ef24d54ce83b6539cb474c44 SHA1 f9463e734c3bea13a956cccdf34e591d0178c9b7 SHA256 fad33c8649e00f567cd26a38c5ac5c1f98bfd9f915fc97f92db3ffa70eca6731
-MISC ChangeLog 16165 RMD160 1c8a18a777b5a197d9f0c023ee85df0b7cfc023f SHA1 06df33d8d82c1fc4cb1979f10af0d6be5e2c12d0 SHA256 0eb8b3726700c289702275f44f855570d625314e21dd1d5ac47b43f9be3d2a85
+EBUILD ardour-2.8.12.ebuild 1993 RMD160 75b1f05086cd4c48fad595825c99493c64f7253e SHA1 273ed3238943edcabf364075e175ebec9afd591d SHA256 088515b2eedc9b708cbc90cf9eff3b1597e6514ab0fc1d6c412518c170949051
+MISC ChangeLog 16332 RMD160 e6f0c4a06777ecbc839fbe82b3e7ae3b76d52b97 SHA1 aae1f9b6e500af1d09fe1c071f33839ecb2b3e40 SHA256 3f44053a4c24fffe9ffa0839b8afe9e26ce355ddd991647ad0c56e6131d659ea
 MISC metadata.xml 234 RMD160 afe6939b1787409c4946aa2fad554d1eb9edfc66 SHA1 91fd230154e1eb9712e8345f24cf3595a247b3a0 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk+k33sACgkQfXuS5UK5QB1elgP/Ss2zaPTqghe4oe2id3LQnZ37
-xswnTNJBMwNVhpeTrle6gJyed66yZDo5p+j1zKShUs+DjN+6k6gTLkMXNcfEv7FG
-LwMXZZg75eWgXQ87HzuFNw1+OF/kG1129tFqUtw6i32IMOFKzMzmhcOGMR+yUfX1
-J/XOb9J9YsXc4+v6Uis=
-=hqEU
+iQEcBAEBCgAGBQJPx4qyAAoJEEqz6FtPBkyjQYQIALqkWtV/d/qZM8rd1xjSyMYr
+WK066RCXIj9mnK+e5ulE+j/pOIHZ7UqypL5E1uLhwEZv9JFlah31lNahnTZIJiDH
+OZOjTYV8Z0497jppl9SMTulvdawe85MoNihJ06rIWq4VIwV0zNDSADuMZhbr5XGG
+eeLnqAS/uicBzUBEG27y4vVl94p/WWgqWNIXGuqyHsrlWLYAVd7MUoDJ321jEg9B
+1u0Z3pHF5XYPQFbvnYF+n9iYBLQntuZCGVzPQJ+wOa/Czi5CAWQKGwWYqWkr+yhD
+HbNlXmhFhzEL6aMxiddlC/mgyBoHp2A80pZdlkTLz+gse5ycQByEXynrrviuHlg=
+=KmR2
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-2.8.12.ebuild b/media-sound/ardour/ardour-2.8.12.ebuild
index d54e974e092d..9eb0543d4ba8 100644
--- a/media-sound/ardour/ardour-2.8.12.ebuild
+++ b/media-sound/ardour/ardour-2.8.12.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/ardour/ardour-2.8.12.ebuild,v 1.3 2012/05/05 08:05:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.12.ebuild,v 1.4 2012/05/31 15:13:42 radhermit Exp $
 
 EAPI=4
 inherit eutils flag-o-matic toolchain-funcs scons-utils
@@ -52,7 +52,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-2.8.11-flags.patch \
 		"${FILESDIR}"/${P}-syslibs.patch \
-		"${FILESDIR}"/${PN}-2.8.11-soundtouch.patch
+		"${FILESDIR}"/${PN}-2.8.11-soundtouch.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
 }
 
 src_compile() {
diff --git a/media-sound/ardour/files/ardour-2.8.12-gcc47.patch b/media-sound/ardour/files/ardour-2.8.12-gcc47.patch
new file mode 100644
index 000000000000..3ae54af5597f
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.8.12-gcc47.patch
@@ -0,0 +1,10 @@
+--- ardour-2.8.12/libs/pbd/path.cc
++++ ardour-2.8.12/libs/pbd/path.cc
+@@ -17,6 +17,7 @@
+ */
+ 
+ #include <cerrno>
++#include <unistd.h>
+ 
+ #include <glib.h>
+ #include <glib/gstdio.h>