r13516 - in packages/trunk/desmume/debian: . patches

[Evgeni Golov]

Author: evgeni
Date: 2012-04-29 21:29:41 +0000 (Sun, 29 Apr 2012)
New Revision: 13516

Added:
   packages/trunk/desmume/debian/patches/02_add_gzFile_casts.patch
Modified:
   packages/trunk/desmume/debian/changelog
   packages/trunk/desmume/debian/patches/series
Log:
import nmu by peter green


Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog	2012-04-29 14:48:42 UTC (rev 13515)
+++ packages/trunk/desmume/debian/changelog	2012-04-29 21:29:41 UTC (rev 13516)
@@ -1,3 +1,11 @@
+desmume (0.9.7-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/02_add_gzFile_casts.patch:
+    Add some casts for compatibility with current zlib (Closes: #664914)
+
+ -- Peter Michael Green <plugwash at p10link.net>  Wed, 04 Apr 2012 22:09:07 +0000
+
 desmume (0.9.7-2) unstable; urgency=low
 
   * Add 01_fix_mode_t_on_kfreebsd.patch to fix FTBFS on kfreebsd-*.

Added: packages/trunk/desmume/debian/patches/02_add_gzFile_casts.patch
===================================================================
--- packages/trunk/desmume/debian/patches/02_add_gzFile_casts.patch	                        (rev 0)
+++ packages/trunk/desmume/debian/patches/02_add_gzFile_casts.patch	2012-04-29 21:29:41 UTC (rev 13516)
@@ -0,0 +1,49 @@
+Description: add casts to gzFile where needed
+ gzFile used to be defined as void* but is now defined as a pointer to a 
+ structure so in c++ code an explicit cast is needed to pass a void*.
+ (we can't really change the type of the parameter that is being passed because
+ it's used in a function pointer).
+Author: Peter Michael Green <plugwash at p10link.net>
+Bug-Debian: http://bugs.debian.org/664914
+
+diff -ur desmume-0.9.7/src/ROMReader.cpp desmume-0.9.7.new/src/ROMReader.cpp
+--- desmume-0.9.7/src/ROMReader.cpp	2011-01-27 10:27:00.000000000 +0000
++++ desmume-0.9.7.new/src/ROMReader.cpp	2012-04-04 21:23:22.000000000 +0000
+@@ -140,7 +140,7 @@
+ 
+ void GZIPROMReaderDeInit(void * file)
+ {
+-	gzclose(file);
++	gzclose((gzFile)file);
+ }
+ 
+ u32 GZIPROMReaderSize(void * file)
+@@ -150,22 +150,22 @@
+ 
+ 	/* FIXME this function should first save the current
+ 	 * position and restore it after size calculation */
+-	gzrewind(file);
+-	while (gzeof (file) == 0)
+-		size += gzread(file, useless, 1024);
+-	gzrewind(file);
++	gzrewind((gzFile)file);
++	while (gzeof ((gzFile)file) == 0)
++		size += gzread((gzFile)file, useless, 1024);
++	gzrewind((gzFile)file);
+ 
+ 	return size;
+ }
+ 
+ int GZIPROMReaderSeek(void * file, int offset, int whence)
+ {
+-	return gzseek(file, offset, whence);
++	return gzseek((gzFile)file, offset, whence);
+ }
+ 
+ int GZIPROMReaderRead(void * file, void * buffer, u32 size)
+ {
+-	return gzread(file, buffer, size);
++	return gzread((gzFile)file, buffer, size);
+ }
+ #endif
+ 

Modified: packages/trunk/desmume/debian/patches/series
===================================================================
--- packages/trunk/desmume/debian/patches/series	2012-04-29 14:48:42 UTC (rev 13515)
+++ packages/trunk/desmume/debian/patches/series	2012-04-29 21:29:41 UTC (rev 13516)
@@ -1 +1,2 @@
 01_fix_mode_t_on_kfreebsd.patch
+02_add_gzFile_casts.patch