Added fixes for g++4.

7 files changed, 92 insertions, 1 deletions

diff --git a/devel/ogre/distinfo b/devel/ogre/distinfo
index 72f98720a7f..99c5b3b464f 100644
--- a/devel/ogre/distinfo
+++ b/devel/ogre/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/05/19 14:32:43 joerg Exp $
+$NetBSD: distinfo,v 1.5 2007/12/13 10:41:06 rillig Exp $
 
 SHA1 (ogre-v0-12-1.tar.bz2) = ffabeeb66305182ca3c7f2d9ee5a700599afd0db
 RMD160 (ogre-v0-12-1.tar.bz2) = 34c4e3bfa6d29591c53e0a533fb65ee5a4a5be01
@@ -9,3 +9,9 @@ SHA1 (patch-ac) = bfe1bfd9c2033cb75dd5db97ce930e419a649639
 SHA1 (patch-ad) = 14bb9fc366b02292200c39d24c609a019271c6e9
 SHA1 (patch-ae) = 6834759ac02fdf555dfa3fe482bddc914e10fa62
 SHA1 (patch-af) = b7e359ccdee4a3a99aa633a8e79e3bea1ca1939b
+SHA1 (patch-ba) = 7a772416225fea38a5855875d52ba21c3719e8b0
+SHA1 (patch-bb) = cc103295337e4a639cf8b590395ac6737a8ced1c
+SHA1 (patch-bc) = f9ad93204168b975a25c34e6a25358c89d2a38c2
+SHA1 (patch-bd) = 99b39512c43481b2c5e12d2d95de8f3db6ee08ab
+SHA1 (patch-be) = 66420c305094b3dd98c53f9f81f1c35c3022826c
+SHA1 (patch-bf) = c56944b447e967b8cc67a399ee4f1d6d2966e2b8
diff --git a/devel/ogre/patches/patch-ba b/devel/ogre/patches/patch-ba
new file mode 100644
index 00000000000..f5207fa9ede
--- /dev/null
+++ b/devel/ogre/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2007/12/13 10:41:07 rillig Exp $
+
+--- OgreMain/include/OgreFontManager.h.orig	2002-10-26 16:49:51.000000000 +0000
++++ OgreMain/include/OgreFontManager.h	2007-10-10 10:41:17.000000000 +0000
+@@ -61,7 +61,7 @@ namespace Ogre
+                 This method just delegates to the template version anyway, but the implementation stays in this
+                 single compilation unit, preventing link errors.
+         */
+-        static FontManager& FontManager::getSingleton(void);
++        static FontManager& getSingleton(void);
+ 
+     protected:
+ 
diff --git a/devel/ogre/patches/patch-bb b/devel/ogre/patches/patch-bb
new file mode 100644
index 00000000000..71b9d565af8
--- /dev/null
+++ b/devel/ogre/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2007/12/13 10:41:07 rillig Exp $
+
+--- OgreMain/include/OgreRenderTarget.h.orig	2003-09-12 19:00:43.000000000 +0000
++++ OgreMain/include/OgreRenderTarget.h	2007-10-10 10:39:46.000000000 +0000
+@@ -215,7 +215,7 @@ namespace Ogre {
+         virtual void setDebugText(const String& text);
+ 
+ 		/** Returns the debug text. */
+-		const String& RenderTarget::getDebugText() const;
++		const String& getDebugText() const;
+ 
+         /** Add a listener to this RenderTarget which will be called back before & after rendering.
+         @remarks
diff --git a/devel/ogre/patches/patch-bc b/devel/ogre/patches/patch-bc
new file mode 100644
index 00000000000..b00f2356a35
--- /dev/null
+++ b/devel/ogre/patches/patch-bc
@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2007/12/13 10:41:07 rillig Exp $
+
+--- PlugIns/GuiElements/include/OgreBorderPanelGuiElement.h.orig	2003-09-16 03:35:09.000000000 +0000
++++ PlugIns/GuiElements/include/OgreBorderPanelGuiElement.h	2007-10-10 10:48:59.000000000 +0000
+@@ -31,7 +31,7 @@ http://www.gnu.org/copyleft/lesser.txt.
+ 
+ namespace Ogre {
+ 
+-
++    class BorderRenderable;
+     
+     /** A specialisation of the PanelGuiElement to provide a panel with a border.
+     @remarks
diff --git a/devel/ogre/patches/patch-bd b/devel/ogre/patches/patch-bd
new file mode 100644
index 00000000000..4c0c946e490
--- /dev/null
+++ b/devel/ogre/patches/patch-bd
@@ -0,0 +1,13 @@
+$NetBSD: patch-bd,v 1.1 2007/12/13 10:41:08 rillig Exp $
+
+--- PlugIns/NatureSceneManager/include/NatureTerrainPatch.h.orig	2003-09-10 22:48:22.000000000 +0000
++++ PlugIns/NatureSceneManager/include/NatureTerrainPatch.h	2007-10-10 10:55:35.000000000 +0000
+@@ -146,7 +146,7 @@ private:
+     void getNormal(int x, int z, Vector3 *normal);
+ 
+     /// Adds a vertex to the vertex buffer or returns its index if it
+-    inline int NatureTerrainPatch::addVertex(int x, int y, int z)
++    inline int addVertex(int x, int y, int z)
+     {
+         unsigned int idx = z * QUADTREE_SIZE + x;
+         unsigned int v = mManager->mVertexLookup[idx];
diff --git a/devel/ogre/patches/patch-be b/devel/ogre/patches/patch-be
new file mode 100644
index 00000000000..a02b91320dd
--- /dev/null
+++ b/devel/ogre/patches/patch-be
@@ -0,0 +1,20 @@
+$NetBSD: patch-be,v 1.1 2007/12/13 10:41:08 rillig Exp $
+
+--- Tools/XMLConverter/include/OgreXMLSkeletonSerializer.h.orig	2003-02-18 22:07:41.000000000 +0000
++++ Tools/XMLConverter/include/OgreXMLSkeletonSerializer.h	2007-10-10 10:59:27.000000000 +0000
+@@ -72,11 +72,11 @@ namespace Ogre {
+         void writeAnimationTrack(TiXmlElement* tracksNode, const AnimationTrack* track);
+         void writeKeyFrame(TiXmlElement* keysNode, const KeyFrame* key);
+ 		
+-		void XMLSkeletonSerializer::readBones(Skeleton* skel, TiXmlElement* mBonesNode);
+-		void XMLSkeletonSerializer::readBones2(Skeleton* skel, TiXmlElement* mBonesNode);
++		void readBones(Skeleton* skel, TiXmlElement* mBonesNode);
++		void readBones2(Skeleton* skel, TiXmlElement* mBonesNode);
+ 		void createHierarchy(Skeleton* skel, TiXmlElement* mHierNode);
+-		void XMLSkeletonSerializer::readKeyFrames(AnimationTrack* track, TiXmlElement* mKeyfNode);
+-		void XMLSkeletonSerializer::readAnimations(Skeleton* skel, TiXmlElement* mAnimNode) ;
++		void readKeyFrames(AnimationTrack* track, TiXmlElement* mKeyfNode);
++		void readAnimations(Skeleton* skel, TiXmlElement* mAnimNode) ;
+ 
+     };
+ 
diff --git a/devel/ogre/patches/patch-bf b/devel/ogre/patches/patch-bf
new file mode 100644
index 00000000000..df34f238289
--- /dev/null
+++ b/devel/ogre/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.1 2007/12/13 10:41:08 rillig Exp $
+
+--- Tools/XMLConverter/include/tinyxml.h.orig	2003-09-10 22:48:29.000000000 +0000
++++ Tools/XMLConverter/include/tinyxml.h	2007-10-10 10:57:56.000000000 +0000
+@@ -790,7 +790,7 @@ public:
+ #endif
+ 
+ 	/// Construct.
+-	TiXmlDeclaration::TiXmlDeclaration( const char * _version,
++	TiXmlDeclaration( const char * _version,
+ 										const char * _encoding,
+ 										const char * _standalone );
+