[vegastrike] The code modified by the gcc45 patch is no longer present.

[Bruno Wolff III]

commit 7bbb68a2de51561c4c7555e99ec20def01b16f6c
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat Jul 9 10:13:35 2011 -0500

    The code modified by the gcc45 patch is no longer present.

 vegastrike-0.5.0-gcc44.patch |   38 --------------------------------------
 vegastrike-0.5.0-gcc45.patch |   12 ------------
 vegastrike-0.5.1-gcc44.patch |   38 ++++++++++++++++++++++++++++++++++++++
 vegastrike.spec              |    6 ++----
 4 files changed, 40 insertions(+), 54 deletions(-)
---
diff --git a/vegastrike-0.5.1-gcc44.patch b/vegastrike-0.5.1-gcc44.patch
new file mode 100644
index 0000000..682b20e
--- /dev/null
+++ b/vegastrike-0.5.1-gcc44.patch
@@ -0,0 +1,38 @@
+--- src/cmd/basecomputer.cpp.orig	2011-07-09 10:00:20.544612061 -0500
++++ src/cmd/basecomputer.cpp	2011-07-09 10:04:15.675495960 -0500
+@@ -3143,10 +3143,10 @@
+     return 0;
+ }
+ 
+-static int datesort( const void *v1, const void *v2 )
++static int datesort ( const struct dirent **v1, const struct dirent **v2 )
+ {
+-    const struct dirent *d1 = *(const struct dirent**) v1;
+-    const struct dirent *d2 = *(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 ) )
+@@ -3157,12 +3157,6 @@
+     return s1.st_mtime-s2.st_mtime;
+ }
+ 
+-#if (defined (_WIN32) && !defined (__CYGWIN__ ) ) || (defined (__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 10) || defined(__HAIKU__)
+-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 )
+ {
+@@ -3175,7 +3169,7 @@
+     if (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 ) );
+     }
diff --git a/vegastrike.spec b/vegastrike.spec
index 6802b7a..c76b4f6 100644
--- a/vegastrike.spec
+++ b/vegastrike.spec
@@ -18,9 +18,8 @@ Patch3:         vegastrike-0.4.2-vssetup-fix.patch
 Patch4:         vegastrike-0.4.3-64-bit.patch
 Patch5:         vegastrike-0.5.1-openal.patch
 Patch6:         vegastrike-0.5.1-sys-python.patch
-Patch8:         vegastrike-0.5.0-gcc44.patch
+Patch8:         vegastrike-0.5.1-gcc44.patch
 Patch9:         vegastrike-0.5.0-glext.patch
-Patch10:        vegastrike-0.5.0-gcc45.patch
 Patch11:        vegastrike-0.5.0-gcc46.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGLU-devel freeglut-devel libXi-devel libXmu-devel gtk2-devel
@@ -46,9 +45,8 @@ Yet danger lurks in the space beyond.
 %patch4 -p1
 %patch5 -p0
 %patch6 -p0
-%patch8 -p1
+%patch8 -p0
 %patch9 -p1
-%patch10 -p1
 %patch11 -p1
 iconv -f ISO-8859-1 -t UTF-8 README > README.tmp
 touch -r README README.tmp