[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/vegastrike/devel vegastrike-0.4.2-char-fix.patch, NONE, 1.1 vegastrike-0.4.2-launcher-fix.patch, NONE, 1.1 vegastrike-0.4.2-opengl-fix.patch, NONE, 1.1 vegastrike-0.4.2-paths-fix.patch, NONE, 1.1 vegastrike-0.4.2-posh-fix.patch, NONE, 1.1 vegastrike-0.4.2-vssetup-fix.patch, NONE, 1.1 vegastrike-0.4.3-64-bit.patch, NONE, 1.1 vegastrike-0.4.3-alut-fixes.patch, NONE, 1.1 vegastrike-0.4.3-gcc4-fix.patch, NONE, 1.1 vegastrike-0.4.3-gcc41-fix.patch, NONE, 1.1 vegastrike-0.4.3-gtk2.patch, NONE, 1.1 vegastrike-0.4.3-openal.patch, NONE, 1.1 vegastrike-0.4.3-sys-python.patch, NONE, 1.1 vegastrike-0.4.3-use-system-boost.patch, NONE, 1.1 vegastrike-32x32.png, NONE, 1.1 vegastrike-48x48.png, NONE, 1.1 vegastrike-wrapper.sh, NONE, 1.1 vegastrike.desktop, NONE, 1.1 vegastrike.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2



Author: jwrdegoede

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

Modified Files:
	.cvsignore sources 
Added Files:
	vegastrike-0.4.2-char-fix.patch 
	vegastrike-0.4.2-launcher-fix.patch 
	vegastrike-0.4.2-opengl-fix.patch 
	vegastrike-0.4.2-paths-fix.patch 
	vegastrike-0.4.2-posh-fix.patch 
	vegastrike-0.4.2-vssetup-fix.patch 
	vegastrike-0.4.3-64-bit.patch 
	vegastrike-0.4.3-alut-fixes.patch 
	vegastrike-0.4.3-gcc4-fix.patch 
	vegastrike-0.4.3-gcc41-fix.patch vegastrike-0.4.3-gtk2.patch 
	vegastrike-0.4.3-openal.patch 
	vegastrike-0.4.3-sys-python.patch 
	vegastrike-0.4.3-use-system-boost.patch vegastrike-32x32.png 
	vegastrike-48x48.png vegastrike-wrapper.sh vegastrike.desktop 
	vegastrike.spec 
Log Message:
Initial vegastrike import


vegastrike-0.4.2-char-fix.patch:

--- NEW FILE vegastrike-0.4.2-char-fix.patch ---
diff -urN vegastrike-0.4.2.orig/src/xml_serializer.h vegastrike-0.4.2/src/xml_serializer.h
--- vegastrike-0.4.2.orig/src/xml_serializer.h	2004-04-25 22:24:48.000000000 -0400
+++ vegastrike-0.4.2/src/xml_serializer.h	2004-11-22 17:16:54.000000000 -0500
@@ -12,7 +12,7 @@
 	unsigned int *ui;
     float *f;
     void * p;
-    char * c;
+    signed char * c;
    // short * s;
     bool * b;
     double * d;
@@ -30,7 +30,7 @@
   XMLType (float myhardfloat) {w.hardfloat = myhardfloat;}
   XMLType (float  *myfloat) {w.f =myfloat;}
   XMLType (void * myvoid) {w.p=myvoid;}
-  XMLType (char * mychar) {w.c=mychar;}
+  XMLType (signed char * mychar) {w.c=mychar;}
   //XMLType (short * mychar) {w.s=mychar;} // removing useless shorts - use integers instead
   //XMLType (unsigned short * mychar) {w.us=mychar;} // removing useless shorts - use integers instead
   XMLType (unsigned char * mychar) {w.uc=mychar;}

vegastrike-0.4.2-launcher-fix.patch:

--- NEW FILE vegastrike-0.4.2-launcher-fix.patch ---
diff -urN vegastrike-0.4.1.orig/launcher/saveinterface.cpp vegastrike-0.4.1/launcher/saveinterface.cpp
--- vegastrike-0.4.1.orig/launcher/saveinterface.cpp	2003-09-18 22:43:38.000000000 -0400
+++ vegastrike-0.4.1/launcher/saveinterface.cpp	2003-10-02 21:19:31.000000000 -0400
@@ -172,7 +172,7 @@
 	stupod *s= (stupod*)lpParameter;
         progress=false;
         Help ("Please wait while vegastrike loads...","Please wait while vegastrike loads...");
-		int pid=spawnl(P_WAIT,"./vegastrike","./vegastrike",s->num?s->num:(std::string("\"")+s->my_mission+"\"").c_str(),s->num?(std::string("\"")+s->my_mission+"\"").c_str():NULL,NULL);
+		int pid=spawnl(P_WAIT,"vegastrike","vegastrike",s->num?s->num:(std::string("\"")+s->my_mission+"\"").c_str(),s->num?(std::string("\"")+s->my_mission+"\"").c_str():NULL,NULL);
 		if (pid==-1) {
 			if (chdir("bin")==0) {
 				spawnl(P_WAIT,"./vegastrike","./vegastrike",s->num?s->num:(std::string("\"")+s->my_mission+"\"").c_str(),s->num?(std::string("\"")+s->my_mission+"\"").c_str():NULL,NULL);
@@ -190,7 +190,7 @@
 
 #ifndef _WIN32
 void changeToData () {
-   chdir ("/usr/games/vegastrike/data");
+   chdir ("/usr/share/vegastrike");
    FILE * fp = fopen ("vegastrike.config","r");
    if (!fp){
 	   chdir ("/usr/local/vegastrike/data");
@@ -218,7 +218,7 @@
    fflush (stdout);
 #ifndef _WIN32
    changeToData();
-   execlp ("vegastrike","/usr/local/bin/vegastrike",num,my_mission.c_str(),NULL);   
+   execlp ("vegastrike","vegastrike",num,my_mission.c_str(),NULL);   
 #else
    DWORD id;
    HANDLE hThr=CreateThread(NULL,0,DrawStartupDialog,(void *)new stupod (strdup (my_mission.c_str()),strdup (num)),0,&id);
@@ -230,7 +230,7 @@
 #ifndef _WIN32
 
    changeToData();
-   execlp ("vegastrike","/usr/local/bin/vegastrike",my_mission.c_str(),NULL);   
+   execlp ("vegastrike","vegastrike",my_mission.c_str(),NULL);   
 #else
    DWORD id;
    HANDLE hThr=CreateThread(NULL,0,DrawStartupDialog,(void *)new stupod (strdup (my_mission.c_str()),NULL),0,&id);

vegastrike-0.4.2-opengl-fix.patch:

--- NEW FILE vegastrike-0.4.2-opengl-fix.patch ---
diff -urN vegastrike-0.4.2.orig/src/gfxlib_struct.cpp vegastrike-0.4.2/src/gfxlib_struct.cpp
--- vegastrike-0.4.2.orig/src/gfxlib_struct.cpp	2004-08-25 15:34:16.000000000 -0400
+++ vegastrike-0.4.2/src/gfxlib_struct.cpp	2004-11-22 18:37:08.000000000 -0500
@@ -4,7 +4,7 @@
 #include "xml_support.h"
 #include "config_xml.h"
 #include "vs_globals.h"
-
+#include "gldrv/gl_compat.h"
 
 //#define GFX_BUFFER_MAP_UNMAP
 static GLenum gl_error;
diff -urN vegastrike-0.4.2.orig/src/gldrv/gl_compat.h vegastrike-0.4.2/src/gldrv/gl_compat.h
--- vegastrike-0.4.2.orig/src/gldrv/gl_compat.h	1969-12-31 19:00:00.000000000 -0500
+++ vegastrike-0.4.2/src/gldrv/gl_compat.h	2004-11-22 18:36:13.000000000 -0500
@@ -0,0 +1,63 @@
+
+#ifndef GL_COMPAT_H
+#define GL_COMPAT_H
+
+#include <GL/glext.h>
+
+#ifndef GLsizeiptrARB
+typedef ptrdiff_t GLsizeiptrARB;
+#endif
+
+#ifndef GL_ARRAY_BUFFER_ARB
+#define GL_ARRAY_BUFFER_ARB                             0x8892
+#endif
+
+#ifndef GL_ELEMENT_ARRAY_BUFFER_ARB
+#define GL_ELEMENT_ARRAY_BUFFER_ARB                     0x8893
+#endif
+
+#ifndef GL_DYNAMIC_DRAW_ARB
+#define GL_DYNAMIC_DRAW_ARB                             0x88E8
+#endif
+
+#ifndef GL_STATIC_DRAW_ARB
+#define GL_STATIC_DRAW_ARB                              0x88E4
+#endif
+
+#ifndef GL_READ_WRITE_ARB
+#define GL_READ_WRITE_ARB                               0x88BA
+#endif
+
+#ifndef GL_READ_ONLY_ARB
+#define GL_READ_ONLY_ARB                                0x88B8
+#endif
+
+#ifndef GL_WRITE_ONLY_ARB
+#define GL_WRITE_ONLY_ARB                               0x88B9
+#endif
+
+#ifndef PFNGLBINDBUFFERARBPROC
+typedef void (APIENTRY * PFNGLBINDBUFFERARBPROC)(GLenum target, GLuint buffer);
+#endif
+
+#ifndef PFNGLGENBUFFERSARBPROC
+typedef void (APIENTRY * PFNGLGENBUFFERSARBPROC)(GLsizei n, GLuint *buffers);
+#endif
+
+#ifndef PFNGLDELETEBUFFERSARBPROC
+typedef void (APIENTRY * PFNGLDELETEBUFFERSARBPROC)(GLsizei n, const GLuint *buffers);
+#endif
+
+#ifndef PFNGLBUFFERDATAARBPROC
+typedef void (APIENTRY * PFNGLBUFFERDATAARBPROC)(GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+#endif
+
+#ifndef PFNGLMAPBUFFERARBPROC
+typedef void* (APIENTRY * PFNGLMAPBUFFERARBPROC)(GLenum target, GLenum access);
+#endif
+
+#ifndef PFNGLUNMAPBUFFERARBPROC
+typedef GLboolean (APIENTRY * PFNGLUNMAPBUFFERARBPROC)(GLenum target);
+#endif
+
+#endif
diff -urN vegastrike-0.4.2.orig/src/gldrv/gl_globals.h vegastrike-0.4.2/src/gldrv/gl_globals.h
--- vegastrike-0.4.2.orig/src/gldrv/gl_globals.h	2004-08-13 22:09:58.000000000 -0400
+++ vegastrike-0.4.2/src/gldrv/gl_globals.h	2004-11-22 18:36:49.000000000 -0500
@@ -86,6 +86,7 @@
 #undef __glext_h_
 
     #include <GL/glext.h>
+    #include "gl_compat.h"
 #endif
 #ifdef _WIN32
 #define GL_TEXTURE0_ARB 0x84C0

vegastrike-0.4.2-paths-fix.patch:

--- NEW FILE vegastrike-0.4.2-paths-fix.patch ---
diff -urN vegastrike-0.4.2.orig/src/main.cpp vegastrike-0.4.2/src/main.cpp
--- vegastrike-0.4.2.orig/src/main.cpp	2004-08-16 03:01:08.000000000 -0400
+++ vegastrike-0.4.2/src/main.cpp	2004-11-22 17:37:18.000000000 -0500
@@ -230,7 +230,7 @@
   if (g_game.music_enabled) {
     int pid=fork();
     if (!pid) {
-	  string soundserver_path = VSFileSystem::datadir+"/bin/soundserver";
+	  string soundserver_path = "/usr/libexec/vegastrike/soundserver";
       pid=execlp(soundserver_path.c_str() , soundserver_path.c_str(),NULL);
       soundserver_path = VSFileSystem::datadir+"/soundserver";
       pid=execlp(soundserver_path.c_str() , soundserver_path.c_str(),NULL);
--- vegastrike-0.4.3/src/gfx/mesh_xml.cpp~	2007-03-23 12:02:27.000000000 +0100
+++ vegastrike-0.4.3/src/gfx/mesh_xml.cpp	2007-03-23 12:02:27.000000000 +0100
@@ -1165,7 +1165,7 @@
 #ifndef _WIN32
     int pid=fork();
     if (!pid) {
-      string soundserver_path = VSFileSystem::datadir+"/bin/mesher";
+      string soundserver_path = "/usr/libexec/vegastrike/mesher";
 	  string firstarg = string("\"")+soundserver_path+string("\"");
       pid=execlp(soundserver_path.c_str() , soundserver_path.c_str(),input,output,args,NULL);
       soundserver_path = VSFileSystem::datadir+"/mesher";

vegastrike-0.4.2-posh-fix.patch:

--- NEW FILE vegastrike-0.4.2-posh-fix.patch ---
diff -urN vegastrike-0.4.2.orig/src/posh.h vegastrike-0.4.2/src/posh.h
--- vegastrike-0.4.2.orig/src/posh.h	2003-10-23 13:51:58.000000000 -0400
+++ vegastrike-0.4.2/src/posh.h	2004-11-22 17:40:07.000000000 -0500
@@ -500,7 +500,7 @@
 ** Intel x86 and AMD x86-64
 ** ------------------------------------------------------------------
 */
-#if defined __X86__ || defined __i386__ || defined i386 || defined _M_IX86 || defined __386__ || defined FORCE_DOXYGEN
+#if defined __X86__ || defined __i386__ || defined i386 || defined _M_IX86 || defined __386__ || defined __x86_64__ || defined FORCE_DOXYGEN
 #  define POSH_CPU_X86 /**<if defined, target CPU is Intel 386+ compatible */
 #  if defined __x86_64__ || defined FORCE_DOXYGEN
 #     define POSH_CPU_X86_64 /**<if defined, target CPU is AMD x86-64 */
@@ -536,6 +536,17 @@
 #  endif
 #endif
 
+/* ------------------------------------------------------------------
+** IBM S/390
+** ------------------------------------------------------------------
+*/
+#if defined __s390__ || defined FORCE_DOXYGEN
+#  define POSH_CPU_S390/**<if defined, target CPU is IBM S/390 */
+#  if !defined FORCE_DOXYGEN
+#     define POSH_CPU_STRING "S/390"
+#  endif
+#endif
+
 /** @} */
 
 #if !defined POSH_CPU_STRING

vegastrike-0.4.2-vssetup-fix.patch:

--- NEW FILE vegastrike-0.4.2-vssetup-fix.patch ---
diff -urN vegastrike-0.4.1.orig/vssetup/src/Makefile vegastrike-0.4.1/vssetup/src/Makefile
--- vegastrike-0.4.1.orig/vssetup/src/Makefile	1969-12-31 19:00:00.000000000 -0500
+++ vegastrike-0.4.1/vssetup/src/Makefile	2004-01-12 13:03:12.000000000 -0500
@@ -0,0 +1,37 @@
+
+CC = gcc
+CXX = g++
+
+LIBS = `pkg-config gtk+-2.0 --libs`
+RPM_OPT_FLAGS =
+CFLAGS = -Wall -O3 $(RPM_OPT_FLAGS) `pkg-config gtk+-2.0 --cflags` -g -DGTK
+CXXFLAGS = $(CFLAGS)
+
+bindir = /usr/games 
+PROGNAME = vssetup
+
+INSTALL = install
+DESTDIR =
+
+OBJECTS =      include/general.o \
+               include/central.o \
+               include/display_dialog.o \
+               include/display_gtk.o \
+               include/file.o \
+               c/setup.o
+
+
+
+all: $(PROGNAME)
+
+$(PROGNAME):   $(OBJECTS)
+		$(CXX) -o $@ $^ $(LIBS)
+
+install:
+	$(INSTALL) -d -m 755 $(bindir)
+	$(INSTALL) -m 755 $(PROGNAME) $(bindir)
+
+clean:
+	rm -f $(PROGNAME) $(OBJECTS)
+
+
diff -urN vegastrike-0.4.1.orig/vssetup/src/include/display_gtk.cpp vegastrike-0.4.1/vssetup/src/include/display_gtk.cpp
--- vegastrike-0.4.1.orig/vssetup/src/include/display_gtk.cpp	2003-09-19 17:31:02.000000000 -0400
+++ vegastrike-0.4.1/vssetup/src/include/display_gtk.cpp	2004-01-12 13:02:19.000000000 -0500
@@ -56,7 +56,7 @@
 #ifdef _WIN32
 	int err=(int)ShellExecute(NULL,"open","documentation\\readme.txt","","",1);
 #else
-	execlp("less", "less","readme.txt", NULL); //Will this work in Linux?
+	execlp("gedit", "gedit","/usr/share/vegastrike/documentation/readme.txt", NULL); //Will this work in Linux?
 #endif
 	gtk_exit(exitval);
 }

vegastrike-0.4.3-64-bit.patch:

--- NEW FILE vegastrike-0.4.3-64-bit.patch ---
diff -urN vegastrike-0.4.3.orig/src/cmd/ai/hard_coded_scripts.cpp vegastrike-0.4.3/src/cmd/ai/hard_coded_scripts.cpp
--- vegastrike-0.4.3.orig/src/cmd/ai/hard_coded_scripts.cpp	2004-12-18 17:32:47.000000000 +0900
+++ vegastrike-0.4.3/src/cmd/ai/hard_coded_scripts.cpp	2005-08-17 01:36:42.000000000 +0900
@@ -260,12 +260,12 @@
 };
 }
 void LoopAround(Order* aisc, Unit * un) {
-	Order* broll = new Orders::LoopAround(false,true,false,(int)un);
+	Order* broll = new Orders::LoopAround(false,true,false,(long)un);
 	AddOrd(aisc,un,broll);
 	
 }
 void AggressiveLoopAround(Order* aisc, Unit * un) {
-	Order* broll = new Orders::LoopAround(true,true,false,(int)un);
+	Order* broll = new Orders::LoopAround(true,true,false,(long)un);
 	AddOrd(aisc,un,broll);
 	
 }
@@ -278,22 +278,22 @@
     AddOrd(un->aistate,un,new ExecuteFor(new Orders::MatchRoll(-un->GetComputerData().max_roll_left,false),1.0f));
 }
 void LoopAroundFast(Order* aisc, Unit * un) {
-	Order* broll = new Orders::LoopAround(false,true,true,(int)un);
+	Order* broll = new Orders::LoopAround(false,true,true,(long)un);
 	AddOrd(aisc,un,broll);
 	
 }
 void AggressiveLoopAroundFast(Order* aisc, Unit * un) {
-	Order* broll = new Orders::LoopAround(true,true,true,(int)un);
+	Order* broll = new Orders::LoopAround(true,true,true,(long)un);
 	AddOrd(aisc,un,broll);
 	
 }
 void LoopAroundSlow(Order* aisc, Unit * un) {
-	Order* broll = new Orders::LoopAround(false,false,false,(int)un);
+	Order* broll = new Orders::LoopAround(false,false,false,(long)un);
 	AddOrd(aisc,un,broll);
 	
 }
 void AggressiveLoopAroundSlow(Order* aisc, Unit * un) {
-	Order* broll = new Orders::LoopAround(true,false,false,(int)un);
+	Order* broll = new Orders::LoopAround(true,false,false,(long)un);
 	AddOrd(aisc,un,broll);
 	
 }
diff -urN vegastrike-0.4.3.orig/src/cmd/music.cpp vegastrike-0.4.3/src/cmd/music.cpp
--- vegastrike-0.4.3.orig/src/cmd/music.cpp	2005-08-17 01:35:24.000000000 +0900
+++ vegastrike-0.4.3/src/cmd/music.cpp	2005-08-17 01:36:51.000000000 +0900
@@ -205,7 +205,7 @@
 
 int Music::SelectTracks(void) {
   static bool random=XMLSupport::parse_bool(vs_config->getVariable("audio","shuffle_songs","true"));
-  if ((BaseInterface::CurrentBase||loopsleft>0)&&lastlist < (int)playlist.size()&&lastlist>=0) {
+  if ((BaseInterface::CurrentBase||loopsleft>0)&&lastlist < (long)playlist.size()&&lastlist>=0) {
     if (loopsleft>0) {
       loopsleft--;
     }
@@ -259,7 +259,7 @@
   if (!playlist[BATTLELIST].empty()) {
     tmp=randInt((playlist[BATTLELIST].size()));
   }
-  return (int)tmp;
+  return (long)tmp;
 }
 volatile int moredata=0;
 #ifndef _WIN32
@@ -274,7 +274,7 @@
 			  void * 
 #endif		  
 			  input) {
-	int socketr = (int)input;
+	int socketr = (long)input;
 	while(1) {
           printf ("Reading from socket %d\n",socketr);
           char data=fNET_fgetc(socketr);
@@ -333,7 +333,7 @@
 
 void Music::GotoSong (int whichlist,int whichsong,bool skip) {
 	if (g_game.music_enabled) {
-		if (whichsong!=NOLIST&&whichlist!=NOLIST&&whichlist<(int)playlist.size()&&whichsong<(int)playlist[whichlist].size()) {
+		if (whichsong!=NOLIST&&whichlist!=NOLIST&&whichlist<(long)playlist.size()&&whichsong<(long)playlist[whichlist].size()) {
 			GotoSong(playlist[whichlist][whichsong]);
 		} else {
 			SkipRandList();
@@ -343,7 +343,7 @@
 
 void Music::SkipRandSong(int whichlist) {
 	if (this!=NULL) {
-	  if (whichlist!=NOLIST&&whichlist>=0&&whichlist<(int)playlist.size()){
+	  if (whichlist!=NOLIST&&whichlist>=0&&whichlist<(long)playlist.size()){
 	    lastlist = whichlist;
             static bool random=XMLSupport::parse_bool(vs_config->getVariable("audio","shuffle_songs","true"));
             if (playlist[whichlist].size()) {
diff -urN vegastrike-0.4.3.orig/src/cmd/script/pythonmission.cpp vegastrike-0.4.3/src/cmd/script/pythonmission.cpp
--- vegastrike-0.4.3.orig/src/cmd/script/pythonmission.cpp	2004-04-25 09:39:13.000000000 +0900
+++ vegastrike-0.4.3/src/cmd/script/pythonmission.cpp	2005-08-17 01:36:47.000000000 +0900
@@ -16,7 +16,7 @@
 	delete this;
 }
 PythonMissionBaseClass::~PythonMissionBaseClass(){
-	VSFileSystem::vs_fprintf (stderr,"BASE Destruct called. If called from C++ this is death %ld (0x%x)",(unsigned long)this,(unsigned int)this);
+	VSFileSystem::vs_fprintf (stderr,"BASE Destruct called. If called from C++ this is death %ld (0x%lx)",(unsigned long)this,(unsigned long)this);
 }
 
 void PythonMissionBaseClass::Execute () {
diff -urN vegastrike-0.4.3.orig/src/cmd/unit_generic.cpp vegastrike-0.4.3/src/cmd/unit_generic.cpp
--- vegastrike-0.4.3.orig/src/cmd/unit_generic.cpp	2005-02-10 13:18:56.000000000 +0900
+++ vegastrike-0.4.3/src/cmd/unit_generic.cpp	2005-08-17 01:36:49.000000000 +0900
@@ -119,7 +119,7 @@
 		  }
 		  diff = fmod (diff,tmpflicker);
 		  //we know counter is somewhere between 0 and damage level
-		  unsigned int thus = ((int)un)>>2;//cast this to an int for fun!
+		  unsigned int thus = ((long)un)>>2;//cast this to an int for fun! (this doesn't work for 64-bit machines)
 		  thus = thus % ((unsigned int)tmpflicker);
 		  diff = fmod (diff+thus,tmpflicker);
 		  if (flickerofftime>diff) {
diff -urN vegastrike-0.4.3.orig/src/gui/eventmanager.cpp vegastrike-0.4.3/src/gui/eventmanager.cpp
--- vegastrike-0.4.3.orig/src/gui/eventmanager.cpp	2004-12-17 19:10:41.000000000 +0900
+++ vegastrike-0.4.3/src/gui/eventmanager.cpp	2005-08-17 01:36:52.000000000 +0900
@@ -61,7 +61,7 @@
 	if (controlToDelete == NULL || find(deleteQueue.begin(), deleteQueue.end(), controlToDelete)!=deleteQueue.end()) {
 		bool DUPLICATE_DELETE_OF_OBJECT = true;
 		char tempstr[254];
-		sprintf(tempstr, "\nERROR: duplicate delete of object %X.\n\n", (int)controlToDelete);
+		sprintf(tempstr, "\nERROR: duplicate delete of object %lX.\n\n", (long)controlToDelete);
 		fputs(tempstr, stderr);
 #if defined (_MSC_VER) && defined(_DEBUG) && 0
 		if (DEBUG_ERROR_IN_MY_CODE) {
--- vegastrike-0.4.3/launcher/saveinterface.cpp~	2006-02-10 10:54:30.000000000 +0100
+++ vegastrike-0.4.3/launcher/saveinterface.cpp	2006-02-10 11:11:33.000000000 +0100
@@ -213,7 +213,7 @@
 #ifdef _WIN32
   GoToParentDir();
 #endif
-  unsigned int player = my_mission.rfind ("player");
+  std::string::size_type player = my_mission.rfind ("player");
   if (player>0&&player!=std::string::npos) {
    char  num [4]={'-','m',(*(my_mission.begin()+(player-1))),'\0'};
    printf ("vegastrike %s %s",num,my_mission.c_str());
@@ -298,7 +298,7 @@
 }
 
 void hello( GtkWidget *widget, gpointer   data ) {
-    int i=(int)data;
+    int i=GPOINTER_TO_INT(data);
     int pid=0;
     switch (i) {
     case 5:

vegastrike-0.4.3-alut-fixes.patch:

--- NEW FILE vegastrike-0.4.3-alut-fixes.patch ---
--- vegastrike-0.4.3/src/aldrv/al_init.cpp.alut	2004-05-20 03:04:26.000000000 +0200
+++ vegastrike-0.4.3/src/aldrv/al_init.cpp	2007-03-23 16:04:13.000000000 +0100
@@ -144,6 +144,9 @@
 bool AUDInit () {
   g_game.sound_enabled = false;
 #ifdef HAVE_AL
+  /* Initialize Alut, this must always be done otherwise the sample loading
+     code segfaults */
+  alutInitWithoutContext(NULL, NULL);
   usedoppler = XMLSupport::parse_bool (vs_config->getVariable ("audio","Doppler","false"));
   usepositional = XMLSupport::parse_bool (vs_config->getVariable ("audio","Positional","true"));
 
--- vegastrike-0.4.3/src/aldrv/al_sound.cpp.alut	2005-01-08 02:25:32.000000000 +0100
+++ vegastrike-0.4.3/src/aldrv/al_sound.cpp	2007-03-23 16:26:49.000000000 +0100
@@ -37,216 +37,10 @@
 #include <algorithm>
 #include <stdio.h>
 #ifdef HAVE_AL
-#ifdef HAVE_OGG
-
-#include <vorbis/vorbisfile.h>
-#endif
 std::vector <unsigned int> dirtysounds;
 std::vector <OurSound> sounds;
 std::vector <ALuint> buffers;
 
-static void convertToLittle(unsigned int tmp, char * data){
-  data[0]=(char)(tmp%256);
-  data[1]=(char)((tmp/256)%256);
-  data[2]=(char)((tmp/65536)%256);
-  data[3]=(char)((tmp/65536)/256);  
-}
-#ifdef HAVE_OGG
-struct fake_file{
-  char * data;
-  size_t size;
-  size_t loc;
-};
-size_t mem_read(void * ptr, size_t size, size_t nmemb, void * datasource) {
-  fake_file * fp = (fake_file*)datasource;
-  if (fp->loc+size>fp->size) {
-    size_t tmp=fp->size-fp->loc;
-    if (tmp)
-      memcpy (ptr,fp->data+fp->loc,tmp);
-    fp->loc=fp->size;
-    return tmp;
-  }else {
-    memcpy(ptr,fp->data+fp->loc,size);
-    fp->loc+=size;
-    return size;
-  }
-}
-int mem_close(void*) {
-  return 0;
-}
-
-long   mem_tell  (void *datasource){
- fake_file * fp = (fake_file*)datasource; 
- return (long)fp->loc;
-}
-int cant_seek (void * datasource, ogg_int64_t offset, int whence) {
-  return -1;
-}
-int mem_seek (void * datasource, ogg_int64_t offset, int whence) {
- fake_file * fp = (fake_file*)datasource; 
- if (whence==SEEK_END) {
-   if (offset<0) {
-     if (fp->size<(size_t)-offset) {
-       return -1;
-     }else {
-       fp->loc = fp->size+offset;
-       return 0;
-     }
-   }else if (offset==0) {
-     fp->loc=fp->size;
-   }else return -1;
- }else if (whence==SEEK_CUR) {
-   if (offset<0) {
-     if (fp->loc<(size_t)-offset)
-       return -1;
-     else {
-       fp->loc+=offset;
-       return 0;
-     }
-   }else {
-     if (fp->loc+offset>fp->size) {
-       return -1;
-     }else {
-       fp->loc+=offset;
-       return 0;
-     }
-   }
- }else if (whence==SEEK_SET) {
-   if (offset>fp->size) 
-     return -1;
-   fp->loc = offset;
-   return 0;
- }
- return -1;
-}
-#endif
-static void ConvertFormat (vector<char>& ogg ) {
-  vector<char> converted;
-
-  if (ogg.size()>4) {
-    if (ogg[0]=='O'&&ogg[1]=='g'&&ogg[2]=='g'&&ogg[3]=='S') {
-#ifdef HAVE_OGG
-      OggVorbis_File vf;
-      ov_callbacks callbacks;
-      vorbis_info *info;       
-      int bitstream = -1;
-      long samplesize;
-      long samples;
-      int read, to_read;
-      int must_close = 1;
-      int was_error = 1;
-      //FILE * tmpf=tmpfile();
-      //fwrite(&ogg[0],ogg.size(),1,tmpf);
-      //fseek(tmpf,0,SEEK_SET);
-      fake_file ff;
-      ff.data=&ogg[0];
-      ff.loc=0;
-      ff.size=ogg.size();
-      callbacks.read_func=&mem_read;
-      callbacks.seek_func=&mem_seek;
-      callbacks.close_func=&mem_close;
-      callbacks.tell_func=&mem_tell;
-      if (ov_open_callbacks(&ff,&vf,NULL,0,callbacks) ){
-        ogg.clear();
-      }else {        
-        int bigendian=0;
-        long bytesread=0;
-        vorbis_info *info=ov_info(&vf,-1);
-        //ogg_int64_t totalsize=ov_pcm_total(&vf,-1);
-        //long num_streams=ov_streams(&vf);
-        const int segmentsize=16384;
-        const int samples=16;
-        converted.push_back('R');
-        converted.push_back('I');
-        converted.push_back('F');
-        converted.push_back('F');
-        converted.push_back(0);
-        converted.push_back(0);
-        converted.push_back(0);
-        converted.push_back(0);//fill in with weight;
-        converted.push_back('W');
-        converted.push_back('A');
-        converted.push_back('V');
-        converted.push_back('E');
-        converted.push_back('f');
-        converted.push_back('m');
-        converted.push_back('t');
-        converted.push_back(' ');
-
-        converted.push_back(18);//size of header (16 bytes)
-        converted.push_back(0);
-        converted.push_back(0);
-        converted.push_back(0);
-        
-        converted.push_back(1);//compression code
-        converted.push_back(0);
-
-        converted.push_back((char)(info->channels%256));//num channels;
-        converted.push_back((char)(info->channels/256));
-        
-        converted.push_back(0);//sample rate
-        converted.push_back(0);//sample rate
-        converted.push_back(0);//sample rate
-        converted.push_back(0);//sample rate
-        convertToLittle(info->rate,&converted[converted.size()-4]);
-
-        long byterate = info->rate*info->channels*samples/8;
-        converted.push_back(0);//bytes per second rate
-        converted.push_back(0);
-        converted.push_back(0);
-        converted.push_back(0);
-        convertToLittle(byterate,&converted[converted.size()-4]);
-
-        converted.push_back((char)((info->channels*samples/8)%256));//num_channels*16 bits/8
-        converted.push_back((char)((info->channels*samples/8)/256));        
-        
-        converted.push_back(samples);// 16 bit samples
-        converted.push_back(0);
-        converted.push_back(0);
-        converted.push_back(0);
-
-
-        // PCM header
-        converted.push_back('d');
-        converted.push_back('a');
-        converted.push_back('t');
-        converted.push_back('a');
-
-
-        converted.push_back(0);        
-        converted.push_back(0);
-        converted.push_back(0);
-        converted.push_back(0);
-        ogg_int64_t pcmsizestart=converted.size();
-        converted.resize(converted.size()+segmentsize);
-        int signedvalue=1;
-        int bitstream=0;
-        while ((bytesread=ov_read(&vf,&converted[converted.size()-segmentsize], segmentsize, 0, samples/8, signedvalue, &bitstream))>0){
-          if (bytesread<segmentsize) {
-            int numtoerase=segmentsize-bytesread;
-            converted.erase(converted.end()-numtoerase,converted.end());
-          }
-          
-          
-          converted.resize(converted.size()+segmentsize);
-        }
-        converted.erase(converted.end()-segmentsize,converted.end());
-        convertToLittle(converted.size()-8,&converted[4]);
-        convertToLittle(converted.size()-pcmsizestart,&converted[pcmsizestart-4]);
-#if 0
-		FILE * tmp = fopen("c:/temp/bleh","wb");
-        fwrite(&converted[0],converted.size(),1,tmp);
-        fclose(tmp);
-#endif
-        converted.swap(ogg);
-      }
-      ov_clear(&vf);
-#else
-      ogg.clear();
-#endif
-    }
-  }
-}
 static int LoadSound (ALuint buffer, bool looping) {
   unsigned int i;
   if (!dirtysounds.empty()) {
@@ -311,53 +105,25 @@
 		  if (error>Ok)
 			  return -1;
 	      wavbuf = (ALuint *) malloc (sizeof (ALuint));
-	      alGenBuffers (1,wavbuf);
-#ifdef SOUND_DEBUG
-		  printf ("Sound %s created with and alBuffer %d\n",s.c_str(),*wavbuf);
-#endif
-	      ALsizei size;	
-	      ALsizei freq;
-	      void *wave;
-		  ALboolean looping;
-	      ALboolean err=AL_TRUE;
               vector <char> dat;
               dat.resize(f.Size());
               f.Read( &dat[0], f.Size());
-              ConvertFormat(dat);
-              if (dat.size()==0)//conversion messed up
+              f.Close();
+              *wavbuf = alutCreateBufferFromFileImage(&dat[0], dat.size());
+              if (*wavbuf == AL_NONE)
+              {
+                ALint err = alutGetError();
+                if (err != ALUT_ERROR_NO_CURRENT_CONTEXT)
+                  printf("loading: %s failed: %s\n", s.c_str(),
+                    alutGetErrorString(err));
                 return -1;
-#ifndef WIN32
-#ifdef __APPLE__
-		  ALint format;
-		  // MAC OS X
-		  err = false;
-		  if( error<=Ok)
-			err=MacFixedLoadWAVFile( &dat[0], &format, &wave, &size, &freq);
-#else
-		  // LINUX
-		  ALsizei format;
-                  alutLoadWAVMemory((ALbyte *)&dat[0], &format, &wave, &size, &freq, &looping);
-#endif
-#else
-		  ALint format;
-	  	  // WIN32
-                  alutLoadWAVMemory(&dat[0], (int*)&format, &wave, &size, &freq, &looping);
-#endif
-
-      	  if(err == AL_FALSE)
-		  {
-			alDeleteBuffers (1,wavbuf);
-			free (wavbuf);
-			return -1;
-      	  }
-      	  alBufferData( *wavbuf, format, wave, size, freq );
-          alutUnloadWAV(format,wave,size,freq);
+              }
+          
       	  if (!music)
 		  {
 			soundHash.Put (hashname,wavbuf);
 			buffers.push_back (*wavbuf);
       	  }
-		  f.Close();
 		}
     	return LoadSound (*wavbuf,LOOP);  
   }
@@ -372,7 +138,7 @@
 }
 
 int AUDCreateSoundMP3 (const std::string &s, const bool music, const bool LOOP){
-#ifdef HAVE_AL
+#if 0 /* was #ifdef HAVE_AL, but we have no mp3 support in Fedora's alut */
   if ((g_game.sound_enabled&&!music)||(g_game.music_enabled&&music)) {
 	VSFile f;
 	VSError error = f.OpenReadOnly( s.c_str(), SoundFile);

vegastrike-0.4.3-gcc4-fix.patch:

--- NEW FILE vegastrike-0.4.3-gcc4-fix.patch ---
diff -urN vegastrike-0.4.3.orig/src/aldrv/al_init.cpp vegastrike-0.4.3/src/aldrv/al_init.cpp
--- vegastrike-0.4.3.orig/src/aldrv/al_init.cpp	2004-05-20 03:04:26.000000000 +0200
+++ vegastrike-0.4.3/src/aldrv/al_init.cpp	2005-09-14 22:05:10.657855375 +0200
@@ -20,7 +20,7 @@
 #include "al_globals.h"
 #include <vector>
 static void fixup_function_pointers(void) {
-  alutLoadMP3p = (mp3Loader *) alGetProcAddress((ALubyte *)"alutLoadMP3_LOKI");
+  alutLoadMP3p = (mp3Loader *) alGetProcAddress("alutLoadMP3_LOKI");
   if(alutLoadMP3p == NULL) {
     VSFileSystem::vs_fprintf(stderr, "Could not GetProc %s\n","alutLoadMP3_LOKI");
   }
diff -urN vegastrike-0.4.3.orig/src/gfx/nav/navscreen.h vegastrike-0.4.3/src/gfx/nav/navscreen.h
--- vegastrike-0.4.3.orig/src/gfx/nav/navscreen.h	2005-01-31 10:35:03.000000000 +0100
+++ vegastrike-0.4.3/src/gfx/nav/navscreen.h	2005-09-14 22:05:10.658855158 +0200
@@ -12,6 +12,7 @@
 #define NAVTOTALMESHCOUNT 8	//	same as the button count, 1 mesh for screen and 1 per button(1+7)
 #define MAXZOOM 10
 
+class NavComputer;
 
 void visitSystem (class Cockpit * cp, std::string systemname) ;
 void Beautify (string systemfile, string & sector, string & system);
diff -urN vegastrike-0.4.3.orig/src/vsfilesystem.h vegastrike-0.4.3/src/vsfilesystem.h
--- vegastrike-0.4.3.orig/src/vsfilesystem.h	2004-06-30 00:07:38.000000000 +0200
+++ vegastrike-0.4.3/src/vsfilesystem.h	2005-09-14 22:05:10.659854940 +0200
@@ -527,7 +527,7 @@
 			void	SetVolume( VSVolumeType big);
 			bool	UseVolume();
 
-			friend class VSImage;
+			friend class ::VSImage;
 
         private:
             void    private_init( );

vegastrike-0.4.3-gcc41-fix.patch:

--- NEW FILE vegastrike-0.4.3-gcc41-fix.patch ---
--- vegastrike-0.4.3/objconv/trisort.h~	2002-11-29 21:07:44.000000000 +0100
+++ vegastrike-0.4.3/objconv/trisort.h	2006-06-14 00:59:20.000000000 +0200
@@ -38,8 +38,8 @@
 };
 class Mesh {
     void processline (char * line);
-    Index Mesh::processfacevertex(char * chunk) const;
-    Face Mesh::processface( char * line)const;
+    Index processfacevertex(char * chunk) const;
+    Face processface( char * line)const;
 std::vector <Vector> p;
 std::vector <Vector> n;
 std::vector <Vector> t;//tex coords i=s j=t
--- vegastrike-0.4.3/src/cmd/script/flightgroup.h~	2004-02-07 11:41:28.000000000 +0100
+++ vegastrike-0.4.3/src/cmd/script/flightgroup.h	2006-06-14 00:40:39.000000000 +0200
@@ -81,7 +81,7 @@
   Flightgroup (Flightgroup & other) {
 	  *this = other;
   }
-  Flightgroup& Flightgroup::operator = (Flightgroup & other);
+  Flightgroup& operator = (Flightgroup & other);
   ~Flightgroup();
 };
 
--- vegastrike-0.4.3/src/cmd/collection.h~	2004-04-25 11:51:05.000000000 +0200
+++ vegastrike-0.4.3/src/cmd/collection.h	2006-06-14 00:39:55.000000000 +0200
@@ -59,7 +59,7 @@
         GetNextValidUnit();
     }
     UnitIterator( const UnitIterator& orig ) : pos(orig.pos) { }
-    UnitIterator& UnitIterator::operator=( const UnitIterator& orig ) {
+    UnitIterator& operator=( const UnitIterator& orig ) {
         pos = orig.pos; return *this;
     }
     ~UnitIterator() {
@@ -93,7 +93,7 @@
     ConstIterator(const UnitListNode *start):pos(start) {
       GetNextValidUnit();
     }
-    ConstIterator& ConstIterator::operator=( const ConstIterator& orig ) {
+    ConstIterator& operator=( const ConstIterator& orig ) {
         pos = orig.pos;
         return *this;
     }
--- vegastrike-0.4.3/src/cmd/weapon_xml.h~	2004-03-18 09:58:46.000000000 +0100
+++ vegastrike-0.4.3/src/cmd/weapon_xml.h	2006-06-14 00:40:15.000000000 +0200
@@ -32,7 +32,7 @@
   void Type (enum WEAPON_TYPE typ) {type=typ;switch(typ) {case BOLT:file=string("");break;case BEAM:file=string("beamtexture.bmp");break;case BALL:file=string("ball.ani");break;case PROJECTILE:file=string("missile.bfxm");break;default:break;}} 
   void MntSize(enum MOUNT_SIZE size) {this->size = size;}
   weapon_info(enum WEAPON_TYPE typ) {init();Type(typ);}
-  weapon_info::weapon_info(const weapon_info &tmp) {*this = tmp;}
+  weapon_info(const weapon_info &tmp) {*this = tmp;}
   //  weapon_info& operator = (const weapon_info &tmp);
   void netswap();
 };
--- vegastrike-0.4.3/src/cmd/base.h~	2004-12-06 07:14:54.000000000 +0100
+++ vegastrike-0.4.3/src/cmd/base.h	2006-06-14 00:43:08.000000000 +0200
@@ -200,7 +200,7 @@
 //	static void BaseInterface::beginElement(void *userData, const XML_Char *names, const XML_Char **atts);
 //	void BaseInterface::beginElement(const string &name, const AttributeList attributes);
 //	static void BaseInterface::endElement(void *userData, const XML_Char *name);
-	void BaseInterface::Load(const char * filename, const char * time_of_day, const char * faction);
+	void Load(const char * filename, const char * time_of_day, const char * faction);
 	static void ClickWin (int x, int y, int button, int state);
 	void Click (int x, int y, int button, int state);
 	static void PassiveMouseOverWin (int x, int y);
--- vegastrike-0.4.3/src/cmd/nebula_generic.h~	2003-06-12 07:16:56.000000000 +0200
+++ vegastrike-0.4.3/src/cmd/nebula_generic.h	2006-06-14 00:45:16.000000000 +0200
@@ -4,7 +4,7 @@
 
 class Nebula: public Unit {
 protected:
-	static void Nebula::beginElement (void * Userdata,const XML_Char * name, const XML_Char ** atts);
+	static void beginElement (void * Userdata,const XML_Char * name, const XML_Char ** atts);
 	Vector color;
 	float Density;
 	float fognear;
--- vegastrike-0.4.3/src/gfx/nav/navpath.h~	2005-01-18 09:03:16.000000000 +0100
+++ vegastrike-0.4.3/src/gfx/nav/navpath.h	2006-06-14 00:42:05.000000000 +0200
@@ -83,7 +83,7 @@
   void addNewPath();
   bool update();
 
-  bool NavPath::isNeighborPath(unsigned system, unsigned neighbor);
+  bool isNeighborPath(unsigned system, unsigned neighbor);
 
   NavPath();
   ~NavPath();
--- vegastrike-0.4.3/src/gfx/vsimage.h~	2005-01-31 11:59:01.000000000 +0100
+++ vegastrike-0.4.3/src/gfx/vsimage.h	2006-06-14 00:42:44.000000000 +0200
@@ -121,10 +121,10 @@
 		//const static int SIZEOF_RGBQUAD;
         LOCALCONST_DECL(int,SIZEOF_RGBQUAD,sizeof(BYTE)*4)
 
-		VSImage::VSImage();
+		VSImage();
 		// f2 is needed for bmp loading
-		VSImage::VSImage( VSFile * f, textureTransform * t=NULL, bool strip=false, VSFile * f2 = NULL);
-		VSImage::~VSImage();
+		VSImage( VSFile * f, textureTransform * t=NULL, bool strip=false, VSFile * f2 = NULL);
+		~VSImage();
 
 		// f2 is needed for bmp loading
 		unsigned char*	ReadImage( VSFile * f, textureTransform * t=NULL, bool strip=false, VSFile * f2 = NULL);
--- vegastrike-0.4.3/src/star_system.h~	2004-02-07 11:41:13.000000000 +0100
+++ vegastrike-0.4.3/src/star_system.h	2006-06-14 00:43:24.000000000 +0200
@@ -34,7 +34,7 @@
   Texture *LightMap[6]; 
   //vector <class MissileEffect *> dischargedMissiles;
  public:
-  GameStarSystem::GameStarSystem(const char * filename, const Vector & centr=Vector(0,0,0),const float timeofyear=0);
+  GameStarSystem(const char * filename, const Vector & centr=Vector(0,0,0),const float timeofyear=0);
   ~GameStarSystem();
   //void UpdateUnitPhysics(bool firstframe);
   //class CollideTable *collidetable;

vegastrike-0.4.3-gtk2.patch:

--- NEW FILE vegastrike-0.4.3-gtk2.patch ---
--- vegastrike-0.4.3/launcher/Makefile.am.orig	2006-02-27 20:33:38.000000000 +0000
+++ vegastrike-0.4.3/launcher/Makefile.am	2006-02-27 20:33:57.000000000 +0000
@@ -1,8 +1,8 @@
 INCLUDES = -I$(top_srcdir) \
-	   `gtk-config --cflags`
+	   `pkg-config --cflags gtk+-2.0`
 
 GCF = 
-LIBS  =`gtk-config --libs`
+LIBS  =`pkg-config --libs gtk+-2.0`
 
 bin_PROGRAMS=vslauncher
 commonLIB = ../src/common/libvscommon.a

vegastrike-0.4.3-openal.patch:

--- NEW FILE vegastrike-0.4.3-openal.patch ---
--- vegastrike-0.4.3/src/aldrv/al_init.cpp.openal	2007-02-25 16:17:45.000000000 +0100
+++ vegastrike-0.4.3/src/aldrv/al_init.cpp	2007-02-25 16:17:45.000000000 +0100
@@ -135,12 +135,8 @@
 ///I don't think we'll need to switch contexts or devices in vegastrike
 static ALCdevice *dev=NULL;
 
-#ifndef _WIN32
-static ALvoid *context_id=NULL;
-#else
 static ALCcontext * context_id=NULL;
 #endif
-#endif
 bool AUDInit () {
   g_game.sound_enabled = false;
 #ifdef HAVE_AL
--- vegastrike-0.4.3/configure.in.openal	2007-02-25 16:17:45.000000000 +0100
+++ vegastrike-0.4.3/configure.in	2007-02-25 16:35:10.000000000 +0100
@@ -1151,7 +1151,7 @@
     if test "x$have_openal_lib" = "xyes" ; then
       EPEE_DAY="september 30"
     else
-      MACORPCLIBS="$OPENAL_LDOPTS -l$OPENAL_LIB_NAME"
+      MACORPCLIBS="$OPENAL_LDOPTS -l$OPENAL_LIB_NAME -lalut"
       CHECK_FOR_OPENAL_LIB
     fi
 
@@ -1261,7 +1261,7 @@
 	   CPPFLAGS="$saved_CPPFLAGS $VORBIS_CFLAGS"
 	   AC_MSG_CHECKING([for vorbis header])
 	   AC_TRY_CPP([#include <vorbis/vorbisfile.h> ] ,have_vorbis_h=yes , have_vorbis_h=no)
-	   AC_MSG_RESULT([$have_vorbis_h])]
+	   AC_MSG_RESULT([$have_vorbis_h])
 	   if test "x$have_vorbis_h" = "xyes" ; then
 	      VS_CPPFLAGS="${VS_CPPFLAGS} ${VORBIS_CFLAGS} -DHAVE_OGG "
 	      echo "found VORBIS header: Enabling ingame ogg support:: ${VS_CPPFLAGS}"

vegastrike-0.4.3-sys-python.patch:

--- NEW FILE vegastrike-0.4.3-sys-python.patch ---
--- vegastrike-0.4.3/src/python/init.cpp~	2007-04-23 20:30:02.000000000 +0200
+++ vegastrike-0.4.3/src/python/init.cpp	2007-04-23 20:30:02.000000000 +0200
@@ -226,7 +226,6 @@
   // Find all the mods dir (ignore homedir)
   for( int i=1; i<VSFileSystem::Rootdir.size(); i++)
   {
-	  modpaths += "r\""+VSFileSystem::Rootdir[i]+"/modules/builtin/\",";
 	  modpaths += "r\""+VSFileSystem::Rootdir[i]+"/"+moduledir+"/\",";
 	  modpaths += "r\""+VSFileSystem::Rootdir[i]+"/"+basesdir+"/\"";
 	  if( i+1<VSFileSystem::Rootdir.size())
@@ -237,7 +236,7 @@
   while ((backslash=modpaths.find("\\"))!=std::string::npos) {
      modpaths[backslash]='/';
      }*/
-   std::string changepath ("import sys\nprint sys.path\nsys.path = ["+modpaths+"]\n");
+   std::string changepath ("import sys\nprint sys.path\nsys.path += ["+modpaths+"]\n");
   /*
    std::string changepath ("import sys\nprint sys.path\nsys.path = ["
 			  "\""+VSFileSystem::datadir+DELIMSTR"modules"DELIMSTR"builtin\""

vegastrike-0.4.3-use-system-boost.patch:

--- NEW FILE vegastrike-0.4.3-use-system-boost.patch ---
--- vegastrike-0.4.3/configure.in~	2006-06-14 01:05:35.000000000 +0200
+++ vegastrike-0.4.3/configure.in	2006-06-14 01:10:42.000000000 +0200
@@ -1596,15 +1596,15 @@
 AC_SUBST(CG_CPPFLAGS)
 AC_SUBST(CG_LIBS)
 
-BOOST_CPPFLAGS="-DUSE_BOOST_128=1"' -I$(top_srcdir)/src/boost'
-BOOST_LIBS="../src/boost/libpython_boost.a"
+BOOST_CPPFLAGS="-DUSE_BOOST_128=1"
+BOOST_LIBS="-lpython_boost"
 TESTUSEBOOST131="1"
 TESTUSEBOOST128="0"
 AC_ARG_ENABLE(boost-128, AC_HELP_STRING([--enable-boost-128], [Use if your compiler has trouble with boost-131 (such as gcc 2.9x)]),TESTUSEBOOST131="0")
 
 if test "$TESTUSEBOOST131" = "1" ; then
-   BOOST_CPPFLAGS="-DUSE_BOOST_131=1 "'-I$(top_srcdir)/src/boost129'
-   BOOST_LIBS="../src/boost129/libpython_boost.a"
+   BOOST_CPPFLAGS="-DUSE_BOOST_131=1"
+   BOOST_LIBS="-lpython_boost"
 fi
 
 if test "$TESTUSEBOOST131" = "0" ; then
@@ -1650,10 +1650,6 @@
                  objconv/Makefile
                  src/Makefile
                  src/aldrv/Makefile
-                 src/boost/Makefile
-                 src/boost129/Makefile
-                 src/boost129/converter/Makefile
-                 src/boost129/object/Makefile
                  src/cmd/Makefile
                  src/cmd/ai/Makefile
                  src/cmd/collide/Makefile
--- vegastrike-0.4.3/src/Makefile.am~	2004-10-12 22:18:53.000000000 +0200
+++ vegastrike-0.4.3/src/Makefile.am	2006-06-14 01:09:01.000000000 +0200
@@ -2,7 +2,7 @@
 bin_PROGRAMS = vegastrike vegaserver accountserver
 
 SUBDIRS = \
-    cmd gfx gldrv aldrv python gui networking boost common boost129
+    cmd gfx gldrv aldrv python gui networking common
 
 vegastrike_LDADD =  				\
 networking/netserver_devices.o		\
@@ -21,8 +21,7 @@
 gui/libgui.a 						\
 networking/libnet.a 				\
 cmd/collide/libcollide.a 			\
-boost129/libboost_python.a          \
-boost/libboost_python.a             \
+-lboost_python             \
 gfx/nav/libnav.a					\
 aldrv/libaldrv.a 					\
 -lz
@@ -43,8 +42,7 @@
 gfx/libgfxserver.a 				\
 gldrv/libgldrvserver.a 			\
 cmd/collide/libcollide.a 		\
-boost129/libboost_python.a      \
-boost/libboost_python.a	        \
+-lboost_python             \
 -lz
 
 accountserver_LDADD =           \


--- NEW FILE vegastrike-wrapper.sh ---
#!/bin/sh

VSDATADIR=/usr/share/vegastrike
VERSION=`head -1 $VSDATADIR/Version.txt`

mkdir -p $HOME/$VERSION
cd $HOME/$VERSION
if [ \! -e ~/$VERSION/setup.config ]; then
  cp $VSDATADIR/setup.config .
fi
if [ \! -e ~/$VERSION/vegastrike.config ]; then
  cp $VSDATADIR/vegastrike.config .
  vssetup
fi
exec vslauncher "$@"


--- NEW FILE vegastrike.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Vega Strike
Comment=3D OpenGL spaceflight simulator
Exec=vegastrike-wrapper.sh
Icon=vegastrike.png
Terminal=false
Type=Application
Categories=Game;Simulation;


--- NEW FILE vegastrike.spec ---
Name:           vegastrike
Version:        0.4.3
Release:        3%{?dist}
Summary:        3D OpenGL spaceflight simulator
Group:          Amusements/Games
License:        GPL
URL:            http://vegastrike.sourceforge.net/
# sigh no tarballs from upstream why o why? Created by doing the following:
# cvs -z9 \
#   -d:pserver:anonymous vegastrike cvs sourceforge net:/cvsroot/vegastrike \
#   checkout -rvegastrike_0_4_3 vegastrike
# mv vegastrike vegastrike-0.4.3
# pushd vegastrike-0.4.3
# rm -fr vc98 src/boost* English.lproj VegaStrikeOSX*
# rm -fr `find -name CVS`
# popd
# tar cvfj vegastrike-0.4.3.tar.bz2 vegastrike-0.4.3
Source0:        %{name}-%{version}.tar.bz2
# Found in the mandrive srpm, origin ??
Source1:        %{name}-manpages.tar.bz2
# and again no tarbal, this is created by doing the following:
# cvs -z9 \
#   -d:pserver:anonymous vegastrike cvs sourceforge net:/cvsroot/vegastrike \
#   checkout vssetup
# rm -fr `find vssetup -name CVS`
# tar cvfj vssetup.tar.bz2 vssetup
Source2:        vssetup.tar.bz2
Source3:        %{name}.desktop
Source4:        %{name}-32x32.png
Source5:        %{name}-48x48.png
Source6:        %{name}-wrapper.sh
Patch0:         vegastrike-0.4.2-char-fix.patch
Patch2:         vegastrike-0.4.2-launcher-fix.patch
# not applied as no longer needed, kept for reference
Patch4:         vegastrike-0.4.2-opengl-fix.patch
Patch5:         vegastrike-0.4.2-paths-fix.patch
Patch6:         vegastrike-0.4.2-posh-fix.patch
Patch7:         vegastrike-0.4.3-alut-fixes.patch
Patch8:         vegastrike-0.4.3-gcc4-fix.patch
Patch9:         vegastrike-0.4.3-64-bit.patch
Patch10:        vegastrike-0.4.3-gtk2.patch
Patch11:        vegastrike-0.4.2-vssetup-fix.patch
Patch12:        vegastrike-0.4.3-gcc41-fix.patch
Patch13:        vegastrike-0.4.3-use-system-boost.patch
Patch14:        vegastrike-0.4.3-openal.patch
Patch15:        vegastrike-0.4.3-sys-python.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
BuildRequires:  SDL_mixer-devel openal-devel freealut-devel libvorbis-devel
BuildRequires:  automake desktop-file-utils
Requires:       %{name}-data = %{version}, hicolor-icon-theme, gedit

%description
Vega Strike is a GPL 3D OpenGL Action RPG space sim that allows a player to
trade and bounty hunt. You start in an old beat up Wayfarer cargo ship, with
endless possibility before you and just enough cash to scrape together a life.
Yet danger lurks in the space beyond.


%prep
%setup -q -a1 -a2
%patch0 -p1 -b .char
%patch2 -p1 -b .launcher
%patch5 -p1 -b .paths
%patch6 -p1 -b .posh
%patch7 -p1 -b .alut
%patch8 -p1 -b .gcc4
%patch9 -p1 -b .64-bit
%patch10 -p1 -b .gtk2
%patch11 -p1 -b .vssetup
%patch12 -p1 -b .gcc41
%patch13 -p1 -b .boost
%patch14 -p1 -b .openal
%patch15 -p1 -b .sys-py
chmod -x `find src -type f`
sed -i 's|lib/python|%{_lib}/python|g' configure.in
sed -i 's/\r//g' README
autoreconf -i


%build
pushd vssetup/src
  make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
popd
%configure --with-data-dir=%{_datadir}/%{name} --enable-release \
  --enable-flags="$RPM_OPT_FLAGS" 
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
# Note: make install PREFIX=$RPM_BUILD_ROOT doesnot work :(
pushd vssetup/src
  %makeinstall
popd

%makeinstall
install -p -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}

mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}
for i in accountserver asteroidgen mesher replace trisort vegaserver \
         vsrextract vsrmake soundserver; do
  mv $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT%{_libexecdir}/%{name}
done

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
install -p -m 644 *.6 $RPM_BUILD_ROOT%{_mandir}/man6

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE3}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 %{SOURCE4} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -p -m 644 %{SOURCE5} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING DOCUMENTATION README ToDo.txt
%{_bindir}/%{name}*
%{_bindir}/vs*
%{_libexecdir}/%{name}
%{_mandir}/man6/*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png


%changelog
* Wed May  9 2007 Hans de Goede <j w r degoede hhs nl> 0.4.3-3
- Add some missing files including COPYING to %%doc

* Mon Apr 23 2007 Hans de Goede <j w r degoede hhs nl> 0.4.3-2
- Add some missing BuildRequires
- Keep system python paths in python path

* Fri Mar 23 2007 Hans de Goede <j w r degoede hhs nl> 0.4.3-1
- Initial Fedora Extras package, partially based on Mandriva contrib SRPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 May 2007 20:27:26 -0000	1.1
+++ .cvsignore	10 May 2007 19:18:00 -0000	1.2
@@ -0,0 +1,3 @@
+vegastrike-0.4.3.tar.bz2
+vegastrike-manpages.tar.bz2
+vssetup.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 May 2007 20:27:26 -0000	1.1
+++ sources	10 May 2007 19:18:00 -0000	1.2
@@ -0,0 +1,3 @@
+fa000442a6c613c15500ce5d502c6e72  vegastrike-0.4.3.tar.bz2
+fa990bbfe29ffdd6bc67bc0ca41fc0da  vegastrike-manpages.tar.bz2
+cae140766a7f7ade76e61300b7807f77  vssetup.tar.bz2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]