rpms/asc/devel asc-2.0.1.0-gcc43.patch,NONE,1.1 asc.spec,1.8,1.9

Sat Jan 12 13:11:47 UTC 2008

Author: jwrdegoede

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

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


asc-2.0.1.0-gcc43.patch:

--- NEW FILE asc-2.0.1.0-gcc43.patch ---
--- asc-2.0.1.0/source/ASCStringHelpers.h	2007-07-30 20:56:41.000000000 +0200
+++ asc-2.0.1.0.new/source/ASCStringHelpers.h	2008-01-12 13:34:46.000000000 +0100
@@ -7,6 +7,7 @@
 #include <cstdio>
 #include <memory>
 #include <string>
+#include <cstring>
 #include <wchar.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -205,9 +206,9 @@
     assert ( pS != NULL );
 
     #ifdef ASC_UNICODE
-        return ::wcslen ( pS );
+        return wcslen ( pS );
     #else
-        return ::strlen ( pS );
+        return strlen ( pS );
     #endif
 }
 
@@ -231,9 +232,9 @@
     assert ( pDest != NULL );
 
     #ifdef ASC_UNICODE
-        return ::wcscpy ( pDest, pSrc );
+        return wcscpy ( pDest, pSrc );
     #else
-        return ::strcpy ( pDest, pSrc );
+        return strcpy ( pDest, pSrc );
     #endif
 }
 
@@ -352,9 +353,9 @@
 #ifndef _UNIX_
 
     #ifdef ASC_UNICODE
-        return ::wcsicmp ( pS1, pS2 );
+        return wcsicmp ( pS1, pS2 );
     #else
-        return ::stricmp ( pS1, pS2 );
+        return stricmp ( pS1, pS2 );
     #endif
 
 #else // _UNIX_
@@ -373,9 +374,9 @@
         _Strlwr ( l_pS1 );
         _Strlwr ( l_pS2 );
 
-        return ::wcscmp ( l_pS1, l_pS2 );
+        return wcscmp ( l_pS1, l_pS2 );
     #else
-        return ::strcasecmp ( pS1, pS2 );
+        return strcasecmp ( pS1, pS2 );
     #endif
 
 #endif // _UNIX_
--- asc-2.0.1.0/source/dialogs/exchangegraphics.cpp	2007-04-12 22:53:24.000000000 +0200
+++ asc-2.0.1.0.new/source/dialogs/exchangegraphics.cpp	2008-01-12 13:37:22.000000000 +0100
@@ -15,6 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */
 #include <boost/regex.hpp>
 
 #include "../paradialog.h"
--- asc-2.0.1.0/source/fieldimageloader.cpp	2007-10-10 21:39:28.000000000 +0200
+++ asc-2.0.1.0.new/source/fieldimageloader.cpp	2008-01-12 13:43:31.000000000 +0100
@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <iostream>
 #include <SDL_image.h>
+#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */
 #include <boost/regex.hpp>
 
 #include "global.h"
--- asc-2.0.1.0/source/libs/loki/Reference/SmallObj.cpp	2007-04-12 22:54:00.000000000 +0200
+++ asc-2.0.1.0.new/source/libs/loki/Reference/SmallObj.cpp	2008-01-12 12:22:17.000000000 +0100
@@ -19,6 +19,7 @@
 #include <cassert>
 #include <algorithm>
 #include <functional>
+#include <limits.h>
 
 using namespace Loki;
 
--- asc-2.0.1.0/source/libs/paragui/src/core/pgfilearchive.cpp	2007-04-13 18:16:00.000000000 +0200
+++ asc-2.0.1.0.new/source/libs/paragui/src/core/pgfilearchive.cpp	2008-01-12 12:12:41.000000000 +0100
@@ -35,6 +35,7 @@
 ///#include "SDL_loadso.h"
 #include "physfsrwops.h"
 #include <iostream>
+#include <string.h>
 #include "paragui.h"
 
 Uint32 PG_FileArchive::my_instance_count = 0;
@@ -109,7 +110,7 @@
 	const char* sep = GetDirSeparator();
 	std::string::size_type pos = 0, incr;
 	newpath = new std::string(path);
