Add patch for gcc-4.4 compatibility. Bug 251034. In upstream SCM.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 55 insertions, 18 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 0f29a6d833c9..0e3e064de07c 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/ardour
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.85 2009/03/25 07:50:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.86 2009/04/01 21:33:24 loki_val Exp $
+
+  01 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/ardour-2.7.1-gcc44.patch, ardour-2.7.1.ebuild:
+  Add patch for gcc-4.4 compatibility. Bug 251034. In upstream SCM.
 
   25 Mar 2009; Alexis Ballier <aballier@gentoo.org>
   -files/ardour-2.3.1-soundtouch.patch, -files/ardour-2.5-gcc43.patch,
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 8505a174b17c..bdb636e44768 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ardour-2.0.3-sndfile-external.patch 1409 RMD160 cbc6381f17a7978caa56aff0d5e0ce8b64f7161d SHA1 6559d30abdc3a89121097ed2649872806ce4a736 SHA256 71542baed4deeae9505107973361a5aab06f49ceaeb3bf7d2e7c5ffd73cc604d
 AUX ardour-2.4-cflags.patch 1199 RMD160 32e6f8c22e1f83072f3183a26f02c2e66fe61401 SHA1 bf6c46463df21a2cc431fa17180fe91069a99a21 SHA256 ba59b111d4d93081aa743793d3307e18c6a06560e1500c3700ee0930df7f2f5b
+AUX ardour-2.7.1-gcc44.patch 1418 RMD160 e8388a8787f7c0465f6a2c4a99fc2ae4f2cf0974 SHA1 9d603ad7106b41fb0455dd874a83ed1dcb351df9 SHA256 4473008fcec6d619301202ff6d12024eb08653e54986c42dbeba57e581e88944
 DIST ardour-2.7.1.tar.bz2 3313029 RMD160 7488169a28610550a93b700dd7949b8ffad2431e SHA1 3e8a6425bcfe5efbba0cfba44f0f63799e735cdb SHA256 102b99716ea99bbe66ad57abd1a1bf39d904068e76cb222d68f7acb78c63c864
-EBUILD ardour-2.7.1.ebuild 3073 RMD160 612335d6b283fc34213160a98a74b08109f50974 SHA1 44a45e51cd1073973003a5247eee68119c2b8d61 SHA256 6a2f6ecc69e169ccda11214e0d9d66ec2293f553e36599841dec1585bc7d3266
-MISC ChangeLog 13361 RMD160 4d1385541f862b1e126cda38d95a43df1792f591 SHA1 a816a111749bccfd68a55f901712f7830288349b SHA256 7a9bd9908855f13355ebba0068a63f0b529d629bb81ff7bed7e621f8629a1302
+EBUILD ardour-2.7.1.ebuild 3095 RMD160 e12c0697cdb5fc894ddf4fd27c96fafc01e6dc69 SHA1 961594bd59f046561934036e85e44e5803b2025a SHA256 c8aa2d0ed34afb19cdee226b9d5348a307861189a7fc0dbbd88448bc6fa9f5d2
+MISC ChangeLog 13539 RMD160 faf1dc1de4b55459c7460983a421b50a90c6f8ea SHA1 6e4b00fccf0dc4118c833e0eadba2fc8eb14513b SHA256 8d7728751071b30e38bd8942276100c5e03fa141f4f5e115e871b94fa1cdb087
 MISC metadata.xml 300 RMD160 acbf1c90a4242c8e6397177e769c70c6e27c8d53 SHA1 d4484f56243a463e6ce00063a31f6ee7f8ea97c2 SHA256 ed913de11b71a729a5a400f9a0bd076cbe812588e34b1685e3ff9bc2f06a8f46
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAknJ4lsACgkQvFcC4BYPU0oejwCdEfpq5Z15gENrWA53UpEGZgRL
-pboAnjnTk78xJPi2Z8zWjpO53VSHbLgU
-=uoWx
------END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-2.7.1.ebuild b/media-sound/ardour/ardour-2.7.1.ebuild
index de04878d1666..bc86ba9a79d4 100644
--- a/media-sound/ardour/ardour-2.7.1.ebuild
+++ b/media-sound/ardour/ardour-2.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.7.1.ebuild,v 1.3 2009/03/25 07:50:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.7.1.ebuild,v 1.4 2009/04/01 21:33:24 loki_val Exp $
 
 EAPI=2
 
@@ -51,12 +51,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P%_p*}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch"
 	epatch "${FILESDIR}/${PN}-2.4-cflags.patch"
+	epatch "${FILESDIR}/${PN}-2.7.1-gcc44.patch"
 }
 
 ardour_use_enable() {
diff --git a/media-sound/ardour/files/ardour-2.7.1-gcc44.patch b/media-sound/ardour/files/ardour-2.7.1-gcc44.patch
new file mode 100644
index 000000000000..5ed3b5cb1208
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.7.1-gcc44.patch
@@ -0,0 +1,44 @@
+diff -Naur ardour-2.7.1.orig/libs/pbd/convert.cc ardour-2.7.1/libs/pbd/convert.cc
+--- ardour-2.7.1.orig/libs/pbd/convert.cc	2008-12-09 15:34:12.544005281 -0500
++++ ardour-2.7.1/libs/pbd/convert.cc	2008-12-09 15:34:47.962006119 -0500
+@@ -17,6 +17,7 @@
+ 
+ */
+ 
++#include <cstdio>
+ #include <cmath>
+ #include <locale>
+ #include <algorithm>
+diff -Naur ardour-2.7.1.orig/libs/pbd/pbd/convert.h ardour-2.7.1/libs/pbd/pbd/convert.h
+--- ardour-2.7.1.orig/libs/pbd/pbd/convert.h	2008-12-09 15:34:12.546005001 -0500
++++ ardour-2.7.1/libs/pbd/pbd/convert.h	2008-12-09 16:01:25.177005281 -0500
+@@ -20,6 +20,7 @@
+ #ifndef __pbd_convert_h__
+ #define __pbd_convert_h__
+ 
++#include <stdint.h>
+ #include <string>
+ #include <vector>
+ #include <sstream>
+diff -Naur ardour-2.7.1.orig/libs/pbd/shortpath.cc ardour-2.7.1/libs/pbd/shortpath.cc
+--- ardour-2.7.1.orig/libs/pbd/shortpath.cc	2008-12-09 15:34:12.550005001 -0500
++++ ardour-2.7.1/libs/pbd/shortpath.cc	2008-12-09 15:44:23.709005001 -0500
+@@ -17,6 +17,7 @@
+ 
+ */
+ 
++#include <stdint.h>
+ #include <pbd/shortpath.h>
+ 
+ using namespace Glib;
+diff -Naur ardour-2.7.1.orig/libs/pbd/stacktrace.cc ardour-2.7.1/libs/pbd/stacktrace.cc
+--- ardour-2.7.1.orig/libs/pbd/stacktrace.cc	2008-12-09 15:34:12.550005001 -0500
++++ ardour-2.7.1/libs/pbd/stacktrace.cc	2008-12-09 15:46:27.671005281 -0500
+@@ -17,6 +17,7 @@
+ 
+ */
+ 
++#include <cstdio>
+ #include <pbd/stacktrace.h>
+ #include <iostream>
+