[eso-midas] 01/01: Fix FTBS on non-linux ports

[Ole Streicher]

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

olebole-guest pushed a commit to tag debian/15.02pl1.0-1exp3
in repository eso-midas.

commit 7d551e27721b1c02487043de94244ea0f38afb51
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 10 12:27:52 2015 +0100

    Fix FTBS on non-linux ports
---
 debian/changelog                        |  8 +++++-
 debian/patches/fix_nonlinux_ports.patch | 13 ++++++++++
 debian/patches/remove-sys_errlist.patch | 45 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  2 ++
 4 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9fb8910..0b2feb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-eso-midas (15.02pl1.0-1~exp2) UNRELEASED; urgency=low
+eso-midas (15.02pl1.0-1~exp3) experimental; urgency=low
+
+  * Fix FTBS on kfreebsd and hurd
+
+ -- Ole Streicher <olebole at debian.org>  Tue, 10 Mar 2015 12:26:00 +0100
+
+eso-midas (15.02pl1.0-1~exp2) experimental; urgency=low
 
   * Run verifyall to test the build
 
diff --git a/debian/patches/fix_nonlinux_ports.patch b/debian/patches/fix_nonlinux_ports.patch
new file mode 100644
index 0000000..1a69af5
--- /dev/null
+++ b/debian/patches/fix_nonlinux_ports.patch
@@ -0,0 +1,13 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Use __GNU__ and __FreeBSD_kernel__
+--- a/gui/GraphLib/libsrc/uimxR5/src/sp_pty.c
++++ b/gui/GraphLib/libsrc/uimxR5/src/sp_pty.c
+@@ -23,7 +23,7 @@
+ 
+ 
+ 
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__)
+ #include <termios.h>
+ 
+ #if defined(__alpha__)
diff --git a/debian/patches/remove-sys_errlist.patch b/debian/patches/remove-sys_errlist.patch
new file mode 100644
index 0000000..6249cd0
--- /dev/null
+++ b/debian/patches/remove-sys_errlist.patch
@@ -0,0 +1,45 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Replace use of sys_errlist by strerror()
+ sys_errlist is deprecated, and the definition here conflicted to the
+ header in kfreebsd and Hurd. Hurd does not have sys_errlist at all.
+--- a/gui/GraphLib/libsrc/uimxR5/src/sp_utils.c
++++ b/gui/GraphLib/libsrc/uimxR5/src/sp_utils.c
+@@ -22,6 +22,7 @@
+ 
+ /*--- include files ---*/
+ #include <unistd.h>
++#include <string.h>
+ 
+ #include "uxproto.h"
+ #include "version.h"
+@@ -190,15 +191,7 @@
+ {
+ int error;
+ 
+-#if defined(__Darwin__)
+ extern int errno;
+-#else
+-extern int errno, sys_nerr; 
+-#endif
+-
+-#if !defined(__linux__) && !defined(__Darwin__)  && !defined(Cygwin)  
+-extern char *sys_errlist[];
+-#endif
+ 
+ char buffer[BUFSIZ];
+ 
+@@ -213,12 +206,8 @@
+ 	    (void) strcat(buffer, ": ");
+ 	}
+     }
+-    if(error > 0 && error < sys_nerr) {
+-	(void) strcat(buffer, sys_errlist[errno]);
+-	(void) strcat(buffer, "\n");
+-    } else {
+-	(void) strcat(buffer, CGETS( MS_MISC_SYS_ERR, DS_MS_MISC_SYS_ERR));
+-    }
++    (void) strcat(buffer, strerror(errno));
++    (void) strcat(buffer, "\n");
+     UxStandardError(buffer);
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1a9f2e0..1a4ecf7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ syskeys.patch
 system_readline.patch
 fix_manpages.patch
 disable_failing_tests.patch
+fix_nonlinux_ports.patch
+remove-sys_errlist.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git