-	incr = std::strlen(sep);
+	incr = strlen(sep);
 	if(incr == 1 && sep[0] == '/')
 		return newpath;
 
--- asc-2.0.1.0/source/sdl/sound.cpp	2007-04-13 18:16:09.000000000 +0200
+++ asc-2.0.1.0.new/source/sdl/sound.cpp	2008-01-12 12:25:48.000000000 +0100
@@ -8,6 +8,7 @@
  ***************************************************************************/
 
 
+#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */
 #include <boost/regex.hpp>
 
 #include <cstring>
--- asc-2.0.1.0/source/sg.cpp	2007-10-14 14:53:05.000000000 +0200
+++ asc-2.0.1.0.new/source/sg.cpp	2008-01-12 13:38:40.000000000 +0100
@@ -77,6 +77,7 @@
 #include <algorithm>
 #include <memory>
 
+#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */
 #include <boost/regex.hpp>
 
 #include "paradialog.h"
--- asc-2.0.1.0/source/sgstream.cpp	2007-10-19 20:29:19.000000000 +0200
+++ asc-2.0.1.0.new/source/sgstream.cpp	2008-01-12 13:38:39.000000000 +0100
@@ -36,6 +36,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fstream>
+#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */
 #include <boost/regex.hpp>
 
 #include "global.h"
--- asc-2.0.1.0/source/textfile_evaluation.cpp	2007-07-08 21:59:47.000000000 +0200
+++ asc-2.0.1.0.new/source/textfile_evaluation.cpp	2008-01-12 13:38:40.000000000 +0100
@@ -36,6 +36,7 @@
 #include "Windows.h"
 #endif
 
+#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */
 #include <boost/regex.hpp>
 
 
--- asc-2.0.1.0/source/tools/makegfx.cpp	2007-07-08 17:25:21.000000000 +0200
+++ asc-2.0.1.0.new/source/tools/makegfx.cpp	2008-01-12 13:38:41.000000000 +0100
@@ -10,6 +10,7 @@
 #include <SDL_image.h>
 #include <SDL.h>
 
+#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */
 #include <boost/regex.hpp>
 
 #include "../basegfx.h"
--- asc-2.0.1.0/source/widgets/textrenderer-addons.cpp	2007-04-13 18:16:18.000000000 +0200
+++ asc-2.0.1.0.new/source/widgets/textrenderer-addons.cpp	2008-01-12 13:38:42.000000000 +0100
@@ -17,6 +17,7 @@
 
 
 
+#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */
 #include <boost/regex.hpp>
 #include <pglabel.h>
 #include <pgimage.h>
--- asc-2.0.1.0/source/widgets/textrenderer.cpp	2007-04-13 18:16:18.000000000 +0200
+++ asc-2.0.1.0.new/source/widgets/textrenderer.cpp	2008-01-12 13:38:41.000000000 +0100
@@ -17,6 +17,7 @@
 
 
 
+#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */
 #include <boost/regex.hpp>
 #include <pglabel.h>
 #include <pgimage.h>


Index: asc.spec
===================================================================
RCS file: /cvs/extras/rpms/asc/devel/asc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- asc.spec	13 Nov 2007 10:19:14 -0000	1.8
+++ asc.spec	12 Jan 2008 13:11:13 -0000	1.9
@@ -1,12 +1,13 @@
 Name:           asc
 Version:        2.0.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Advanced Strategic Command
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.asc-hq.org/
 Source0:        http://downloads.sourceforge.net/asc-hq/asc-%{version}.tar.bz2
 Source1:        %{name}.desktop
+Patch0:         asc-2.0.1.0-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_sound-devel
 BuildRequires:  bzip2-devel libjpeg-devel libsigc++-devel physfs-devel
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i 's|$datadir/games/|$datadir/|g' configure
 sed -i 's|$(datadir)/games/|$(datadir)/|g' `find -name Makefile.in`
 
@@ -80,6 +82,9 @@
 
 
 %changelog
+* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.1.0-2
+- Fix compilation with gcc-4.3
+
 * Sun Oct 28 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.1.0-1
 - New upstream version 2.0.1.0
 - Use included (patched/bugfixed) paragui copy


