[SCM] mess system emulator branch, master, updated. f21ad895ff0df1a04b30a2905a3e645c4524651c

Jordi Mallach jordi at debian.org
Wed Jan 18 11:47:37 UTC 2012


The following commit has been merged in the master branch:
commit f21ad895ff0df1a04b30a2905a3e645c4524651c
Author: Jordi Mallach <jordi at debian.org>
Date:   Sun Jan 15 23:17:23 2012 +0100

    gnu_fixes.patch: Add a check for __GNU__ to fix builds on the Hurd.

diff --git a/debian/changelog b/debian/changelog
index be56ab1..6004887 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
 mess (0.144-2) UNRELEASED; urgency=low
 
-  [ Jordi Mallach ]
-  * Fix Vcs-* URLs
-
   [ Emmanuel Kasper ]
   * Yet another batch of syntax errors in DEP5 copyright file corrected
 
- -- Emmanuel Kasper <emmanuel at libera.cc>  Fri, 30 Dec 2011 17:58:39 +0100
+  [ Jordi Mallach ]
+  * Fix Vcs-* URLs.
+  * gnu_fixes.patch: Add a check for __GNU__ to fix builds on the Hurd.
+
+ -- Jordi Mallach <jordi at debian.org>  Sun, 15 Jan 2012 23:15:23 +0100
 
 mess (0.144-1) unstable; urgency=low
 
diff --git a/debian/patches/gnu_fixes.patch b/debian/patches/gnu_fixes.patch
new file mode 100644
index 0000000..0a4fe51
--- /dev/null
+++ b/debian/patches/gnu_fixes.patch
@@ -0,0 +1,18 @@
+Author: Jordi Mallach <jordi at debian.org>
+Description: Check for GNU.
+ Fix builds on hurd-i386 by checking for __GNU__.
+Forwarded: no
+
+Index: mess-0.144/src/osd/sdl/sdlprefix.h
+===================================================================
+--- mess-0.144.orig/src/osd/sdl/sdlprefix.h	2012-01-15 23:05:38.165375833 +0100
++++ mess-0.144/src/osd/sdl/sdlprefix.h	2012-01-15 23:05:57.725376275 +0100
+@@ -42,7 +42,7 @@
+ /* Large file support on IRIX needs _SGI_SOURCE */
+ #undef _POSIX_SOURCE
+ 
+-#elif defined(__linux__) || defined(__FreeBSD_kernel__)
++#elif defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__)
+ #define SDLMAME_LINUX 1
+ 
+ #elif defined(__FreeBSD__)
diff --git a/debian/patches/series b/debian/patches/series
index c021073..eb1f11b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+gnu_fixes.patch
 fix_mame_manpage_section.patch

-- 
mess system emulator



More information about the Pkg-games-commits mailing list