rpms/xu4/devel xu4-1.0beta3-gcc43.patch,NONE,1.1 xu4.spec,1.2,1.3

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/xu4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27822

Modified Files:
	xu4.spec 
Added Files:
	xu4-1.0beta3-gcc43.patch 
Log Message:
* Fri Jan 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-0.3.cvs20070510
- Fix compilation with gcc 4.3


xu4-1.0beta3-gcc43.patch:

--- NEW FILE xu4-1.0beta3-gcc43.patch ---
diff -up u4/src/lzw/u6decode.cpp~ u4/src/lzw/u6decode.cpp
--- u4/src/lzw/u6decode.cpp~	2008-01-11 23:07:56.000000000 +0100
+++ u4/src/lzw/u6decode.cpp	2008-01-11 23:07:56.000000000 +0100
@@ -28,6 +28,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "u6decode.h"
 #include "u6stack.h"
diff -up u4/src/dialogueloader_tlk.cpp~ u4/src/dialogueloader_tlk.cpp
--- u4/src/dialogueloader_tlk.cpp~	2008-01-11 22:58:39.000000000 +0100
+++ u4/src/dialogueloader_tlk.cpp	2008-01-11 22:58:39.000000000 +0100
@@ -5,6 +5,7 @@
 #include "vc6.h" // Fixes things if you're using VC6, does nothing if otherwise
 
 #include <string>
+#include <cstring>
 
 #include "conversation.h"
 #include "dialogueloader_tlk.h"
diff -up u4/src/settings.cpp~ u4/src/settings.cpp
--- u4/src/settings.cpp~	2008-01-11 23:01:17.000000000 +0100
+++ u4/src/settings.cpp	2008-01-11 23:01:17.000000000 +0100
@@ -5,6 +5,7 @@
 #include "vc6.h" // Fixes things if you're using VC6, does nothing if otherwise
 
 #include <cctype>
+#include <cstring>
 
 #include "settings.h"
 
diff -up u4/src/weapon.cpp~ u4/src/weapon.cpp
--- u4/src/weapon.cpp~	2008-01-11 23:07:21.000000000 +0100
+++ u4/src/weapon.cpp	2008-01-11 23:07:21.000000000 +0100
@@ -5,6 +5,7 @@
 #include "vc6.h" // Fixes things if you're using VC6, does nothing if otherwise
 
 #include <string>
+#include <cstring>
 
 #include "weapon.h"
 
diff -up u4/src/dialogueloader.cpp~ u4/src/dialogueloader.cpp
--- u4/src/dialogueloader.cpp~	2008-01-11 22:56:25.000000000 +0100
+++ u4/src/dialogueloader.cpp	2008-01-11 22:57:56.000000000 +0100
@@ -4,6 +4,8 @@
 
 #include "vc6.h" // Fixes things if you're using VC6, does nothing if otherwise
 
+#include <stdlib.h>
+#include <string.h>
 #include "debug.h"
 #include "conversation.h"
 #include "dialogueloader.h"
diff -up u4/src/screen.cpp~ u4/src/screen.cpp
--- u4/src/screen.cpp~	2008-01-11 23:00:54.000000000 +0100
+++ u4/src/screen.cpp	2008-01-11 23:00:54.000000000 +0100
@@ -7,6 +7,7 @@
 #include <cstdio>
 #include <cstdarg>
 #include <cfloat>
+#include <cstring>
 #include "u4.h"
 
 #include "screen.h"
diff -up u4/src/armor.cpp~ u4/src/armor.cpp
--- u4/src/armor.cpp~	2008-01-11 22:54:44.000000000 +0100
+++ u4/src/armor.cpp	2008-01-11 22:54:44.000000000 +0100
@@ -5,6 +5,7 @@
 #include "vc6.h" // Fixes things if you're using VC6, does nothing if otherwise
 
 #include <vector>
+#include <string.h>
 
 #include "armor.h"
 
diff -up u4/src/direction.cpp~ u4/src/direction.cpp
--- u4/src/direction.cpp~	2008-01-11 22:59:05.000000000 +0100
+++ u4/src/direction.cpp	2008-01-11 22:59:05.000000000 +0100
@@ -6,6 +6,7 @@
 
 #include "direction.h"
 
+#include <stdlib.h>
 #include "debug.h"
 #include "event.h"
 #include "utils.h"
