Fix building with GCC 4.3 wrt #217851, thanks to Peter Alfredsen.

Package-Manager: portage-2.1.5_rc3

4 files changed, 197 insertions, 7 deletions

diff --git a/media-sound/cheesetracker/ChangeLog b/media-sound/cheesetracker/ChangeLog
index f4700b54500e..a413fa30f5bb 100644
--- a/media-sound/cheesetracker/ChangeLog
+++ b/media-sound/cheesetracker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/cheesetracker
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cheesetracker/ChangeLog,v 1.28 2008/01/08 17:05:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cheesetracker/ChangeLog,v 1.29 2008/04/16 17:49:08 drac Exp $
+
+  16 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/cheesetracker-0.9.15.3-gcc43.patch, cheesetracker-0.9.15.3.ebuild:
+  Fix building with GCC 4.3 wrt #217851, thanks to Peter Alfredsen.
 
   08 Jan 2008; Raúl Porcel <armin76@gentoo.org>
   cheesetracker-0.9.15.2.ebuild:
diff --git a/media-sound/cheesetracker/Manifest b/media-sound/cheesetracker/Manifest
index f37e73816168..0c9558420173 100644
--- a/media-sound/cheesetracker/Manifest
+++ b/media-sound/cheesetracker/Manifest
@@ -1,6 +1,7 @@
+AUX cheesetracker-0.9.15.3-gcc43.patch 5340 RMD160 a490e025be49b9c7a326e56302ba943f7ed85b7d SHA1 df569d6d33510e6c159cd9e48a3ced8fa3ab5460 SHA256 401894f90a6721d844984d82e8ec39ce6010ab6d6058647bf3bf354a8f460d83
 DIST cheesetracker-0.9.15.2.tar.bz2 797891 RMD160 fae37fff528f7ead129b6e5e868d9c88b77dc3fa SHA1 66fbe87a9628161d36f32075a76e6f5c02d31b27 SHA256 ad0e56cf578819ef723f5a6d4aadd9af5086395475be9adb0c8e0ee9b76afcda
 DIST cheesetracker-0.9.15.3.tar.gz 896347 RMD160 5b1103679ecf28cfc874d48ab2903531e11026c2 SHA1 1748afcc038921316f97e8f8daf62487f2055ea9 SHA256 848faf089f61d4b13106b4745fed6699455c61c51d65e012317bf3adc4ce37b4
 EBUILD cheesetracker-0.9.15.2.ebuild 1174 RMD160 f6fcbb0b3cc55f03c5ef9bad6875bf632332dabe SHA1 e02680e51f866a3c9b4d67146cc33c9a588d5b5e SHA256 106598648585ebb8a5e4494d23f0be1f6ca554e0e92d231c517ffd76621938b8
-EBUILD cheesetracker-0.9.15.3.ebuild 1174 RMD160 f81ba7592f98e2ceee0d7714c47c946793e12a6b SHA1 ce411a2d47631e03c0a259dde212398b73f1e959 SHA256 ec44c8499342e3f2ab9ddc3a26649ef9fbad94a882ee1d9d4e36d4f6923221da
-MISC ChangeLog 4121 RMD160 356a5dd2bb80e4f901bc8ef28f5a089b49bbdf24 SHA1 8a806e9998fb12396885b271a59c9a97aaecc6b4 SHA256 4c59e3d8cdc05125f91ebbc6703a72741d8995c8d1602ea1417ba88c01228dcb
+EBUILD cheesetracker-0.9.15.3.ebuild 1266 RMD160 08654dad306003a41712308998be9f122bb7b92a SHA1 292dac8d845ebcbaa4814077eea26ada88efbcb3 SHA256 f999d7c35c2abaa67af11316d047074ed2a3efa68c16629c2812bdb1733441ae
+MISC ChangeLog 4312 RMD160 d44289af1b5f074c1662198edcc1ee5df668753e SHA1 29cd07d9941452fd2e31ad248e31a0d437405f45 SHA256 cd19f6c94a53dd37813580165c305f9d9896cb26080882a098f61a744a5157dd
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/cheesetracker/cheesetracker-0.9.15.3.ebuild b/media-sound/cheesetracker/cheesetracker-0.9.15.3.ebuild
index 347c6a7529a4..ec30623b9131 100644
--- a/media-sound/cheesetracker/cheesetracker-0.9.15.3.ebuild
+++ b/media-sound/cheesetracker/cheesetracker-0.9.15.3.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/cheesetracker/cheesetracker-0.9.15.3.ebuild,v 1.1 2008/01/01 15:51:48 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cheesetracker/cheesetracker-0.9.15.3.ebuild,v 1.2 2008/04/16 17:49:08 drac Exp $
 
 inherit eutils
 
