Add patch to allow build with gcc 4.1, thanks to Robert Marmorstein in bug #128351.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 287 insertions, 13 deletions

diff --git a/media-sound/cheesetracker/ChangeLog b/media-sound/cheesetracker/ChangeLog
index b89d0b9df387..f2e7d50712f5 100644
--- a/media-sound/cheesetracker/ChangeLog
+++ b/media-sound/cheesetracker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/cheesetracker
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cheesetracker/ChangeLog,v 1.17 2006/02/07 21:46:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cheesetracker/ChangeLog,v 1.18 2006/04/18 18:25:00 flameeyes Exp $
+
+  18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/cheesetracker-0.9.9-gcc4.patch, cheesetracker-0.9.9.ebuild:
+  Add patch to allow build with gcc 4.1, thanks to Robert Marmorstein in bug
+  #128351.
 
   07 Feb 2006; Aron Griffis <agriffis@gentoo.org>
   cheesetracker-0.9.9.ebuild:
diff --git a/media-sound/cheesetracker/Manifest b/media-sound/cheesetracker/Manifest
index 834ecca92069..ced63b29f1e7 100644
--- a/media-sound/cheesetracker/Manifest
+++ b/media-sound/cheesetracker/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d5a90aa3b78215605504b118c36fac8c ChangeLog 2373
-RMD160 8a6e6ba4e846d6e3c47a9bcffcc5d98125fb2f8f ChangeLog 2373
-SHA256 aa7c49b19b3fec23e45ada0fd7badaa3a90129147013f93982c17a5e47665bdb ChangeLog 2373
-MD5 634be9c2c416afccf6f7e364b096186c cheesetracker-0.9.9.ebuild 905
-RMD160 e14c4f413a6a1851fcc30381be3124ee68c3cdba cheesetracker-0.9.9.ebuild 905
-SHA256 1cc91ca3f6c743ded25951f991a2cf6638b4f4709ea52be3d06090bcfd46f151 cheesetracker-0.9.9.ebuild 905
+MD5 ef2952d736039b5a98ac6e5f85b418f9 ChangeLog 2585
+RMD160 c56b10f0af6f4d852363e5800e2ca6d5d5b59880 ChangeLog 2585
+SHA256 7da3ea8c91a005551e8986624ce040a974d9ef54034d4689924031b9188ee412 ChangeLog 2585
+MD5 ee64f7fb02219c8d2193160f04beed30 cheesetracker-0.9.9.ebuild 946
+RMD160 44b1a07f90fe11aec3a52ae7e1f18077a0925336 cheesetracker-0.9.9.ebuild 946
+SHA256 0a0fb2e8f0de2fb28c5fb1b3dd17edf1fd8eee92e7e61c26e1dbea052c8c95c7 cheesetracker-0.9.9.ebuild 946
 MD5 c434058097d9333a5c15d70afd4d861c files/cheesetracker-0.9.9-64bit-clean.diff 4677
 RMD160 7225cad56b1cef3d0aac54d89f1b46d9bd42159f files/cheesetracker-0.9.9-64bit-clean.diff 4677
 SHA256 e02de0bcf144fd0b7d9b6423d5bb0752f91ab24730e2b5b3665195bfd0aebdd7 files/cheesetracker-0.9.9-64bit-clean.diff 4677
+MD5 8fd8f0f4fb5ef4915c63c76e19f2fd67 files/cheesetracker-0.9.9-gcc4.patch 9385
+RMD160 312842506ea3481c6e65dc71e7a99525d1a3e957 files/cheesetracker-0.9.9-gcc4.patch 9385
+SHA256 173bffe11cfa1cd4e7622b9841599b0ac03e56d2f0ef2607fd4424c961bbec6f files/cheesetracker-0.9.9-gcc4.patch 9385
 MD5 494c01057ccc3d858baac01aead9b270 files/digest-cheesetracker-0.9.9 71
 RMD160 b81b9d77d6729c0632edc251c9aa72d13b170bf1 files/digest-cheesetracker-0.9.9 71
 SHA256 4ce9d1fe343df19f729d4365d99a4aee8e707d60f4fc5dc32c76d5ca0a364368 files/digest-cheesetracker-0.9.9 71
