r2765 - in packages/trunk/opencity/debian: . patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-05-30 16:28:12 +0000 (Wed, 30 May 2007)
New Revision: 2765

Added:
   packages/trunk/opencity/debian/patches/fix_gcc-4.3.diff
Modified:
   packages/trunk/opencity/debian/changelog
   packages/trunk/opencity/debian/patches/series
Log:
+  * add the patch from Martin Michlmayr to fix the build with gcc-4.3
+  (Closes: #421124)


Modified: packages/trunk/opencity/debian/changelog
===================================================================
--- packages/trunk/opencity/debian/changelog	2007-05-30 12:39:21 UTC (rev 2764)
+++ packages/trunk/opencity/debian/changelog	2007-05-30 16:28:12 UTC (rev 2765)
@@ -4,6 +4,8 @@
    - add fix_homedir.diff to preinitialise this value 
    - use quilt to apply the patch
   * add desktop and icon files
+  * add the patch from Martin Michlmayr to fix the build with gcc-4.3
+  (Closes: #421124)
 
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Sun, 31 Dec 2006 09:52:22 +0100
 

Added: packages/trunk/opencity/debian/patches/fix_gcc-4.3.diff
===================================================================
--- packages/trunk/opencity/debian/patches/fix_gcc-4.3.diff	                        (rev 0)
+++ packages/trunk/opencity/debian/patches/fix_gcc-4.3.diff	2007-05-30 16:28:12 UTC (rev 2765)
@@ -0,0 +1,117 @@
+diff -ru opencity-0.0.4stable.orig/src/gui3dview.h opencity-0.0.4stable/src/gui3dview.h
+--- opencity-0.0.4stable.orig/src/gui3dview.h	2006-10-08 10:48:23.000000000 +0000
++++ opencity-0.0.4stable/src/gui3dview.h	2007-05-30 16:18:49.000000000 +0000
+@@ -28,8 +28,8 @@
+    */
+ class GUI3DView : public GUIMain {
+ public:
+-	GUI3DView() {};
+-	virtual ~GUI3DView() {};
++	GUI3DView() {}
++	virtual ~GUI3DView() {}
+ 
+ };
+ 
+diff -ru opencity-0.0.4stable.orig/src/guibutton.h opencity-0.0.4stable/src/guibutton.h
+--- opencity-0.0.4stable.orig/src/guibutton.h	2006-10-08 10:48:23.000000000 +0000
++++ opencity-0.0.4stable/src/guibutton.h	2007-05-30 16:18:49.000000000 +0000
+@@ -29,7 +29,7 @@
+ */
+ class GUIButton : public GUIMain {
+ public:
+-	GUIButton() {};
++	GUIButton() {}
+ 	GUIButton(
+ 		const int & rciX,
+ 		const int & rciY,
+diff -ru opencity-0.0.4stable.orig/src/mas/kernel.cpp opencity-0.0.4stable/src/mas/kernel.cpp
+--- opencity-0.0.4stable.orig/src/mas/kernel.cpp	2006-10-08 10:48:10.000000000 +0000
++++ opencity-0.0.4stable/src/mas/kernel.cpp	2007-05-30 16:18:49.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include "agent.h"
+ #include "message.h"
+ 
++#include <algorithm>
+ #include <cassert>
+ #include <iostream>
+ 
+diff -ru opencity-0.0.4stable.orig/src/networking/netnode.h opencity-0.0.4stable/src/networking/netnode.h
+--- opencity-0.0.4stable.orig/src/networking/netnode.h	2006-10-08 10:47:51.000000000 +0000
++++ opencity-0.0.4stable/src/networking/netnode.h	2007-05-30 16:18:49.000000000 +0000
+@@ -30,14 +30,14 @@
+ 
+ class Netnode {
+ public:
+-	Netnode() {};
+-	Netnode( IPaddress ipAdr, TCPsocket sock ):ip(ipAdr), socket(sock) {};
++	Netnode() {}
++	Netnode( IPaddress ipAdr, TCPsocket sock ):ip(ipAdr), socket(sock) {}
+ 	bool operator==( const Netnode& rc ) {
+ 		return ((this->ip.host == rc.ip.host) && (this->ip.port == rc.ip.port)
+ 			 && (this->socket == rc.socket));
+-	};
++	}
+ 
+-	~Netnode() {};
++	~Netnode() {}
+ 
+ 	IPaddress ip;
+ 	TCPsocket socket;
+diff -ru opencity-0.0.4stable.orig/src/pathfinder.cpp opencity-0.0.4stable/src/pathfinder.cpp
+--- opencity-0.0.4stable.orig/src/pathfinder.cpp	2006-10-08 10:48:23.000000000 +0000
++++ opencity-0.0.4stable/src/pathfinder.cpp	2007-05-30 16:18:49.000000000 +0000
+@@ -23,6 +23,8 @@
+ 
+ #include "pathfinder.h"
+ 
++#include <algorithm>
++
+ #define OC_PATHFINDER_MAX_LENGTH	0xFFFF0000
+ #define OC_PATHFINDER_A_STAR		1		// use Dijkstra + A* algorithm
+ 
+diff -ru opencity-0.0.4stable.orig/src/simulator/electricitysim.cpp opencity-0.0.4stable/src/simulator/electricitysim.cpp
+--- opencity-0.0.4stable.orig/src/simulator/electricitysim.cpp	2006-10-25 18:51:29.000000000 +0000
++++ opencity-0.0.4stable/src/simulator/electricitysim.cpp	2007-05-30 16:18:49.000000000 +0000
+@@ -26,6 +26,8 @@
+ 
+ #include "propertymanager.h"
+ 
++#include <algorithm>
++
+ 
+ extern PropertyManager* gpPropertyMgr;	// Global property manager
+ 
+diff -ru opencity-0.0.4stable.orig/src/simulator/simulator.h opencity-0.0.4stable/src/simulator/simulator.h
+--- opencity-0.0.4stable.orig/src/simulator/simulator.h	2006-10-08 10:48:05.000000000 +0000
++++ opencity-0.0.4stable/src/simulator/simulator.h	2007-05-30 16:18:49.000000000 +0000
+@@ -103,14 +103,14 @@
+ 		const uint & w1,
+ 		const uint & h1,
+ 		const uint & w2,
+-		const uint & h2 ) {};
++		const uint & h2 ) {}
+ 
+ 	virtual void
+ 	RemoveStructure(
+ 		const uint & w1,
+ 		const uint & h1,
+ 		const uint & w2,
+-		const uint & h2 ) {};
++		const uint & h2 ) {}
+ 
+ 
+ 	void
+diff -ru opencity-0.0.4stable.orig/src/triangulation/triangulation.h opencity-0.0.4stable/src/triangulation/triangulation.h
+--- opencity-0.0.4stable.orig/src/triangulation/triangulation.h	2006-10-08 10:48:10.000000000 +0000
++++ opencity-0.0.4stable/src/triangulation/triangulation.h	2007-05-30 16:18:49.000000000 +0000
+@@ -34,8 +34,8 @@
+ class Triangulation {
+ public:
+ 
+-	Triangulation() {};
+-	virtual ~Triangulation() {};
++	Triangulation() {}
++	virtual ~Triangulation() {}
+ 
+ //========================================================================
+ /** Compute triangulation on vertex, return a Triangle[nVertex-2]

Modified: packages/trunk/opencity/debian/patches/series
===================================================================
--- packages/trunk/opencity/debian/patches/series	2007-05-30 12:39:21 UTC (rev 2764)
+++ packages/trunk/opencity/debian/patches/series	2007-05-30 16:28:12 UTC (rev 2765)
@@ -1 +1,2 @@
 fix_homedir.diff
+fix_gcc-4.3.diff