r5292 - in packages/trunk/vegastrike/debian: . patches

[Vincent Fourmond]

Author: fourmond
Date: 2008-01-12 02:39:07 +0000 (Sat, 12 Jan 2008)
New Revision: 5292

Added:
   packages/trunk/vegastrike/debian/patches/fix_long_vs_int.diff
Modified:
   packages/trunk/vegastrike/debian/changelog
   packages/trunk/vegastrike/debian/patches/series
Log:
[vegastrike] Some amd64 fixes -- need further checking, but it might be the cause of #307992

Modified: packages/trunk/vegastrike/debian/changelog
===================================================================
--- packages/trunk/vegastrike/debian/changelog	2008-01-11 21:20:08 UTC (rev 5291)
+++ packages/trunk/vegastrike/debian/changelog	2008-01-12 02:39:07 UTC (rev 5292)
@@ -5,9 +5,11 @@
   * Add Homepage field in control
   * Add VCS fields in control
 
-  * NOT RELEASED YET
+  [ Vincent Fourmond ]
+  * fix_long_vs_int.diff to hopefully fix problems with 64 bits arches
+  * NOT RELEASED YET -- and NOT RELEASABLE YET !
 
- -- Vincent Fourmond <fourmond at debian.org>  Thu, 15 Nov 2007 22:27:45 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 12 Jan 2008 03:23:35 +0100
 
 vegastrike (0.4.3.debian1-1) unstable; urgency=low
 

Added: packages/trunk/vegastrike/debian/patches/fix_long_vs_int.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/fix_long_vs_int.diff	                        (rev 0)
+++ packages/trunk/vegastrike/debian/patches/fix_long_vs_int.diff	2008-01-12 02:39:07 UTC (rev 5292)
@@ -0,0 +1,60 @@
+--- vegastrike-0.4.3.debian1.orig/src/gui/eventmanager.cpp
++++ vegastrike-0.4.3.debian1/src/gui/eventmanager.cpp
+@@ -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) {
+only in patch2:
+unchanged:
+--- vegastrike-0.4.3.debian1.orig/src/gfx/mesh_xml.cpp
++++ vegastrike-0.4.3.debian1/src/gfx/mesh_xml.cpp
+@@ -1267,7 +1267,7 @@
+     return 0;
+   }
+   if (m.size()>1) {
+-    fprintf (stderr,"Mesh %s has %d subcomponents. Only first used!\n",filename,m.size());
++    fprintf (stderr,"Mesh %s has %ld subcomponents. Only first used!\n",filename,(long) m.size());
+     for (unsigned int i=1;i<m.size();++i) {
+       delete m[i];
+     }
+only in patch2:
+unchanged:
+--- vegastrike-0.4.3.debian1.orig/src/cmd/script/script_variables.cpp
++++ vegastrike-0.4.3.debian1/src/cmd/script/script_variables.cpp
+@@ -750,7 +750,8 @@
+ 	  sprintf(buffer,"type=\"object\"  object=\"%s\" value=\"%s\" >\n ", vi->objectname.c_str(),sptr->c_str());
+ 	}
+ 	else{
+-	  sprintf(buffer,"type=\"object\"  object=\"%s\" value=\"0x%x\" >\n ", vi->objectname.c_str(),vi->object);
++	  // Still not good, but this shouldn't crash on 64bits arches
++	  sprintf(buffer,"type=\"object\"  object=\"%s\" value=\"0x%lx\" >\n ", vi->objectname.c_str(),(long) vi->object);
+ 	
+ 	  string modname="_"+vi->objectname;
+ 	
+only in patch2:
+unchanged:
+--- vegastrike-0.4.3.debian1.orig/src/cmd/script/script_call_olist.cpp
++++ vegastrike-0.4.3.debian1/src/cmd/script/script_call_olist.cpp
+@@ -246,7 +246,7 @@
+   olist_t *olist=getOListObject(node,mode,ovi);
+   	if(((unsigned int)index)>=olist->size()){
+ 	  char buffer[200];
+-	  sprintf(buffer,"olist.set: index out of range size=%d, index=%d\n",olist->size(),index);
++	  sprintf(buffer,"olist.set: index out of range size=%ld, index=%d\n",(long) olist->size(),index);
+ 	  fatalError(node,mode,buffer);
+ 	  assert(0);
+ 	}
+@@ -263,7 +263,7 @@
+   olist_t *olist=getOListObject(node,mode,ovi);
+   	if(((unsigned int)index)>=olist->size()){
+ 	  char buffer[200];
+-	  sprintf(buffer,"olist.at: index out of range size=%d, index=%d\n",olist->size(),index);
++	  sprintf(buffer,"olist.at: index out of range size=%ld, index=%d\n",(long) olist->size(),index);
+ 	  fatalError(node,mode,buffer);
+ 	  assert(0);
+ 	}

Modified: packages/trunk/vegastrike/debian/patches/series
===================================================================
--- packages/trunk/vegastrike/debian/patches/series	2008-01-11 21:20:08 UTC (rev 5291)
+++ packages/trunk/vegastrike/debian/patches/series	2008-01-12 02:39:07 UTC (rev 5292)
@@ -14,3 +14,4 @@
 vssetup.diff
 hat_switches.diff
 configure.in_modifications.diff
+fix_long_vs_int.diff
\ No newline at end of file