rpms/8Kingdoms/devel 8Kingdoms-1.1.0-crash.patch, NONE, 1.1 8Kingdoms-1.1.0-gcc43.patch, NONE, 1.1 8Kingdoms.spec, 1.1, 1.2

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/8Kingdoms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10871

Modified Files:
	8Kingdoms.spec 
Added Files:
	8Kingdoms-1.1.0-crash.patch 8Kingdoms-1.1.0-gcc43.patch 
Log Message:
* Thu Jan  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-3
- Rebuild for new tcl, note: it builds but does not work with the new TCL!
  help fixing this asked upstream. Any help much appreciated!
- Fix compiling with gcc 4.3
- Fix crash undercertain conditions (bz 425799)


8Kingdoms-1.1.0-crash.patch:

--- NEW FILE 8Kingdoms-1.1.0-crash.patch ---
--- 8Kingdoms-1.1.0/gui/model/UnitFormation.cpp~	2008-01-03 20:51:33.000000000 +0100
+++ 8Kingdoms-1.1.0/gui/model/UnitFormation.cpp	2008-01-03 20:51:33.000000000 +0100
@@ -148,8 +148,9 @@ void TFormation::setStandardFormation(P2
   //vypocti polohy pro cleny
   TUnitMemberPosition ump; 
   vumpPositions_c = 0;
-  getUnitMemberDim(0, &ump.p2fDim);  
   int size = (int)unit->vMembers.size();
+  if (size)
+    getUnitMemberDim(0, &ump.p2fDim);  
   for(int i = 0; i < size; i++)
   {
     findFreeMemberPosition(vumpPositions_c, &(ump.p2fPos), &(ump.p2fDir));

8Kingdoms-1.1.0-gcc43.patch:

--- NEW FILE 8Kingdoms-1.1.0-gcc43.patch ---
--- 8Kingdoms-1.1.0/common/TCL/tcl_struct.cpp~	2008-01-03 18:45:05.000000000 +0100
+++ 8Kingdoms-1.1.0/common/TCL/tcl_struct.cpp	2008-01-03 18:45:05.000000000 +0100
@@ -6,6 +6,7 @@
 */
 
 #include <stdio.h>
+#include <string.h>
 #include "common/compatibility.h"
 #include "common/types.h"
 #include "tcl_struct.h"
--- 8Kingdoms-1.1.0/ai/Strategizer/attacks.cpp~	2008-01-03 18:35:41.000000000 +0100
+++ 8Kingdoms-1.1.0/ai/Strategizer/attacks.cpp	2008-01-03 18:35:41.000000000 +0100
@@ -9,6 +9,7 @@
 */
 
 #include "ai/Strategizer/attacks.h"
+#include <limits.h>
 
 using namespace World;
 
--- 8Kingdoms-1.1.0/ai/MapAnalyzer/mapanalyzer.cpp~	2008-01-03 18:34:48.000000000 +0100
+++ 8Kingdoms-1.1.0/ai/MapAnalyzer/mapanalyzer.cpp	2008-01-03 18:34:48.000000000 +0100
@@ -9,6 +9,8 @@
 */
 
 #include "ai/MapAnalyzer/mapanalyzer.h"
+#include <limits.h>
+
 using namespace World;
 
 namespace ai_ns


Index: 8Kingdoms.spec
===================================================================
RCS file: /cvs/extras/rpms/8Kingdoms/devel/8Kingdoms.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 8Kingdoms.spec	11 Dec 2007 11:34:11 -0000	1.1
+++ 8Kingdoms.spec	3 Jan 2008 22:12:30 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           8Kingdoms
 Version:        1.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        8 Kingdoms is a 3D turn-based fantasy strategic game
 Group:          Amusements/Games
 License:        GPL+
@@ -23,6 +23,8 @@
 Source3:        %{name}.png
 Patch0:         8Kingdoms-1.1.0-64bit.patch
 Patch1:         8Kingdoms-1.1.0-locking.patch
+Patch2:         8Kingdoms-1.1.0-crash.patch
+Patch3:         8Kingdoms-1.1.0-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  expat-devel SDL_mixer-devel tcl-devel desktop-file-utils
 Requires:       hicolor-icon-theme opengl-games-utils
@@ -46,6 +48,8 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 cp -a %{SOURCE1} external
 chmod -x doc/gui/gui_img1.png
 # configure won't recognize --datadir ...
@@ -100,6 +104,12 @@
 
 
 %changelog
+* Thu Jan  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-3
+- Rebuild for new tcl, note: it builds but does not work with the new TCL!
+  help fixing this asked upstream. Any help much appreciated!
+- Fix compiling with gcc 4.3
+- Fix crash undercertain conditions (bz 425799)
+
 * Sun Dec  2 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-2
 - Replace BuildRequires expat with expat-devel (oops)
 - Add a patch which stops 8Kingdoms from hanging in certain cases