rpms/xu4/devel xu4-1.0beta3-gcc44.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xu4.spec, 1.4, 1.5 xu4-1.0beta3-gcc43.patch, 1.1, NONE
Jason ティビツ
tibbs at fedoraproject.org
Tue Feb 10 04:23:44 UTC 2009
Author: tibbs
Update of /cvs/extras/rpms/xu4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24544
Modified Files:
.cvsignore sources xu4.spec
Added Files:
xu4-1.0beta3-gcc44.patch
Removed Files:
xu4-1.0beta3-gcc43.patch
Log Message:
* Mon Feb 09 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1-0.5.cvs20090209
- Update to latest CVS snapshot - it contains a few minor bugfixes.
- Tweak for gcc 4.4.
xu4-1.0beta3-gcc44.patch:
--- NEW FILE xu4-1.0beta3-gcc44.patch ---
diff -up u4/src/armor.cpp.gcc43 u4/src/armor.cpp
--- u4/src/armor.cpp.gcc43 2005-10-30 13:39:02.000000000 -0600
+++ u4/src/armor.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -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/conversation.cpp.gcc43 u4/src/conversation.cpp
--- u4/src/conversation.cpp.gcc43 2006-01-23 00:57:21.000000000 -0600
+++ u4/src/conversation.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -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/creature.cpp.gcc43 u4/src/creature.cpp
--- u4/src/creature.cpp.gcc43 2006-01-09 15:24:52.000000000 -0600
+++ u4/src/creature.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -6,6 +6,7 @@
#include "creature.h"
+#include <string.h>
#include "combat.h"
#include "config.h"
#include "context.h"
diff -up u4/src/dialogueloader.cpp.gcc43 u4/src/dialogueloader.cpp
--- u4/src/dialogueloader.cpp.gcc43 2005-01-21 02:02:52.000000000 -0600
+++ u4/src/dialogueloader.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -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/dialogueloader_hw.cpp.gcc43 u4/src/dialogueloader_hw.cpp
--- u4/src/dialogueloader_hw.cpp.gcc43 2006-01-23 00:57:21.000000000 -0600
+++ u4/src/dialogueloader_hw.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -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/dialogueloader_tlk.cpp.gcc43 u4/src/dialogueloader_tlk.cpp
--- u4/src/dialogueloader_tlk.cpp.gcc43 2006-01-23 00:57:55.000000000 -0600
+++ u4/src/dialogueloader_tlk.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -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/direction.cpp.gcc43 u4/src/direction.cpp
--- u4/src/direction.cpp.gcc43 2004-05-22 16:03:25.000000000 -0500
+++ u4/src/direction.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -6,6 +6,7 @@
#include "direction.h"
+#include <stdlib.h>
#include "debug.h"
#include "event.h"
#include "utils.h"
diff -up u4/src/lzw/u6decode.cpp.gcc43 u4/src/lzw/u6decode.cpp
--- u4/src/lzw/u6decode.cpp.gcc43 2005-10-03 01:30:09.000000000 -0500
+++ u4/src/lzw/u6decode.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -28,6 +28,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include "u6decode.h"
#include "u6stack.h"
diff -up u4/src/savegame.cpp.gcc43 u4/src/savegame.cpp
--- u4/src/savegame.cpp.gcc43 2005-01-14 02:24:55.000000000 -0600
+++ u4/src/savegame.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -6,6 +6,7 @@
#include "savegame.h"
+#include <string.h>
#include "io.h"
#include "object.h"
#include "types.h"
diff -up u4/src/screen.cpp.gcc43 u4/src/screen.cpp
--- u4/src/screen.cpp.gcc43 2005-12-16 23:59:05.000000000 -0600
+++ u4/src/screen.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -7,6 +7,7 @@
#include <cstdio>
#include <cstdarg>
#include <cfloat>
+#include <cstring>
#include "u4.h"
#include "screen.h"
diff -up u4/src/settings.cpp.gcc43 u4/src/settings.cpp
--- u4/src/settings.cpp.gcc43 2007-01-16 02:06:16.000000000 -0600
+++ u4/src/settings.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -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/spell.cpp.gcc43 u4/src/spell.cpp
--- u4/src/spell.cpp.gcc43 2006-01-04 02:15:19.000000000 -0600
+++ u4/src/spell.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -8,6 +8,7 @@
#include "spell.h"
+#include <string.h>
#include "annotation.h"
#include "combat.h"
#include "context.h"
diff -up u4/src/u4file.cpp.gcc43 u4/src/u4file.cpp
--- u4/src/u4file.cpp.gcc43 2009-02-09 16:16:36.000000000 -0600
+++ u4/src/u4file.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -3,6 +3,7 @@
*/
#include <cctype>
+#include <stdlib.h>
#include "u4file.h"
#include "unzip.h"
diff -up u4/src/u4file.h.gcc43 u4/src/u4file.h
--- u4/src/u4file.h.gcc43 2009-02-09 16:16:39.000000000 -0600
+++ u4/src/u4file.h 2009-02-09 16:16:51.000000000 -0600
@@ -6,6 +6,7 @@
#define U4FILE_H
#include "vc6.h"
+#include <cstdio>
#include <map>
#include <string>
#include <vector>
diff -up u4/src/weapon.cpp.gcc43 u4/src/weapon.cpp
--- u4/src/weapon.cpp.gcc43 2005-10-30 13:39:02.000000000 -0600
+++ u4/src/weapon.cpp 2009-02-09 16:16:36.000000000 -0600
@@ -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"
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xu4/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 12 May 2007 08:22:58 -0000 1.2
+++ .cvsignore 10 Feb 2009 04:23:13 -0000 1.3
@@ -1 +1 @@
-xu4-20070510.tar.gz
+xu4-20090209.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xu4/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 12 May 2007 08:22:58 -0000 1.2
+++ sources 10 Feb 2009 04:23:13 -0000 1.3
@@ -1 +1 @@
-4f1d92d56268977346a48e0da26ec683 xu4-20070510.tar.gz
+3741a0425d706ce342da00052647d53a xu4-20090209.tar.gz
Index: xu4.spec
===================================================================
RCS file: /cvs/extras/rpms/xu4/devel/xu4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xu4.spec 19 Feb 2008 09:53:54 -0000 1.4
+++ xu4.spec 10 Feb 2009 04:23:13 -0000 1.5
@@ -1,8 +1,8 @@
-%define cvsdate 20070510
+%define cvsdate 20090209
Name: xu4
Version: 1.1
-Release: 0.4.cvs%{cvsdate}%{?dist}
+Release: 0.5.cvs%{cvsdate}%{?dist}
Summary: Ultima IV recreated
Group: Amusements/Games
License: GPLv2+
@@ -20,7 +20,7 @@
Source3: u4download.txt
Patch0: xu4-zipfile.patch
Patch1: xu4-1.0beta3-desktop.patch
-Patch2: xu4-1.0beta3-gcc43.patch
+Patch2: xu4-1.0beta3-gcc44.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
@@ -42,7 +42,7 @@
%setup -q -n u4
%patch0 -p1 -z .zipfile
%patch1 -p1 -z .desktop
-%patch2 -p1 -z .gcc43
+%patch2 -p1 -z .gcc44
if [ "%{_lib}" = "lib64" ]; then
sed -i 's|/usr/lib|%{_libdir}|g' src/u4file.cpp
fi
@@ -109,6 +109,10 @@
%changelog
+* Mon Feb 09 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1-0.5.cvs20090209
+- Update to latest CVS snapshot - it contains a few minor bugfixes.
+- Tweak for gcc 4.4.
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1-0.4.cvs20070510
- Autorebuild for GCC 4.3
--- xu4-1.0beta3-gcc43.patch DELETED ---
More information about the fedora-extras-commits
mailing list