rpms/vegastrike/devel vegastrike-0.5.0-gcc44.patch, NONE, 1.1 vegastrike.spec, 1.18, 1.19

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/vegastrike/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15522

Modified Files:
	vegastrike.spec 
Added Files:
	vegastrike-0.5.0-gcc44.patch 
Log Message:
* Sat May 23 2009 Hans de Goede <hdegoede at redhat.com> 0.5.0-10
- Rebuild for new boost and new ogre


vegastrike-0.5.0-gcc44.patch:

--- NEW FILE vegastrike-0.5.0-gcc44.patch ---
diff -up vegastrike-source-0.5.0/src/cmd/basecomputer.cpp~ vegastrike-source-0.5.0/src/cmd/basecomputer.cpp
--- vegastrike-source-0.5.0/src/cmd/basecomputer.cpp~	2008-04-26 12:00:24.000000000 +0200
+++ vegastrike-source-0.5.0/src/cmd/basecomputer.cpp	2009-05-23 17:23:55.000000000 +0200
@@ -3128,9 +3128,9 @@ static int	nodirs( const struct dirent *
 	return 0;
 }
 
-static int datesort ( const void *v1, const void *v2 ) {
-	const struct dirent *d1=*(const struct dirent**)v1;
-	const struct dirent *d2=*(const struct dirent**)v2;
+static int datesort ( const struct dirent **v1, const struct dirent **v2 ) {
+	const struct dirent *d1=*v1;
+	const struct dirent *d2=*v2;
 	struct stat s1, s2;
 	std::string tmp=VSFileSystem::homedir+"/save/"+d1->d_name;
 	if (stat(tmp.c_str(), &s1))
@@ -3142,12 +3142,6 @@ static int datesort ( const void *v1, co
 	return s1.st_mtime - s2.st_mtime;
 }
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
-typedef int (*scancompare) ( const struct dirent **v1, const struct dirent **v2 );
-#else
-typedef int (*scancompare) ( const void *v1, const void *v2 );
-#endif
-
 // Load the controls for the News display.
 void BaseComputer::loadLoadSaveControls(void) {
     SimplePicker* picker = static_cast<SimplePicker*>( window()->findControlById("LoadSavePicker") );
@@ -3160,7 +3154,7 @@ void BaseComputer::loadLoadSaveControls(
 		const int playerNum=UnitUtil::isPlayerStarship(playerUnit);
 		struct dirent ** dirlist;
 		std::string savedir = VSFileSystem::homedir+"/save/";
-		int ret = scandir (savedir.c_str(),&dirlist,nodirs,(scancompare)&datesort);
+		int ret = scandir (savedir.c_str(),&dirlist,nodirs,datesort);
 		while( ret-->0) {
 			picker->addCell(new SimplePickerCell(dirlist[ret]->d_name));
 		}		


Index: vegastrike.spec
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- vegastrike.spec	3 Mar 2009 17:47:15 -0000	1.18
+++ vegastrike.spec	23 May 2009 17:28:30 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           vegastrike
 Version:        0.5.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        3D OpenGL spaceflight simulator
 Group:          Amusements/Games
 License:        GPLv2+
@@ -18,6 +18,7 @@ Patch4:         vegastrike-0.4.3-64-bit.
 Patch5:         vegastrike-0.4.3-openal.patch
 Patch6:         vegastrike-0.4.3-sys-python.patch
 Patch7:         vegastrike-0.5.0-boost-make_shared.patch
+Patch8:         vegastrike-0.5.0-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGLU-devel freeglut-devel libXi-devel libXmu-devel gtk2-devel
 BuildRequires:  libjpeg-devel libpng-devel boost-devel expat-devel python-devel
@@ -43,6 +44,7 @@ Yet danger lurks in the space beyond.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 iconv -f ISO-8859-1 -t UTF-8 README > README.tmp
 touch -r README README.tmp
 mv README.tmp README
@@ -98,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat May 23 2009 Hans de Goede <hdegoede at redhat.com> 0.5.0-10
+- Rebuild for new boost and new ogre
+
 * Tue Mar 03 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.0-9
 - Rebuild for new ogre