@@ -17,9 +20,9 @@ MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD6RU8JrHF4yAQTrARApTcAJ4pVicCHzMR8Sm5JPmlH/8APiKkuACfbK5D
-9qst6bm3oW6Gtw519zas+EQ=
-=RB95
+iD8DBQFERS5NAiZjviIA2XgRAkjPAKDrYbsVRWjJbnhPAkvjqU8qQSYpGwCgnJZd
+KO8Srcm8Wv/m6wNt6AqAXkY=
+=gy5g
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cheesetracker/cheesetracker-0.9.9.ebuild b/media-sound/cheesetracker/cheesetracker-0.9.9.ebuild
index 90ce748e0f10..20addb86c2b0 100644
--- a/media-sound/cheesetracker/cheesetracker-0.9.9.ebuild
+++ b/media-sound/cheesetracker/cheesetracker-0.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cheesetracker/cheesetracker-0.9.9.ebuild,v 1.13 2006/02/07 21:46:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cheesetracker/cheesetracker-0.9.9.ebuild,v 1.14 2006/04/18 18:25:01 flameeyes Exp $
 
 inherit eutils
 
@@ -21,7 +21,8 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-64bit-clean.diff
+	epatch "${FILESDIR}/${P}-64bit-clean.diff"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
 }
 
 src_compile() {
diff --git a/media-sound/cheesetracker/files/cheesetracker-0.9.9-gcc4.patch b/media-sound/cheesetracker/files/cheesetracker-0.9.9-gcc4.patch
new file mode 100644
index 000000000000..f80d0acc4b84
--- /dev/null
+++ b/media-sound/cheesetracker/files/cheesetracker-0.9.9-gcc4.patch
@@ -0,0 +1,265 @@
+diff -Naur cheesetracker-0.9.9.old/cheesetracker/interface__QT/interface.cpp cheesetracker-0.9.9/cheesetracker/interface__QT/interface.cpp
+--- cheesetracker-0.9.9.old/cheesetracker/interface__QT/interface.cpp	2006-04-01 00:03:44.000000000 -0500
++++ cheesetracker-0.9.9/cheesetracker/interface__QT/interface.cpp	2006-04-01 00:03:43.000000000 -0500
+@@ -42,7 +42,7 @@
+ #include <qmessagebox.h>
+ 
+ 
+-Saver::Error  Interface::save_song() {
++Audio::Saver::Error  Interface::save_song() {
+ 
+ 	FILE *f=fopen(tracker.song.variables.filename.c_str(),"rb");
+ 	if (!f) { //file doesnt exist, cant do direct save
+@@ -53,14 +53,14 @@
+         if (tracker.format_manager.save_module(tracker.song.variables.filename.c_str())) {
+ 
+ 		QMessageBox::warning( this, "Oops!","Error saving song!","Ok");
+-		return Saver::SAVE_ERROR;
++		return Audio::Saver::SAVE_ERROR;
+ 	}
+ 
+-	return Saver::SAVE_OK;
++	return Audio::Saver::SAVE_OK;
+ 
+ }
+ 
+-Saver::Error  Interface::save_song_as() {
++Audio::Saver::Error  Interface::save_song_as() {
+ 
+ 	QString s=QString::null;
+ 
+@@ -87,7 +87,7 @@
+ 
+ 
+ 	if (s==QString::null)
+-		return Saver::SAVE_OK; //nothing selected
++		return Audio::Saver::SAVE_OK; //nothing selected
+ 
+ 
+ 
+@@ -97,19 +97,19 @@
+ 		if ( QMessageBox::warning( this, "Question:","File exists! Overwrite?","Yes", "No") ) {
+ 
+ //			//printf("Leaving file alone!\n");
+-			return Saver::SAVE_OK;
++			return Audio::Saver::SAVE_OK;
+ 		}
+ 	}
+ 
+         if (tracker.format_manager.save_module(s.ascii())) {
+ 
+ 		QMessageBox::warning( this, "Oops!","Error saving song!","Ok");
+-		return Saver::SAVE_ERROR;
++		return Audio::Saver::SAVE_ERROR;
+ 	}
+ 
+ 	tracker.song.variables.filename=s.ascii();
+ 
+-	return Saver::SAVE_OK;
++	return Audio::Saver::SAVE_OK;
+ }
+ 
+ string Interface::get_song_name() {
+diff -Naur cheesetracker-0.9.9.old/cheesetracker/interface__QT/interface.h cheesetracker-0.9.9/cheesetracker/interface__QT/interface.h
+--- cheesetracker-0.9.9.old/cheesetracker/interface__QT/interface.h	2006-04-01 00:03:44.000000000 -0500
++++ cheesetracker-0.9.9/cheesetracker/interface__QT/interface.h	2006-04-01 00:03:43.000000000 -0500
+@@ -112,8 +112,8 @@
+ 	PageList get_current_page();
+ 
+ 	Loader::Error  open_song(string p_name);
+-	Saver::Error  save_song();
+-	Saver::Error  save_song_as();
++	Audio::Saver::Error  save_song();
++	Audio::Saver::Error  save_song_as();
+ 
+ 
+     Interface(QWidget *p_widget);
+diff -Naur cheesetracker-0.9.9.old/cheesetracker/savers/saver_ct.h cheesetracker-0.9.9/cheesetracker/savers/saver_ct.h
+--- cheesetracker-0.9.9.old/cheesetracker/savers/saver_ct.h	2006-04-01 00:03:44.000000000 -0500
++++ cheesetracker-0.9.9/cheesetracker/savers/saver_ct.h	2006-04-01 00:03:43.000000000 -0500
+@@ -15,6 +15,8 @@
+ #include "trackercore/saver.h"
+ #include "components/audio/dds_helpers.h"
+ 
++using namespace Audio;
++
+ /**
+ @author Juan Linietsky
+ */
+diff -Naur cheesetracker-0.9.9.old/cheesetracker/savers/saver_it.h cheesetracker-0.9.9/cheesetracker/savers/saver_it.h
+--- cheesetracker-0.9.9.old/cheesetracker/savers/saver_it.h	2006-04-01 00:03:44.000000000 -0500
++++ cheesetracker-0.9.9/cheesetracker/savers/saver_it.h	2006-04-01 00:03:43.000000000 -0500
+@@ -51,7 +51,7 @@
+ ********************************/
+ 
+ 
+-
++using namespace Audio;
+ 
+ 
+ class Saver_IT : public Saver {
+diff -Naur cheesetracker-0.9.9.old/cheesetracker/savers/saver_raw.h cheesetracker-0.9.9/cheesetracker/savers/saver_raw.h
+--- cheesetracker-0.9.9.old/cheesetracker/savers/saver_raw.h	2006-04-01 00:03:44.000000000 -0500
++++ cheesetracker-0.9.9/cheesetracker/savers/saver_raw.h	2006-04-01 00:03:43.000000000 -0500
+@@ -42,7 +42,7 @@
+   *@author red
+   */
+ 
+-
++using namespace Audio;
+ 
+ 
+ class Saver_Raw : public Saver  {
+diff -Naur cheesetracker-0.9.9.old/cheesetracker/savers/saver_wav.h cheesetracker-0.9.9/cheesetracker/savers/saver_wav.h
+--- cheesetracker-0.9.9.old/cheesetracker/savers/saver_wav.h	2006-04-01 00:03:44.000000000 -0500
++++ cheesetracker-0.9.9/cheesetracker/savers/saver_wav.h	2006-04-01 00:03:43.000000000 -0500
+@@ -39,7 +39,7 @@
+   *@author red
+   */
+ 
+-
++using namespace Audio;
+ 
+ 
+ class Saver_Wav : public Saver  {
+diff -Naur cheesetracker-0.9.9.old/cheesetracker/trackercore/file_format_manager.cpp cheesetracker-0.9.9/cheesetracker/trackercore/file_format_manager.cpp
+--- cheesetracker-0.9.9.old/cheesetracker/trackercore/file_format_manager.cpp	2006-04-01 00:03:44.000000000 -0500
++++ cheesetracker-0.9.9/cheesetracker/trackercore/file_format_manager.cpp	2006-04-01 00:04:22.000000000 -0500
+@@ -35,7 +35,7 @@
+ 
+ #include "file_format_manager.h"
+ 
+-
++using namespace Audio;
+ 
+ 
+ File_Format_Manager::File_Format_Manager(){
+@@ -78,7 +78,7 @@
+ 	return temperr;
+ }
+ 
+-void File_Format_Manager::register_saver(Saver *p_saver) {
++void File_Format_Manager::register_saver(Audio::Saver *p_saver) {
+ 
+ 	if (song==NULL) {
+ 
+@@ -93,11 +93,11 @@
+ int File_Format_Manager::save_module(const char *p_filename) {
+ 	
+ 	Saver_List::const_iterator I;
+-	int temperr=Saver::UNKNOWN_TYPE;
++	int temperr=Audio::Saver::UNKNOWN_TYPE;
+ 
+ 	for (I=saver_list.begin();I!=saver_list.end();I++) {
+ 
+-		if ((temperr=(*I)->save(p_filename))!=Saver::UNKNOWN_TYPE) {
++		if ((temperr=(*I)->save(p_filename))!=Audio::Saver::UNKNOWN_TYPE) {
+ 
+ 				return temperr;
+ 		}
+@@ -109,11 +109,11 @@
+ int File_Format_Manager::save_sample(const char *p_filename, int p_index) {
+ 
+ 	Saver_List::const_iterator I;
+-	int temperr=Saver::UNKNOWN_TYPE;
++	int temperr=Audio::Saver::UNKNOWN_TYPE;
+ 
+ 	for (I=saver_list.begin();I!=saver_list.end();I++) {
+ 
+-		if ((temperr=(*I)->save_sample(p_filename,p_index))!=Saver::UNKNOWN_TYPE) {
++		if ((temperr=(*I)->save_sample(p_filename,p_index))!=Audio::Saver::UNKNOWN_TYPE) {
+ 
+ 				return temperr;
+ 		}
+@@ -124,11 +124,11 @@
+ int File_Format_Manager::save_instrument(const char *p_filename, int p_index) {
+ 
+ 	Saver_List::const_iterator I;
+-	int temperr=Saver::UNKNOWN_TYPE;
++	int temperr=Audio::Saver::UNKNOWN_TYPE;
+ 
+ 	for (I=saver_list.begin();I!=saver_list.end();I++) {
+ 
+-		if ((temperr=(*I)->save_instrument(p_filename,p_index))!=Saver::UNKNOWN_TYPE) {
++		if ((temperr=(*I)->save_instrument(p_filename,p_index))!=Audio::Saver::UNKNOWN_TYPE) {
+ 
+ 				return temperr;
+ 		}
+diff -Naur cheesetracker-0.9.9.old/cheesetracker/trackercore/file_format_manager.h cheesetracker-0.9.9/cheesetracker/trackercore/file_format_manager.h
+--- cheesetracker-0.9.9.old/cheesetracker/trackercore/file_format_manager.h	2006-04-01 00:03:44.000000000 -0500
++++ cheesetracker-0.9.9/cheesetracker/trackercore/file_format_manager.h	2006-04-01 00:03:43.000000000 -0500
+@@ -60,7 +60,7 @@
+ class File_Format_Manager {
+ 
+ 	typedef list<Loader*> Loader_List;
+-	typedef list<Saver*> Saver_List;
++	typedef list<Audio::Saver*> Saver_List;
+ 
+ 	Loader_List loader_list;
+ 	Saver_List saver_list;
+@@ -80,7 +80,7 @@
+ 
+         Loader* load_sample_library(const char *p_filename); // Usually, from an instrument, but soundfonds would be cool!
+ 
+-	void register_saver(Saver *p_saver);
++	void register_saver(Audio::Saver *p_saver);
+         int save_module(const char *p_filename);
+ 
+ 	int save_sample(const char *p_filename, int p_index);
+diff -Naur cheesetracker-0.9.9.old/cheesetracker/trackercore/saver.h cheesetracker-0.9.9/cheesetracker/trackercore/saver.h
+--- cheesetracker-0.9.9.old/cheesetracker/trackercore/saver.h	2006-04-01 00:03:44.000000000 -0500
++++ cheesetracker-0.9.9/cheesetracker/trackercore/saver.h	2006-04-01 00:03:43.000000000 -0500
+@@ -53,7 +53,7 @@
+ 
+ 
+ 
+-
++namespace Audio{
+ class Saver {
+ protected:
+ 	Song *song;
+@@ -78,7 +78,7 @@
+ 	Saver();
+ 	virtual ~Saver();
+ };
+-
++}
+ 
+ 
+ #endif
+diff -Naur cheesetracker-0.9.9.old/common/components/audio/resampler_manager.h cheesetracker-0.9.9/common/components/audio/resampler_manager.h
+--- cheesetracker-0.9.9.old/common/components/audio/resampler_manager.h	2006-04-01 00:03:44.000000000 -0500
++++ cheesetracker-0.9.9/common/components/audio/resampler_manager.h	2006-04-01 00:03:43.000000000 -0500
+@@ -34,7 +34,7 @@
+ 
+ public:
+ 
+-	static Resampler_Manager * Resampler_Manager::get_resampler_manager();
++	static Resampler_Manager * get_resampler_manager();
+ 	int get_resampler_count();
+ 	Resampler * get_resampler(int p_index);
+ 
+diff -Naur cheesetracker-0.9.9.old/common/components/data/property_bridges.h cheesetracker-0.9.9/common/components/data/property_bridges.h
+--- cheesetracker-0.9.9.old/common/components/data/property_bridges.h	2006-04-01 00:03:44.000000000 -0500
++++ cheesetracker-0.9.9/common/components/data/property_bridges.h	2006-04-01 00:03:43.000000000 -0500
+@@ -41,7 +41,7 @@
+   */
+ 
+   #define BRIDGE_COPY_VALUE(T) \
+-	virtual bool T::copy_value(const Property_Bridge& rvalue) {\
++	virtual bool copy_value(const Property_Bridge& rvalue) {\
+ 		T* rcast = dynamic_cast<T*>((T*)&rvalue);\
+ 		if (rcast) {\
+ 			set(rcast->get());\
+diff -Naur cheesetracker-0.9.9.old/common/drivers/posix/sound_driver_jack.h cheesetracker-0.9.9/common/drivers/posix/sound_driver_jack.h
+--- cheesetracker-0.9.9.old/common/drivers/posix/sound_driver_jack.h	2006-04-01 00:03:44.000000000 -0500
++++ cheesetracker-0.9.9/common/drivers/posix/sound_driver_jack.h	2006-04-01 00:03:43.000000000 -0500
+@@ -72,7 +72,7 @@
+ 
+ 	int jack_callback_nframes;
+ 
+-	Sound_Driver::Status Sound_Driver_JACK::process();
++	Sound_Driver::Status process();
+ 
+         static int process_jack_callback(jack_nframes_t nframes,void *arg);
+         static int jack_set_mixfreq(jack_nframes_t nframes,void *arg);