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

(Portage version: 2.2_rc28/cvs/Linux x86_64)

3 files changed, 52 insertions, 6 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/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>
+