Add patch to fix building with GCC 4.3.

Package-Manager: portage-2.1.5_rc5

4 files changed, 110 insertions, 5 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/Manifest b/media-sound/rosegarden/Manifest
index 479755ea2acf..f8074cf68176 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rosegarden-1.5.1-asneeded.patch 834 RMD160 bdd1e4177c631d093edb0b52341d3f13122844fd SHA1 88b0ee8a48a52f1f5145e5620a949f2aa7545470 SHA256 be83e291c7d3378542170450b2902ffe288efeddabcf54d4a1653a4fef8098d6
+AUX rosegarden-1.6.1+gcc-4.3.patch 2945 RMD160 a1832e4d4256f8260ad466da06853b3868dd37bb SHA1 7ccdc9b02ffe2ffe9fe8ef525609cd7ea12ef6af SHA256 abfb225126c995c634eaec28b5f19d4f35f62c5f38359c2bd3f36cdab4c48550
 AUX rosegarden-1.6.1-asneeded.patch 1021 RMD160 e4ad1f3cc6edc15dcada9b5801d40f09ad358d82 SHA1 b5f1fb6063716376679f82fb7461de5fea3d8398 SHA256 40a1297b6cc982a193a8c639451ca04e05c6c9978aabee6fb549293a531e4129
 AUX rosegarden-1.6.1-nojack.patch 2526 RMD160 9b8de4014757cfa2ad4f769441ea9544bf1d8f54 SHA1 81513a4bf264d822da9835ad242e181f4fd4f7dc SHA256 5e3e1edb1cb33e31c2f6f863db1ffe6d46c0d33d4191bdc458dcb2bfc9a1b025
 AUX rosegarden-1.6.1.desktop.diff 617 RMD160 c86918100fbec8962e46d17d8c943ab0e65218c6 SHA1 a70562ad84dd6666731049b907da704b59e115da SHA256 70a1e0151db9bc5374e46ebbf90dc0e12cfb14ae5fdfbcd80f5d4b1ab4437785
@@ -7,6 +11,13 @@ DIST rosegarden-1.5.1.tar.bz2 6137509 RMD160 dfddce14494fe0a8bdd89e08eb84929a899
 DIST rosegarden-1.6.1.tar.bz2 6952370 RMD160 0efd9dea8719dcaaadef36843d66532dd3c88b71 SHA1 8af8f778c59c794e06c3ee34e9fc5efb7746bc7b SHA256 3375f3ffd409b9270f6de03aa39537e9a8477d181825b732abfe72204fec28ce
 EBUILD rosegarden-1.4.0.ebuild 1314 RMD160 85a13d905aab2e31e3c3174579b2a7f51f14109b SHA1 1b12d7accdbbc9a56a59d7924260baf007f58c19 SHA256 e2514dc27510fa2726de768896cc9c140ab438a7083c4afde8d6c701d5a4584d
 EBUILD rosegarden-1.5.1.ebuild 2257 RMD160 536768620a941cd9f86b03a321f45d088bcace25 SHA1 46339d00eb4e999fbaf876fcdb29e20217855308 SHA256 d5c4fba50f8af950d0342801059f385247449a578bdcbf1cb1aab1a1fd7c9637
-EBUILD rosegarden-1.6.1-r1.ebuild 2168 RMD160 93fb658a0a1e2cf95e466cda2ae86bda519017e2 SHA1 07899123c770142903dd8207eb7c94eab820c53f SHA256 34f69bce0c206fd7b6b16cc06eb003a6c6e8e6ccb05a40bf816de4ecf0d4fd64
-MISC ChangeLog 8480 RMD160 296ff4203661084cf002e44b78d5d798ed0e8955 SHA1 d19cdbc6495695a7a204d90c503e8d8cea51801a SHA256 60538f011e9a77baa93cefa7c50fe3c4ef4f0ac5b813ed85f7ec7dbaf768d40e
+EBUILD rosegarden-1.6.1-r1.ebuild 2205 RMD160 2766b01da232bf406acd1c679f67d105b28a4285 SHA1 b1463deb2b1ae26616f429541e8c298090439add SHA256 084f03e66319c0c44094c53807985891f571167b3c4bdd31b7ae25d2d99b971e
+MISC ChangeLog 8647 RMD160 46e993487cd2efccd40c322e4ae97577a78002b8 SHA1 150754f9c67696ca7422a4b9959a44c80d43fc35 SHA256 08e7aa0fc388287dafecc68b65bf9b66f9afc3fdc31af8932cbfd696e69d35cb
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgPcCIACgkQAiZjviIA2XgnngCfd5Vp1vhjhgCs6MVT7+p2A2X2
+cwcAoNzXwOGc5KwTrU2ghCF9doUZawtv
+=WiZN
+-----END PGP SIGNATURE-----
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() {