ports/118010: [patch] devel/kyra unbreak fix build with GCC 4.2

["Pietro Cerutti" <Pietro Cerutti]

>Number:         118010
>Category:       ports
>Synopsis:       [patch] devel/kyra 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:   Mon Nov 12 16:40:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
Bern University of Applied Sciences 
>Environment:


System: FreeBSD 8.0-CURRENT #9: Fri Nov  9 14:50:37 CET 2007
    root at gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034



>Description:


- fixed a few "extra qualification" errors


>How-To-Repeat:


cd /usr/ports/devel/kyra && make


>Fix:


--- _kyra.diff begins here ---
--- Makefile.orig	2007-11-12 17:21:14.000000000 +0100
+++ Makefile	2007-11-12 17:21:24.000000000 +0100
@@ -30,10 +30,4 @@
 		LDFLAGS="-L${X11BASE}/lib"
 USE_LDCONFIG=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- /dev/null	2007-11-12 17:32:04.000000000 +0100
+++ files/patch-engine_encoder.h	2007-11-12 17:27:55.000000000 +0100
@@ -0,0 +1,11 @@
+--- engine/encoder.h.orig	2007-11-12 17:25:45.000000000 +0100
++++ engine/encoder.h	2007-11-12 17:25:59.000000000 +0100
+@@ -185,7 +185,7 @@
+ 														GLASSERT( numRGBA >= numSegment );
+ //														GLASSERT( numSegment >= numLine );
+ 													 }
+-	void KrEncoder::Save();
++	void Save();
+ 
+ 	KrResourceVault* GetVault()						{ return &vault; }
+ 
--- /dev/null	2007-11-12 17:32:15.000000000 +0100
+++ files/patch-engine_imagetree.h	2007-11-12 17:23:52.000000000 +0100
@@ -0,0 +1,11 @@
+--- engine/imagetree.h.orig	2007-11-12 17:22:54.000000000 +0100
++++ engine/imagetree.h	2007-11-12 17:23:06.000000000 +0100
+@@ -217,7 +217,7 @@
+ 	void Clear( KrImNode* root );	// delete the entire tree
+ 
+ 	// Recursive hit test walk.
+-	bool KrImageTree::HitTestRec( KrImNode* node, int x, int y, int flags, GlDynArray<KrImage*>* outputArray, int windowIndex );
++	bool HitTestRec( KrImNode* node, int x, int y, int flags, GlDynArray<KrImage*>* outputArray, int windowIndex );
+ 
+ 	KrImNode*  root;			// The root to position the window
+ 	KrImNode*  offsetRoot;		// The root as returned to the client
--- /dev/null	2007-11-12 17:32:32.000000000 +0100
+++ files/patch-guiExtended_progress.h	2007-11-12 17:25:29.000000000 +0100
@@ -0,0 +1,20 @@
+--- guiExtended/progress.h.orig	2007-11-12 17:24:08.000000000 +0100
++++ guiExtended/progress.h	2007-11-12 17:24:34.000000000 +0100
+@@ -43,7 +43,7 @@
+ 	/** if width of the resource is greater then its height then makes
+ 		a horizontal, else makes a vertical progress bar
+ 	*/
+-	KrProgress::KrProgress (int width,
++	KrProgress (int width,
+ 							int height,
+ 							KrRGBA FillColor,
+ 							KrRGBA ChangeColor,
+@@ -53,7 +53,7 @@
+ 	/** if width of the resource is greater then its height then makes
+ 		a horizontal, else makes a vertical progress bar
+ 	*/
+-	KrProgress::KrProgress (int width,
++	KrProgress (int width,
+ 							int height,
+ 							const KrScheme& scheme);
+ 
--- _kyra.diff ends here ---



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