@@ -17,11 +17,18 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
 	media-libs/audiofile
 	=dev-libs/libsigc++-1.2*
-	=x11-libs/qt-3*"
+	=x11-libs/qt-3*
+	dev-libs/gmp"
 DEPEND="${RDEPEND}
 	>=dev-util/scons-0.94-r2
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_compile() {
 	scons || die "scons failed."
 }
@@ -34,9 +41,9 @@ src_install() {
 
 	if use examples; then
 		insinto /usr/share/${PN}/examples
-		doins ${PN}/examples/{*.it,*.xm}
+		doins ${PN}/examples/*.{it,xm}
 	fi
 
 	newicon ${PN}/icons/cheese_48x48.xpm ${PN}.xpm
-	make_desktop_entry ${PN}_qt CheeseTracker ${PN} "AudioVideo;Qt;"
+	make_desktop_entry ${PN}_qt CheeseTracker ${PN} "AudioVideo;Qt"
 }
diff --git a/media-sound/cheesetracker/files/cheesetracker-0.9.15.3-gcc43.patch b/media-sound/cheesetracker/files/cheesetracker-0.9.15.3-gcc43.patch
new file mode 100644
index 000000000000..50213f2a7418
--- /dev/null
+++ b/media-sound/cheesetracker/files/cheesetracker-0.9.15.3-gcc43.patch
@@ -0,0 +1,178 @@
+--- cheesetracker-0.9.15.3.orig/common/os/path_data.cpp
++++ cheesetracker-0.9.15.3/common/os/path_data.cpp
+@@ -27,6 +27,7 @@
+ //
+ #include "path_data.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ string Path_Data::get_home_dir() {
+ 
+--- cheesetracker-0.9.15.3.orig/common/drivers/posix/mutex_lock_pthreads.h
++++ cheesetracker-0.9.15.3/common/drivers/posix/mutex_lock_pthreads.h
+@@ -39,6 +39,7 @@
+ #include <pthread.h>
+ #include <errno.h>
+ #include <string.h>
++#include <stdlib.h>
+ /**
+   *@author Juan Linietsky
+   */
+--- cheesetracker-0.9.15.3.orig/common/drivers/posix/sound_driver_oss.cpp
++++ cheesetracker-0.9.15.3/common/drivers/posix/sound_driver_oss.cpp
+@@ -38,6 +38,7 @@
+ #include "sound_driver_oss.h"
+ #include "math.h"
+ #include "components/audio/sample_conversion.h"
++#include <stdlib.h>
+ 
+ 
+ 
+--- cheesetracker-0.9.15.3.orig/common/components/file/file_access.cpp
++++ cheesetracker-0.9.15.3/common/components/file/file_access.cpp
+@@ -14,6 +14,7 @@
+  *                                                                         *
+  ***************************************************************************/
+ #include "file_access.h"
++#include <string.h>
+ 
+ File_Manager::File_Manager() {
+ 
+--- cheesetracker-0.9.15.3.orig/common/components/data/property_bridges.cpp
++++ cheesetracker-0.9.15.3/common/components/data/property_bridges.cpp
+@@ -31,6 +31,7 @@
+  ***************************************************************************/
+ 
+ #include "property_bridges.h"
++#include <string.h>
+ 
+ 
+ void Property_Bridge::set_display_preference(string p_pref) {
+--- cheesetracker-0.9.15.3.orig/common/components/data/dds_packer.cpp
++++ cheesetracker-0.9.15.3/common/components/data/dds_packer.cpp
+@@ -1,4 +1,5 @@
+ #include "dds_packer.h"
++#include <string.h>
+ 
+ 
+ void DDSPacker::pack(DDS* p_struct, data& p_data, Uint32 p_offset) {
+--- cheesetracker-0.9.15.3.orig/common/components/data/dds.cpp
++++ cheesetracker-0.9.15.3/common/components/data/dds.cpp
+@@ -1,4 +1,5 @@
+ #include "dds.h"
++#include <string.h>
+ 
+ using std::vector;
+ 
+--- cheesetracker-0.9.15.3.orig/common/components/audio/mixer.cpp
++++ cheesetracker-0.9.15.3/common/components/audio/mixer.cpp
+@@ -35,6 +35,7 @@
+ 
+ #include "cycles.h"
+ #include "components/midi/midi_controls.h"
++#include <string.h>
+ 
+ #define CYCMSEC(m_parm) (float)( ((double)m_parm/950000000.0) * 1000.0 )
+ 
+--- cheesetracker-0.9.15.3.orig/common/property_server/bridge_converter.cpp
++++ cheesetracker-0.9.15.3/common/property_server/bridge_converter.cpp
+@@ -1,4 +1,5 @@
+ #include "bridge_converter.h"
++#include <string.h>
+ 
+ int BridgeConverter::get_short_string(BufferControl& p_buffer, string& p_string) {
+ 
+--- cheesetracker-0.9.15.3.orig/common/plugins/effects/custom/effect_pshift.cpp
++++ cheesetracker-0.9.15.3/common/plugins/effects/custom/effect_pshift.cpp
+@@ -11,6 +11,7 @@
+ //
+ #include "effect_pshift.h"
+ #include "math.h"
++#include <string.h>
+ 
+ 
+ void Effect_PShift::reset() {
+--- cheesetracker-0.9.15.3.orig/common/plugins/effects/custom/effect_echo.cpp
++++ cheesetracker-0.9.15.3/common/plugins/effects/custom/effect_echo.cpp
+@@ -10,6 +10,7 @@
+ //
+ //
+ #include "effect_echo.h"
++#include <string.h>
+ 
+ 
+ void Effect_Echo::reset() {
+--- cheesetracker-0.9.15.3.orig/common/plugins/effects/custom/chorus_effect.cpp
++++ cheesetracker-0.9.15.3/common/plugins/effects/custom/chorus_effect.cpp
+@@ -10,7 +10,7 @@
+ //
+ //
+ #include "chorus_effect.h"
+-
++#include <string.h>
+ 
+ #define MIX_CALCULATE_INCREMENT_INTERVAL 8
+ 
+--- cheesetracker-0.9.15.3.orig/common/plugins/effects/custom/effect_stereo_fx.cpp
++++ cheesetracker-0.9.15.3/common/plugins/effects/custom/effect_stereo_fx.cpp
+@@ -10,6 +10,7 @@
+ //
+ //
+ #include "effect_stereo_fx.h"
++#include <string.h>
+ 
+ 
+ inline static double get_samples_from_msecs(double p_msecs,double p_mixfreq) {
+--- cheesetracker-0.9.15.3.orig/common/plugins/effects/ladspa/ladspa_effect.cpp
++++ cheesetracker-0.9.15.3/common/plugins/effects/ladspa/ladspa_effect.cpp
+@@ -17,6 +17,7 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <dlfcn.h>
++#include <string.h>
+ 
+ 
+ 
+--- cheesetracker-0.9.15.3.orig/common/plugins/effects/ladspa/ladspa_effect.h
++++ cheesetracker-0.9.15.3/common/plugins/effects/ladspa/ladspa_effect.h
+@@ -18,8 +18,9 @@
+ 
+ #include "common/plugins/effects/ladspa/ladspa.h"
+ #include "components/audio/effect.h"
++#include <string.h>
+ #include <vector>
+-	using std::vector;
++using std::vector;
+ 
+ /**
+ @author Juan Linietsky
+--- cheesetracker-0.9.15.3.orig/cheesetracker/trackercore/file_writer.cpp
++++ cheesetracker-0.9.15.3/cheesetracker/trackercore/file_writer.cpp
+@@ -31,6 +31,7 @@
+  ***************************************************************************/
+ 
+ #include "file_writer.h"
++#include <string.h>
+ 
+ File_Writer::File_Writer(){
+ 
+--- cheesetracker-0.9.15.3.orig/cheesetracker/trackercore/instrument.cpp
++++ cheesetracker-0.9.15.3/cheesetracker/trackercore/instrument.cpp
+@@ -31,6 +31,7 @@
+  ***************************************************************************/
+ 
+ #include <cassert>
++#include <string.h>
+ #include "instrument.h"
+ 
+ void
+--- cheesetracker-0.9.15.3.orig/cheesetracker/trackercore/voice_control.cpp
++++ cheesetracker-0.9.15.3/cheesetracker/trackercore/voice_control.cpp
+@@ -16,6 +16,7 @@
+ 
+ #include "voice_control.h"
+ #include "freq_conversion.h"
++#include <stdlib.h>
+ 
+ 
+ #define PAN_SURROUND 512