ports/111492: [PATCH] audio/cheesetracker: fix build with gcc41

[trasz]

>Number:         111492
>Category:       ports
>Synopsis:       [PATCH] audio/cheesetracker: fix build with gcc41
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 11 23:00:08 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     trasz
>Release:        FreeBSD 6.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Wed Nov 15 19:16:30 CET 2006
>Description:
Respect ${CXX}, fix build with gcc41 and mark broken on RELENG_5.

Added file(s):
- files/patch-cheesetracker-trackercore-saver.cpp
- files/patch-common-components-audio-resampler_manager.h
- files/patch-common-components-data-property_bridges.h
- files/patch-common-drivers-posix-sound_driver_jack.h

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- cheesetracker-0.9.9.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/Makefile /home/trasz/cheesetracker/Makefile
--- /usr/ports/audio/cheesetracker/Makefile	Thu Mar 29 15:20:59 2007
+++ /home/trasz/cheesetracker/Makefile	Thu Apr 12 01:05:39 2007
@@ -21,13 +21,18 @@
 		jack.0:${PORTSDIR}/audio/jack
 
 USE_QT_VER=	3
-MAKE_ENV=	QTDIR="${QT_PREFIX}"
+MAKE_ENV+=	QTDIR="${QT_PREFIX}"
 USE_SCONS=	yes
+SCONS_ENV+=	CXX="${CXX}"
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha"
 BROKEN=		Does not compile on alpha
+.endif
+
+.if ${OSVERSION} < 600020
+BROKEN=		Requires MSG_NOSIGNAL
 .endif
 
 post-patch:
diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-SConstruct /home/trasz/cheesetracker/files/patch-SConstruct
--- /usr/ports/audio/cheesetracker/files/patch-SConstruct	Thu Mar 29 15:20:59 2007
+++ /home/trasz/cheesetracker/files/patch-SConstruct	Thu Apr 12 01:05:38 2007
@@ -1,5 +1,15 @@
---- SConstruct.orig	Tue Mar 27 22:35:53 2007
-+++ SConstruct	Tue Mar 27 22:36:54 2007
+--- SConstruct.orig	Fri Apr 23 07:51:57 2004
++++ SConstruct	Mon Apr  9 19:20:43 2007
+@@ -53,8 +53,8 @@
+ env.make_so = None
+ env.detect = detect.Detect()
+ 
++env['CXX'] = os.environ['CXX']
+ if os.environ.has_key('DISTCC_HOSTS'):
+-	env['CXX'] = os.environ['CXX']
+ 	env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
+ 	env['ENV']['HOME'] = os.environ['HOME']
+ 
 @@ -87,7 +87,7 @@
  env.optimize_resampler_hack=0
  
diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-cheesetracker-trackercore-saver.cpp /home/trasz/cheesetracker/files/patch-cheesetracker-trackercore-saver.cpp
--- /usr/ports/audio/cheesetracker/files/patch-cheesetracker-trackercore-saver.cpp	Thu Jan  1 01:00:00 1970
+++ /home/trasz/cheesetracker/files/patch-cheesetracker-trackercore-saver.cpp	Thu Apr 12 01:05:39 2007
@@ -0,0 +1,14 @@
+--- cheesetracker/trackercore/saver.cpp.orig	Thu Apr 12 00:12:30 2007
++++ cheesetracker/trackercore/saver.cpp	Thu Apr 12 00:13:52 2007
+@@ -35,11 +35,8 @@
+ 
+ #include "saver.h"
+ 
+-namespace Audio {
+-
+ 
+ Saver::Saver(){
+ }
+ Saver::~Saver(){
+ }
+-}; // end of namespace declaration
diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-common-components-audio-resampler_manager.h /home/trasz/cheesetracker/files/patch-common-components-audio-resampler_manager.h
--- /usr/ports/audio/cheesetracker/files/patch-common-components-audio-resampler_manager.h	Thu Jan  1 01:00:00 1970
+++ /home/trasz/cheesetracker/files/patch-common-components-audio-resampler_manager.h	Thu Apr 12 01:05:39 2007
@@ -0,0 +1,11 @@
+--- common/components/audio/resampler_manager.h.orig	Thu Apr 12 00:03:58 2007
++++ common/components/audio/resampler_manager.h	Thu Apr 12 00:04:14 2007
+@@ -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 -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-common-components-data-property_bridges.h /home/trasz/cheesetracker/files/patch-common-components-data-property_bridges.h
--- /usr/ports/audio/cheesetracker/files/patch-common-components-data-property_bridges.h	Thu Jan  1 01:00:00 1970
+++ /home/trasz/cheesetracker/files/patch-common-components-data-property_bridges.h	Thu Apr 12 01:05:39 2007
@@ -0,0 +1,11 @@
+--- common/components/data/property_bridges.h.orig	Wed Apr 11 23:57:19 2007
++++ common/components/data/property_bridges.h	Thu Apr 12 00:02:25 2007
+@@ -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 -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-common-drivers-posix-sound_driver_jack.h /home/trasz/cheesetracker/files/patch-common-drivers-posix-sound_driver_jack.h
--- /usr/ports/audio/cheesetracker/files/patch-common-drivers-posix-sound_driver_jack.h	Thu Jan  1 01:00:00 1970
+++ /home/trasz/cheesetracker/files/patch-common-drivers-posix-sound_driver_jack.h	Thu Apr 12 01:05:39 2007
@@ -0,0 +1,11 @@
+--- common/drivers/posix/sound_driver_jack.h.orig	Thu Apr 12 00:09:04 2007
++++ common/drivers/posix/sound_driver_jack.h	Thu Apr 12 00:09:21 2007
+@@ -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);
--- cheesetracker-0.9.9.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: