[opencity] 28/91: + * add the patch from Martin Michlmayr to fix the build with gcc-4.3 + (Closes: #421124)
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Mar 25 12:23:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository opencity.
commit 9cc2eceb349facdeba60f63f5d96453af19d17ab
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date: Wed May 30 16:28:12 2007 +0000
+ * add the patch from Martin Michlmayr to fix the build with gcc-4.3
+ (Closes: #421124)
---
debian/changelog | 2 +
debian/patches/fix_gcc-4.3.diff | 117 ++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 120 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index eb2b9c3..0ba4627 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ opencity (0.0.4stable-2) unstable; urgency=low
- 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
diff --git a/debian/patches/fix_gcc-4.3.diff b/debian/patches/fix_gcc-4.3.diff
new file mode 100644
index 0000000..38dfdcd
--- /dev/null
+++ b/debian/patches/fix_gcc-4.3.diff
@@ -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]
diff --git a/debian/patches/series b/debian/patches/series
index 7152482..23605f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
fix_homedir.diff
+fix_gcc-4.3.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/opencity.git
More information about the Pkg-games-commits
mailing list