Add patch to fix building with GCC 4.3.

(Portage version: 2.1.5_rc5)

3 files changed, 97 insertions, 3 deletions

diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog
index 43908d6e3e0d..2dbe027ba895 100644
--- a/media-sound/rosegarden/ChangeLog
+++ b/media-sound/rosegarden/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rosegarden
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.53 2008/03/06 14:18:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.54 2008/04/23 17:21:31 flameeyes Exp $
+
+  23 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/rosegarden-1.6.1+gcc-4.3.patch, rosegarden-1.6.1-r1.ebuild:
+  Add patch to fix building with GCC 4.3.
 
   06 Mar 2008; Steve Dibb <beandog@gentoo.org> rosegarden-1.5.1.ebuild:
   amd64 stable, bug 204649
diff --git a/media-sound/rosegarden/files/rosegarden-1.6.1+gcc-4.3.patch b/media-sound/rosegarden/files/rosegarden-1.6.1+gcc-4.3.patch
new file mode 100644
index 000000000000..fd296f27c205
--- /dev/null
+++ b/media-sound/rosegarden/files/rosegarden-1.6.1+gcc-4.3.patch
@@ -0,0 +1,89 @@
+Index: rosegarden-1.6.1/src/base/AudioPluginInstance.cpp
+===================================================================
+--- rosegarden-1.6.1.orig/src/base/AudioPluginInstance.cpp
++++ rosegarden-1.6.1/src/base/AudioPluginInstance.cpp
+@@ -22,6 +22,7 @@
+ #include "Instrument.h"
+ 
+ #include <iostream>
++#include <cstring>
+ 
+ #if (__GNUC__ < 3)
+ #include <strstream>
+Index: rosegarden-1.6.1/src/base/ScriptAPI.h
+===================================================================
+--- rosegarden-1.6.1.orig/src/base/ScriptAPI.h
++++ rosegarden-1.6.1/src/base/ScriptAPI.h
+@@ -107,9 +107,9 @@ public:
+     EventId addEvent(ScriptId id,
+                      std::string type, int bar, ScriptTime time, ScriptTime duration);
+ 
+-    void deleteEvent(ScriptId id, EventId id);
++    void deleteEvent(ScriptId s_id, EventId e_id);
+ 
+-    std::string getEventType(ScriptId id, EventId id);
++    std::string getEventType(ScriptId s_id, EventId e_id);
+     std::string getProperty(ScriptId id, EventId event, std::string property);
+     void setProperty(ScriptId id, EventId event, std::string property, std::string value);
+ 
+Index: rosegarden-1.6.1/src/base/XmlExportable.cpp
+===================================================================
+--- rosegarden-1.6.1.orig/src/base/XmlExportable.cpp
++++ rosegarden-1.6.1/src/base/XmlExportable.cpp
+@@ -21,6 +21,7 @@
+ #include "XmlExportable.h"
+ #include <iostream>
+ #include <cstdlib>
++#include <cstring>
+ 
+ namespace Rosegarden
+ {
+Index: rosegarden-1.6.1/src/gui/configuration/NotationConfigurationPage.cpp
+===================================================================
+--- rosegarden-1.6.1.orig/src/gui/configuration/NotationConfigurationPage.cpp
++++ rosegarden-1.6.1/src/gui/configuration/NotationConfigurationPage.cpp
+@@ -60,6 +60,7 @@
+ #include <qtabwidget.h>
+ #include <qwidget.h>
+ 
++#include <algorithm>
+ 
+ namespace Rosegarden
+ {
+Index: rosegarden-1.6.1/src/gui/dialogs/KeySignatureDialog.cpp
+===================================================================
+--- rosegarden-1.6.1.orig/src/gui/dialogs/KeySignatureDialog.cpp
++++ rosegarden-1.6.1/src/gui/dialogs/KeySignatureDialog.cpp
+@@ -45,6 +45,7 @@
+ #include <qwidget.h>
+ #include <qcheckbox.h>
+ 
++#include <algorithm>
+ 
+ namespace Rosegarden
+ {
+Index: rosegarden-1.6.1/src/gui/studio/OSCMessage.cpp
+===================================================================
+--- rosegarden-1.6.1.orig/src/gui/studio/OSCMessage.cpp
++++ rosegarden-1.6.1/src/gui/studio/OSCMessage.cpp
+@@ -28,6 +28,7 @@
+ #include "OSCMessage.h"
+ 
+ #include <cstdlib>
++#include <cstring>
+ 
+ namespace Rosegarden
+ {
+Index: rosegarden-1.6.1/src/sound/RingBuffer.h
+===================================================================
+--- rosegarden-1.6.1.orig/src/sound/RingBuffer.h
++++ rosegarden-1.6.1/src/sound/RingBuffer.h
+@@ -25,6 +25,8 @@
+ #include <sys/types.h>
+ #include <sys/mman.h>
+ 
++#include <cstring>
++
+ #include "Scavenger.h"
+ 
+ //#define DEBUG_RINGBUFFER 1
diff --git a/media-sound/rosegarden/rosegarden-1.6.1-r1.ebuild b/media-sound/rosegarden/rosegarden-1.6.1-r1.ebuild
index 4353b58e7cac..5fb88f2363e7 100644
--- a/media-sound/rosegarden/rosegarden-1.6.1-r1.ebuild
+++ b/media-sound/rosegarden/rosegarden-1.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-1.6.1-r1.ebuild,v 1.1 2008/01/06 19:06:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-1.6.1-r1.ebuild,v 1.2 2008/04/23 17:21:31 flameeyes Exp $
 
 inherit eutils kde-functions cmake-utils
 
@@ -57,7 +57,8 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/rosegarden-1.6.1-asneeded.patch" \
 		"${FILESDIR}/rosegarden-1.6.1.desktop.diff" \
-		"${FILESDIR}/${P}-nojack.patch"
+		"${FILESDIR}/${P}-nojack.patch" \
+		"${FILESDIR}/${P}+gcc-4.3.patch"
 }
 
 src_compile() {