merge of '30c320b2f51c86226580e5bbf68fa8b0896a0655'

     and '8dfee9b2427785432e4161eb7cc749155230e08e'

1 files changed, 45 insertions, 0 deletions

diff --git a/packages/billiardz/files/gcc4.patch b/packages/billiardz/files/gcc4.patch
new file mode 100644
index 0000000000..30d7eda9e8
--- /dev/null
+++ b/packages/billiardz/files/gcc4.patch
@@ -0,0 +1,45 @@
+diff -Naur billiardz-0.1.4-orig/src/ButtonListener.h billiardz-0.1.4/src/ButtonListener.h
+--- billiardz-0.1.4-orig/src/ButtonListener.h	2002-11-05 07:01:51.000000000 +0100
++++ billiardz-0.1.4/src/ButtonListener.h	2007-03-26 21:10:11.000000000 +0200
+@@ -9,6 +9,7 @@
+ {
+ 	public:
+ 		virtual void buttonClicked(Button *button) = 0;
++		virtual ~ButtonListener() {}
+ };
+ 
+ #endif /* _BUTTONLISTENER_H_ */
+diff -Naur billiardz-0.1.4-orig/src/CueStickListener.h billiardz-0.1.4/src/CueStickListener.h
+--- billiardz-0.1.4-orig/src/CueStickListener.h	2002-09-13 02:02:23.000000000 +0200
++++ billiardz-0.1.4/src/CueStickListener.h	2007-03-26 21:11:14.000000000 +0200
+@@ -12,6 +12,7 @@
+ 		virtual bool cueBallHit(CueStick *stick, Ball *ball) = 0;
+ 		virtual void stickMoved(CueStick *stick, Fixed oldAngle,
+ 								Fixed newAngle) = 0;
++		virtual ~CueStickListener() {}
+ };
+ 
+ #endif /* _CUESTICKLISTENER_H_ */
+diff -Naur billiardz-0.1.4-orig/src/PoolGame.h billiardz-0.1.4/src/PoolGame.h
+--- billiardz-0.1.4-orig/src/PoolGame.h	2002-11-05 07:01:36.000000000 +0100
++++ billiardz-0.1.4/src/PoolGame.h	2007-03-26 21:40:58.000000000 +0200
+@@ -6,6 +6,7 @@
+ 
+ class Player;
+ class PoolTable;
++class PoolRoom;
+ class Physics;
+ class Rules;
+ class Sprite;
+diff -Naur billiardz-0.1.4-orig/src/main.cpp billiardz-0.1.4/src/main.cpp
+--- billiardz-0.1.4-orig/src/main.cpp	2003-11-03 07:56:29.000000000 +0100
++++ billiardz-0.1.4/src/main.cpp	2007-03-26 23:27:11.000000000 +0200
+@@ -51,7 +51,7 @@
+ 
+ 	return interval;
+ }
+-
++#define SDL_main main
+ #ifdef __cplusplus
+ extern "C" {
+ #endif