devel/enigma enigma-0.81-gcc4.patch,NONE,1.1 enigma.spec,1.5,1.6

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/devel/enigma
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30086

Modified Files:
	enigma.spec 
Added Files:
	enigma-0.81-gcc4.patch 
Log Message:
* Thu Apr 14 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.81-5
- Fix build for GCC4.



enigma-0.81-gcc4.patch:

--- NEW FILE enigma-0.81-gcc4.patch ---
diff -Nur enigma-0.81-orig/src/actors.cc enigma-0.81/src/actors.cc
--- enigma-0.81-orig/src/actors.cc	2003-10-10 18:32:03.000000000 +0200
+++ enigma-0.81/src/actors.cc	2005-04-14 01:42:31.000000000 +0200
@@ -382,6 +382,8 @@
         static const double   SHIELD_TIME = 10.0;
         HaloState             m_halostate;
     };
+    const double BasicBall::SHIELD_TIME;
+
 }
 
 BasicBall::BasicBall(const char *kind, double radius, double mass)
diff -Nur enigma-0.81-orig/src/game.hh enigma-0.81/src/game.hh
--- enigma-0.81-orig/src/game.hh	2003-09-28 22:47:54.000000000 +0200
+++ enigma-0.81/src/game.hh	2005-04-14 01:36:03.000000000 +0200
@@ -143,7 +143,7 @@
 
     px::Surface *LevelPreview(LevelPack *lp, unsigned levelidx);
 
-    void enigma::GameReset();
+    void         GameReset();
     unsigned     StartGame(LevelPack *lp, unsigned levelidx);
     unsigned     NextLevel(LevelPack *lp, unsigned levelidx, unsigned max_available, 
                            bool skip_solved, bool skip_todo_and_unnamed);
diff -Nur enigma-0.81-orig/src/items.cc enigma-0.81/src/items.cc
--- enigma-0.81-orig/src/items.cc	2003-10-11 15:45:24.000000000 +0200
+++ enigma-0.81/src/items.cc	2005-04-14 01:43:32.000000000 +0200
@@ -1383,6 +1383,7 @@
         enum State { OPEN, CLOSED, OPENING, CLOSING } state;
         bool close_after_warp;
     };
+  const double Vortex::RANGE;
 }
 
 bool
diff -Nur enigma-0.81-orig/src/stones_complex.cc enigma-0.81/src/stones_complex.cc
--- enigma-0.81-orig/src/stones_complex.cc	2003-10-11 15:45:23.000000000 +0200
+++ enigma-0.81/src/stones_complex.cc	2005-04-14 01:44:28.000000000 +0200
@@ -107,6 +107,7 @@
             return false;
         }
     };
+    const double RotatorStone::IMPULSE_DELAY;
 }
 
 
diff -Nur enigma-0.81-orig/src/world.hh enigma-0.81/src/world.hh
--- enigma-0.81-orig/src/world.hh	2003-10-04 00:21:26.000000000 +0200
+++ enigma-0.81/src/world.hh	2005-04-14 01:36:13.000000000 +0200
@@ -191,7 +191,7 @@
     Object *GetNamedObject (const string &name);
     Object *GetObject (const GridLoc &l);
 
-    bool world::IsLevelBorder(GridPos p);
+    bool    IsLevelBorder(GridPos p);
 
 //----------------------------------------
 // Force fields.


Index: enigma.spec
===================================================================
RCS file: /cvs/extras/devel/enigma/enigma.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- enigma.spec	6 Apr 2005 22:11:37 -0000	1.5
+++ enigma.spec	13 Apr 2005 23:50:00 -0000	1.6
@@ -1,14 +1,14 @@
 Name:           enigma
 Version:        0.81
-Release:        4
-
+Release:        5
 Summary:        Clone of the ATARI game Oxyd
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.nongnu.org/enigma/
 Source0:        http://savannah.nongnu.org/download/enigma/enigma-%{version}.tar.gz
-Patch:          enigma-0.81-gcc34.patch
+Patch0:         enigma-0.81-gcc34.patch
+Patch1:         enigma-0.81-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2  SDL_image-devel >= 1.2 SDL_mixer-devel >= 1.2
@@ -24,7 +24,9 @@
 
 %prep
 %setup -q
-%patch -p1 -b .gcc34
+%patch0 -p1 -b .gcc34
+%patch1 -p1 -b .gcc4
+
 
 %build
 %configure --enable-optimize
@@ -57,7 +59,10 @@
 %{_datadir}/applications/*enigma.desktop
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr 14 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.81-5
+- Fix build for GCC4.
+
+* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Thu Nov 11 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.81-3