- Fix build with gcc 4.2

PR:		118010
Submitted by:	Pietro Cerutti <gahr@gahr.ch>
Approved by:	portmgr (erwin,linimon)

5 files changed, 54 insertions, 7 deletions

diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index 8dbba3b71a42..f38107358fe4 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -30,10 +30,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		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>
diff --git a/devel/kyra/files/patch-engine_encoder.h b/devel/kyra/files/patch-engine_encoder.h
new file mode 100644
index 000000000000..d36b98a248de
--- /dev/null
+++ b/devel/kyra/files/patch-engine_encoder.h
@@ -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; }
+ 
diff --git a/devel/kyra/files/patch-engine_imagetree.h b/devel/kyra/files/patch-engine_imagetree.h
new file mode 100644
index 000000000000..8152be4256ca
--- /dev/null
+++ b/devel/kyra/files/patch-engine_imagetree.h
@@ -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
diff --git a/devel/kyra/files/patch-engine_imnode.h b/devel/kyra/files/patch-engine_imnode.h
new file mode 100644
index 000000000000..694f234e6def
--- /dev/null
+++ b/devel/kyra/files/patch-engine_imnode.h
@@ -0,0 +1,11 @@
+--- engine/imnode.h.orig	2007-11-13 12:15:46.000000000 +0100
++++ engine/imnode.h	2007-11-13 12:18:19.000000000 +0100
+@@ -288,7 +288,7 @@
+ 	/// Fetches the user defined data.
+ 	void* GetUserData()							{ return userData; }
+ 	/// Fetches the user defined data. Fetches the *same* user data as GetUserData, just uses a convenience cast.
+-	U32   GetUserDataU32()						{ return (U32) userData; }
++	//U32   GetUserDataU32()						{ return (U32) userData; }
+ 
+ 	/** Return a copy if this object, not in a Tree(). It is
+ 		return untransformed. In the case of a sprite, the action
diff --git a/devel/kyra/files/patch-guiExtended_progress.h b/devel/kyra/files/patch-guiExtended_progress.h
new file mode 100644
index 000000000000..b5c98606925d
--- /dev/null
+++ b/devel/kyra/files/patch-guiExtended_progress.h
@@ -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);
+