diff -up u4/src/creature.cpp~ u4/src/creature.cpp
--- u4/src/creature.cpp~	2008-01-11 22:55:41.000000000 +0100
+++ u4/src/creature.cpp	2008-01-11 22:55:41.000000000 +0100
@@ -6,6 +6,7 @@
 
 #include "creature.h"
 
+#include <string.h>
 #include "combat.h"
 #include "config.h"
 #include "context.h"
diff -up u4/src/u4file.cpp~ u4/src/u4file.cpp
--- u4/src/u4file.cpp~	2008-01-11 23:07:05.000000000 +0100
+++ u4/src/u4file.cpp	2008-01-11 23:07:05.000000000 +0100
@@ -3,6 +3,7 @@
  */
 
 #include <cctype>
+#include <stdlib.h>
 
 #include "u4file.h"
 #include "unzip.h"
diff -up u4/src/dialogueloader_hw.cpp~ u4/src/dialogueloader_hw.cpp
--- u4/src/dialogueloader_hw.cpp~	2008-01-11 22:58:24.000000000 +0100
+++ u4/src/dialogueloader_hw.cpp	2008-01-11 22:58:24.000000000 +0100
@@ -5,6 +5,7 @@
 #include "vc6.h" // Fixes things if you're using VC6, does nothing if otherwise
 
 #include <string>
+#include <cstring>
 #include <vector>
 
 #include "context.h"
diff -up u4/src/conversation.cpp~ u4/src/conversation.cpp
--- u4/src/conversation.cpp~	2008-01-11 22:55:16.000000000 +0100
+++ u4/src/conversation.cpp	2008-01-11 22:55:16.000000000 +0100
@@ -4,6 +4,7 @@
 
 #include "vc6.h" // Fixes things if you're using VC6, does nothing if otherwise
 
+#include <string.h>
 #include "conversation.h"
 #include "debug.h"
 #include "person.h"
diff -up u4/src/spell.cpp~ u4/src/spell.cpp
--- u4/src/spell.cpp~	2008-01-11 23:06:26.000000000 +0100
+++ u4/src/spell.cpp	2008-01-11 23:06:26.000000000 +0100
@@ -8,6 +8,7 @@
 
 #include "spell.h"
 
+#include <string.h>
 #include "annotation.h"
 #include "combat.h"
 #include "context.h"
diff -up u4/src/savegame.cpp~ u4/src/savegame.cpp
--- u4/src/savegame.cpp~	2008-01-11 23:00:17.000000000 +0100
+++ u4/src/savegame.cpp	2008-01-11 23:00:17.000000000 +0100
@@ -6,6 +6,7 @@
 
 #include "savegame.h"
 
+#include <string.h>
 #include "io.h"
 #include "object.h"
 #include "types.h"


Index: xu4.spec
===================================================================
RCS file: /cvs/extras/rpms/xu4/devel/xu4.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xu4.spec	16 Aug 2007 09:13:54 -0000	1.2
+++ xu4.spec	11 Jan 2008 22:10:28 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           xu4
 Version:        1.1
-Release:        0.2.cvs%{cvsdate}%{?dist}
+Release:        0.3.cvs%{cvsdate}%{?dist}
 Summary:        Ultima IV recreated
 Group:          Amusements/Games
 License:        GPLv2+
@@ -20,6 +20,7 @@
 Source3:        u4download.txt
 Patch0:         xu4-zipfile.patch
 Patch1:         xu4-1.0beta3-desktop.patch
+Patch2:         xu4-1.0beta3-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel libxml2-devel libpng-devel desktop-file-utils
 Requires:       hicolor-icon-theme autodownloader
@@ -41,6 +42,7 @@
 %setup -q -n u4
 %patch0 -p1 -z .zipfile
 %patch1 -p1 -z .desktop
+%patch2 -p1 -z .gcc43
 if [ "%{_lib}" = "lib64" ]; then
   sed -i 's|/usr/lib|%{_libdir}|g' src/u4file.cpp
 fi
@@ -107,6 +109,9 @@
 
 
 %changelog
+* Fri Jan 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-0.3.cvs20070510
+- Fix compilation with gcc 4.3
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-0.2.cvs20070510
 - Update License tag for new Licensing Guidelines compliance