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

[Evgeni Golov]

Author: evgeni
Date: 2012-04-29 21:38:44 +0000 (Sun, 29 Apr 2012)
New Revision: 13518

Removed:
   packages/trunk/desmume/debian/patches/01_fix_mode_t_on_kfreebsd.patch
   packages/trunk/desmume/debian/patches/02_add_gzFile_casts.patch
Modified:
   packages/trunk/desmume/debian/
   packages/trunk/desmume/debian/changelog
   packages/trunk/desmume/debian/patches/series
Log:
prepare 0.9.8



Property changes on: packages/trunk/desmume/debian
___________________________________________________________________
Modified: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/desmume_0.9.7.orig.tar.gz
   + http://pkg-games.alioth.debian.org/tarballs/desmume_0.9.8.orig.tar.gz

Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog	2012-04-29 21:30:09 UTC (rev 13517)
+++ packages/trunk/desmume/debian/changelog	2012-04-29 21:38:44 UTC (rev 13518)
@@ -1,3 +1,13 @@
+desmume (0.9.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Thanks Peter Green for the NMU!
+  * Drop patches, applied upstream:
+    + 01_fix_mode_t_on_kfreebsd.patch
+    + 02_add_gzFile_casts.patch
+
+ -- Evgeni Golov <evgeni at debian.org>  Sun, 29 Apr 2012 23:35:55 +0200
+
 desmume (0.9.7-2.1) unstable; urgency=low
 
   * Non-maintainer upload.

Deleted: packages/trunk/desmume/debian/patches/01_fix_mode_t_on_kfreebsd.patch
===================================================================
--- packages/trunk/desmume/debian/patches/01_fix_mode_t_on_kfreebsd.patch	2012-04-29 21:30:09 UTC (rev 13517)
+++ packages/trunk/desmume/debian/patches/01_fix_mode_t_on_kfreebsd.patch	2012-04-29 21:38:44 UTC (rev 13518)
@@ -1,26 +0,0 @@
-From: Evgeni Golov <evgeni at debian.org>
-Subject: fix libfat compilation on kfreebsd-*
- On kfreebsd-* mode_t is __U16_TYPE, not __U32_TYPE as on linux-any.
- Thus build failed with:
- | In file included from /usr/include/stdlib.h:320:0,
- |                  from utils/libfat/mem_allocate.h:34,
- |                  from utils/libfat/cache.cpp:43:
- | /usr/include/sys/types.h:72:18: error: conflicting declaration 'typedef __mode_t mode_t'
- | utils/libfat/libfat_pc.h:69:18: error: 'mode_t' has a previous declaration as 'typedef uint32_t mode_t'
- Let's not hardcode mode_t to uint32_t but load it from sys/types.h to fix
- that.
-Bug-Debian: http://bugs.debian.org/618778
-Last-Update: 2011-03-24
-
-diff -Nrwu desmume-0.9.7/src/utils/libfat/libfat_pc.h desmume-0.9.7.patched/src/utils/libfat/libfat_pc.h
---- desmume-0.9.7/src/utils/libfat/libfat_pc.h	2011-01-27 11:26:59.000000000 +0100
-+++ desmume-0.9.7.patched/src/utils/libfat/libfat_pc.h	2011-03-24 14:57:07.048578708 +0100
-@@ -66,7 +66,7 @@
- #ifdef __APPLE__
- typedef __darwin_mode_t mode_t;
- #else
--typedef uint32_t mode_t;
-+# include <sys/types.h>
- #endif
- 
- struct DIR_ITER {

Deleted: packages/trunk/desmume/debian/patches/02_add_gzFile_casts.patch
===================================================================
--- packages/trunk/desmume/debian/patches/02_add_gzFile_casts.patch	2012-04-29 21:30:09 UTC (rev 13517)
+++ packages/trunk/desmume/debian/patches/02_add_gzFile_casts.patch	2012-04-29 21:38:44 UTC (rev 13518)
@@ -1,49 +0,0 @@
-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 21:30:09 UTC (rev 13517)
+++ packages/trunk/desmume/debian/patches/series	2012-04-29 21:38:44 UTC (rev 13518)
@@ -1,2 +1 @@
-01_fix_mode_t_on_kfreebsd.patch
-02_add_gzFile_casts.patch
+# no patches