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

[Evgeni Golov]

Author: evgeni
Date: 2011-03-24 14:40:42 +0000 (Thu, 24 Mar 2011)
New Revision: 12011

Added:
   packages/trunk/desmume/debian/patches/01_fix_mode_t_on_kfreebsd.patch
Removed:
   packages/trunk/desmume/debian/patches/01_fix_sz_FTBFS_564788.patch
Modified:
   packages/trunk/desmume/debian/changelog
   packages/trunk/desmume/debian/patches/series
Log:
Add 01_fix_mode_t_on_kfreebsd.patch to fix FTBFS on kfreebsd-*

Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog	2011-03-24 14:16:05 UTC (rev 12010)
+++ packages/trunk/desmume/debian/changelog	2011-03-24 14:40:42 UTC (rev 12011)
@@ -1,3 +1,10 @@
+desmume (0.9.7-2) unstable; urgency=low
+
+  * Add 01_fix_mode_t_on_kfreebsd.patch to fix FTBFS on kfreebsd-*.
+    Closes: #618778
+
+ -- Evgeni Golov <evgeni at debian.org>  Thu, 24 Mar 2011 15:33:12 +0100
+
 desmume (0.9.7-1) unstable; urgency=low
 
   * New upstream release.

Added: packages/trunk/desmume/debian/patches/01_fix_mode_t_on_kfreebsd.patch
===================================================================
--- packages/trunk/desmume/debian/patches/01_fix_mode_t_on_kfreebsd.patch	                        (rev 0)
+++ packages/trunk/desmume/debian/patches/01_fix_mode_t_on_kfreebsd.patch	2011-03-24 14:40:42 UTC (rev 12011)
@@ -0,0 +1,27 @@
+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/01_fix_sz_FTBFS_564788.patch
===================================================================
--- packages/trunk/desmume/debian/patches/01_fix_sz_FTBFS_564788.patch	2011-03-24 14:16:05 UTC (rev 12010)
+++ packages/trunk/desmume/debian/patches/01_fix_sz_FTBFS_564788.patch	2011-03-24 14:40:42 UTC (rev 12011)
@@ -1,29 +0,0 @@
-From: zeromus
-Subject: fix bigendian compiling in saves.cpp. 
-
-someone ought to test savestate portability between big endian and little
-endian. to test this easily on little endian only systems we could setup
-the save system somehow so that it can write in either big or little endian.
-
-Origin: upstream, http://desmume.svn.sourceforge.net/viewvc/desmume?view=rev&revision=3118
-Bug-Debian: http://bugs.debian.org/564788
-
---- desmume/src/saves.cpp	2010/01/13 11:21:48	3279
-+++ desmume/src/saves.cpp	2010/01/13 22:17:03	3280
-@@ -852,13 +852,14 @@
- 			keyset.insert(sf->desc);
- 			#endif
- 
-+
- 		#ifdef LOCAL_LE
- 			// no need to ever loop one at a time if not flipping byte order
- 			os->fwrite((char *)sf->v,size*count);
- 		#else
--			if(sz == 1) {
-+			if(size == 1) {
- 				//special case: write a huge byte array
--				os->fwrite((char *)sf->v,1,count);
-+				os->fwrite((char *)sf->v,count);
- 			} else {
- 				for(int i=0;i<count;i++) {
- 					FlipByteOrder((u8*)sf->v + i*size, size);

Modified: packages/trunk/desmume/debian/patches/series
===================================================================
--- packages/trunk/desmume/debian/patches/series	2011-03-24 14:16:05 UTC (rev 12010)
+++ packages/trunk/desmume/debian/patches/series	2011-03-24 14:40:42 UTC (rev 12011)
@@ -1 +1 @@
-#01_fix_sz_FTBFS_564788.patch
+01_fix_mode_t_on_kfreebsd.patch