[pkg-GNUstep-maintainers] Bug#267909: FTBFS on kfreebsd-gnu

[Robert Millan]

This is a multi-part MIME message sent by reportbug.

--===============2011194498==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: gnustep-gui
Severity: wishlist
Tags: patch

The attached patch fixes FTBFS on kfreebsd-gnu.  Please could you forward
it upstream?

OTOH, I think it'd be worth parsing the file in question with a cleanup tool
like dos2unix or indent.  It's full of weird CR/LF terminators.

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: kfreebsd-i386 (i386)
Kernel: GNU/kFreeBSD 5.2.1-6
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (ignored: LC_ALL set to C)

--===============2011194498==
Content-Type: text/x-c; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="gnustep-gui_0.9.3-4.diff"

diff -ur gnustep-gui-0.9.3.old/Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c gnustep-gui-0.9.3/Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c
--- gnustep-gui-0.9.3.old/Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c	2003-07-20 04:08:22.000000000 +0200
+++ gnustep-gui-0.9.3/Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c	2004-08-25 02:29:18.000000000 +0200
@@ -109,19 +109,15 @@
 #include <pthread.h>
 #include <errno.h>
 
-#ifdef __linux__
+#if defined(__linux__)
 #include <linux/soundcard.h>
-#else
-#ifdef __FreeBSD__
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <sys/soundcard.h>
-#else
-#ifdef __OpenBSD__
+#elif defined(__OpenBSD__)
 #include <soundcard.h>
-#else
+#else
 #include <machine/soundcard.h> /* JH20010905 */
 #endif
-#endif
-#endif
 
 #include "portaudio.h"
 #include "pa_host.h"

--===============2011194498==--