rpms/scummvm/devel scummvm-0.10.0-gcc43.patch, NONE, 1.1 scummvm.spec, 1.6, 1.7

Sat Jan 12 21:40:09 UTC 2008

Author: jwrdegoede

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

Modified Files:
	scummvm.spec 
Added Files:
	scummvm-0.10.0-gcc43.patch 
Log Message:
* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-3
- Fix compilation with gcc 4.3


scummvm-0.10.0-gcc43.patch:

--- NEW FILE scummvm-0.10.0-gcc43.patch ---
diff -up scummvm-0.10.0/engines/touche/saveload.cpp~ scummvm-0.10.0/engines/touche/saveload.cpp
--- scummvm-0.10.0/engines/touche/saveload.cpp~	2008-01-12 22:36:43.000000000 +0100
+++ scummvm-0.10.0/engines/touche/saveload.cpp	2008-01-12 22:36:43.000000000 +0100
@@ -40,22 +40,22 @@ template <class S, class T>
 static void saveOrLoad(S &s, T &t);
 
 template <>
-static void saveOrLoad(Common::WriteStream &stream, uint16 &i) {
+void saveOrLoad(Common::WriteStream &stream, uint16 &i) {
 	stream.writeUint16LE(i);
 }
 
 template <>
-static void saveOrLoad(Common::ReadStream &stream, uint16 &i) {
+void saveOrLoad(Common::ReadStream &stream, uint16 &i) {
 	i = stream.readUint16LE();
 }
 
 template <>
-static void saveOrLoad(Common::WriteStream &stream, int16 &i) {
+void saveOrLoad(Common::WriteStream &stream, int16 &i) {
 	stream.writeSint16LE(i);
 }
 
 template <>
-static void saveOrLoad(Common::ReadStream &stream, int16 &i) {
+void saveOrLoad(Common::ReadStream &stream, int16 &i) {
 	i = stream.readSint16LE();
 }
 
@@ -63,19 +63,19 @@ template <class S, class T>
 static void saveOrLoadPtr(S &s, T *&t, T *base);
 
 template <>
-static void saveOrLoadPtr(Common::WriteStream &stream, int16 *&p, int16 *base) {
+void saveOrLoadPtr(Common::WriteStream &stream, int16 *&p, int16 *base) {
 	int32 offset = (int32)(p - base);
 	stream.writeSint32LE(offset);
 }
 
 template <>
-static void saveOrLoadPtr(Common::ReadStream &stream, int16 *&p, int16 *base) {
+void saveOrLoadPtr(Common::ReadStream &stream, int16 *&p, int16 *base) {
 	int32 offset = stream.readSint32LE();
 	p = base + offset;
 }
 
 template <class S>
-static void saveOrLoad(S &s, Common::Rect &r) {
+void saveOrLoad(S &s, Common::Rect &r) {
 	saveOrLoad(s, r.left);
 	saveOrLoad(s, r.top);
 	saveOrLoad(s, r.right);
@@ -83,13 +83,13 @@ static void saveOrLoad(S &s, Common::Rec
 }
 
 template <class S>
-static void saveOrLoad(S &s, SequenceEntry &seq) {
+void saveOrLoad(S &s, SequenceEntry &seq) {
 	saveOrLoad(s, seq.sprNum);
 	saveOrLoad(s, seq.seqNum);
 }
 
 template <class S>
-static void saveOrLoad(S &s, KeyChar &key) {
+void saveOrLoad(S &s, KeyChar &key) {
 	saveOrLoad(s, key.num);
 	saveOrLoad(s, key.flags);
 	saveOrLoad(s, key.currentAnimCounter);
@@ -149,14 +149,14 @@ static void saveOrLoad(S &s, KeyChar &ke
 }
 
 template <class S>
-static void saveOrLoad(S &s, TalkEntry &entry) {
+void saveOrLoad(S &s, TalkEntry &entry) {
 	saveOrLoad(s, entry.otherKeyChar);
 	saveOrLoad(s, entry.talkingKeyChar);
 	saveOrLoad(s, entry.num);
 }
 
 template <class S>
-static void saveOrLoad(S &s, ProgramHitBoxData &data) {
+void saveOrLoad(S &s, ProgramHitBoxData &data) {
 	saveOrLoad(s, data.item);
 	saveOrLoad(s, data.talk);
 	saveOrLoad(s, data.state);
@@ -171,14 +171,14 @@ static void saveOrLoad(S &s, ProgramHitB
 }
 
 template <class S>
-static void saveOrLoad(S &s, Area &area) {
+void saveOrLoad(S &s, Area &area) {
 	saveOrLoad(s, area.r);
 	saveOrLoad(s, area.srcX);
 	saveOrLoad(s, area.srcY);
 }
 
 template <class S>
-static void saveOrLoad(S &s, ProgramBackgroundData &data) {
+void saveOrLoad(S &s, ProgramBackgroundData &data) {
 	saveOrLoad(s, data.area);
 	saveOrLoad(s, data.type);
 	saveOrLoad(s, data.offset);
@@ -187,7 +187,7 @@ static void saveOrLoad(S &s, ProgramBack
 }
 
 template <class S>
-static void saveOrLoad(S &s, ProgramAreaData &data) {
+void saveOrLoad(S &s, ProgramAreaData &data) {
 	saveOrLoad(s, data.area);
 	saveOrLoad(s, data.id);
 	saveOrLoad(s, data.state);
@@ -196,7 +196,7 @@ static void saveOrLoad(S &s, ProgramArea
 }
 
 template <class S>
-static void saveOrLoad(S &s, ProgramWalkData &data) {
+void saveOrLoad(S &s, ProgramWalkData &data) {
 	saveOrLoad(s, data.point1);
 	saveOrLoad(s, data.point2);
 	saveOrLoad(s, data.clippingRect);
@@ -205,7 +205,7 @@ static void saveOrLoad(S &s, ProgramWalk
 }
 
 template <class S>
-static void saveOrLoad(S &s, ProgramPointData &data) {
+void saveOrLoad(S &s, ProgramPointData &data) {
 	saveOrLoad(s, data.x);
 	saveOrLoad(s, data.y);
 	saveOrLoad(s, data.z);
@@ -216,7 +216,7 @@ template <class S, class A>
 static void saveOrLoadCommonArray(S &s, A &array);
 
 template <class A>
-static void saveOrLoadCommonArray(Common::WriteStream &stream, A &array) {
+void saveOrLoadCommonArray(Common::WriteStream &stream, A &array) {
 	uint count = array.size();
 	assert(count < 0xFFFF);
 	stream.writeUint16LE(count);
@@ -226,7 +226,7 @@ static void saveOrLoadCommonArray(Common
 }
 
 template <class A>
-static void saveOrLoadCommonArray(Common::ReadStream &stream, A &array) {
+void saveOrLoadCommonArray(Common::ReadStream &stream, A &array) {
 	uint count = stream.readUint16LE();
 	if (count == array.size()) {
 		for (uint i = 0; i < count; ++i) {


Index: scummvm.spec
===================================================================
RCS file: /cvs/extras/rpms/scummvm/devel/scummvm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scummvm.spec	15 Aug 2007 09:43:16 -0000	1.6
+++ scummvm.spec	12 Jan 2008 21:39:36 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           scummvm
 Version:        0.10.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Interpreter for several adventure games
 Group:          Applications/Emulators
 License:        GPLv2+
@@ -10,6 +10,7 @@
 Source1:        scummvm-icons.tar.gz
 Patch0:         scummvm-0.9.0-nostrip.patch
 Patch1:         scummvm-0.9.1-no-execstack.patch
+Patch2:         scummvm-0.10.0-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel libvorbis-devel flac-devel zlib-devel
 BuildRequires:  desktop-file-utils
@@ -33,6 +34,7 @@
 %setup -q -a 1
 %patch0 -p1 -b .nostrip
 %patch1 -p1 -b .execstack
+%patch2 -p1 -b .gcc
 sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop
 sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
   dists/%{name}.desktop
@@ -104,6 +106,9 @@
 
 
 %changelog
+* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-3
+- Fix compilation with gcc 4.3
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-2
 - Update License tag for new Licensing Guidelines compliance
 


