[mupen64plus] 170/262: Fix FTBFS due to glib's gvariant.h type definitions

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit 2f5557d51a48878d787e3e273526b3c2872ca7ca
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Apr 11 11:08:31 2010 +0200

    Fix FTBFS due to glib's gvariant.h type definitions
---
 debian/changelog                                  |  8 +++++++
 debian/patches/ftbfs-gvariant-type-conflicts.path | 27 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 60d1ef2..172ad3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mupen64plus (1.5+dfsg1-9) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - Add ftbfs-gvariant-type-conflicts.path, Fix FTBFS due to glib's gvariant.h
+      type definitions (Closes: #577329)
+
+ -- Sven Eckelmann <sven.eckelmann at gmx.de>  Sun, 11 Apr 2010 11:07:04 +0200
+
 mupen64plus (1.5+dfsg1-8) unstable; urgency=low
 
   * debian/patches:
diff --git a/debian/patches/ftbfs-gvariant-type-conflicts.path b/debian/patches/ftbfs-gvariant-type-conflicts.path
new file mode 100644
index 0000000..e76da17
--- /dev/null
+++ b/debian/patches/ftbfs-gvariant-type-conflicts.path
@@ -0,0 +1,27 @@
+Description: Fix FTBFS due to glib gvariant type definitions
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/577329
+Author: Sven Eckelmann <sven.eckelmann at gmx.de>
+
+---
+diff --git a/rice_video/typedefs.h b/rice_video/typedefs.h
+index 4cded542b06445f043fa1fabf77e4d20c9d52920..b7e16e9c4ba3248f9fed9762f79349c137ee2026 100644
+--- a/rice_video/typedefs.h
++++ b/rice_video/typedefs.h
+@@ -20,10 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #ifndef _TYPEDEFS_H_
+ #define _TYPEDEFS_H_
+ 
+-#define uchar  unsigned char
+-#define uint16 unsigned short
+-#define uint32 unsigned int
+-#define uint64 unsigned long long
++#include <stdint.h>
++
++typedef uint8_t uchar;
++typedef uint16_t uint16;
++typedef uint32_t uint32;
++typedef uint64_t uint64;
+ 
+ typedef unsigned char               uint8;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e5febe9..1ee8aa8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,3 +35,4 @@ resume_on_start.patch
 osd-pause-crash.patch
 system-liblzma.patch
 rice_fog.patch
+ftbfs-gvariant-type-conflicts.path

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git