ports/118274: [patch] audio/hydrogen unbreak fix build with GCC 4.2

[Pietro Cerutti]

>Number:         118274
>Category:       ports
>Synopsis:       [patch] audio/hydrogen unbreak fix build with GCC 4.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 27 00:20:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 8.0-CURRENT #13: Sun Nov 25 22:03:04 CET 2007
    root at gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034



>Description:


fixed extra-qualification problem in one header file


>How-To-Repeat:


cd /usr/ports/audio/hydrogen && make


>Fix:


--- _hydrogen.diff begins here ---
--- Makefile.orig	2007-11-27 00:57:35.000000000 +0100
+++ Makefile	2007-11-27 00:58:14.000000000 +0100
@@ -44,12 +44,6 @@
 		LRDF "LRDF support" off \
 		FLAC "FLAC support" on
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 .if defined(WITH_JACK)
 LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
 CPPFLAGS+=	${PTHREAD_CFLAGS}
@@ -118,4 +112,4 @@
 	${MKDIR} ${MAN1PREFIX}/man/ru.KOI8-R/man1
 	${INSTALL_MAN} ${WRKSRC}/man/ru/hydrogen.1 ${MAN1PREFIX}/man/ru.KOI8-R/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- /dev/null	2007-11-27 01:07:41.000000000 +0100
+++ files/patch-src-lib-xml_tinyxml.h	2007-11-27 01:06:02.000000000 +0100
@@ -0,0 +1,11 @@
+--- src/lib/xml/tinyxml.h.orig	2007-11-27 00:59:06.000000000 +0100
++++ src/lib/xml/tinyxml.h	2007-11-27 01:05:34.000000000 +0100
+@@ -823,7 +823,7 @@
+ #endif
+ 
+ 	/// Construct.
+-	TiXmlDeclaration::TiXmlDeclaration( const char * _version,
++	TiXmlDeclaration( const char * _version,
+ 										const char * _encoding,
+ 										const char * _standalone );
+ 
--- _hydrogen.diff ends here ---



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