[Pkg-octave-commit] [octave] 01/02: kfreebsd_tcgetattr.diff: new patch, fixes FTBFS on kFreeBSD.

[Mike Miller]

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

mtmiller pushed a commit to branch master
in repository octave.

commit 21261c1d7814dbc4ff6aac5c4d6b2273a7f8077e
Author: Mike Miller <mtmiller at debian.org>
Date:   Tue Jan 7 01:20:16 2014 -0500

    kfreebsd_tcgetattr.diff: new patch, fixes FTBFS on kFreeBSD.
---
 debian/patches/kfreebsd_tcgetattr.diff | 56 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 2 files changed, 57 insertions(+)

diff --git a/debian/patches/kfreebsd_tcgetattr.diff b/debian/patches/kfreebsd_tcgetattr.diff
new file mode 100644
index 0000000..a5b8f04
--- /dev/null
+++ b/debian/patches/kfreebsd_tcgetattr.diff
@@ -0,0 +1,56 @@
+Description: Detect and use appropriate terminal attribute functions
+ Based on kfreebsd_support.diff in the kde4libs Debian package.
+Author: Mike Miller <mtmiller at debian.org>
+Forwarded: no
+Last-Updated: 2014-01-07
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -2162,7 +2162,7 @@ AC_CHECK_FUNCS([lgamma lgammaf lgamma_r
+ AC_CHECK_FUNCS([log1p log1pf pipe])
+ AC_CHECK_FUNCS([realpath resolvepath roundl])
+ AC_CHECK_FUNCS([select setgrent setpwent siglongjmp strsignal])
+-AC_CHECK_FUNCS([tempnam tgammaf toascii])
++AC_CHECK_FUNCS([tcgetattr tcsetattr tempnam tgammaf toascii])
+ AC_CHECK_FUNCS([umask waitpid])
+ AC_CHECK_FUNCS([_kbhit])
+ 
+--- a/libgui/qterminal/libqterminal/unix/kpty.cpp
++++ b/libgui/qterminal/libqterminal/unix/kpty.cpp
+@@ -116,24 +116,24 @@ extern "C" {
+ # define _NEW_TTY_CTRL
+ #endif
+ 
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
++#if defined(HAVE_TCGETATTR)
++# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
++#elif defined(TIOCGETA)
+ # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
++#elif defined(TCGETS)
++# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
+ #else
+-# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
+-#  define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
+-# else
+-#  define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
+-# endif
++# error No method available to get terminal attributes
+ #endif
+ 
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
++#if defined(HAVE_TCSETATTR) && defined(TCSANOW)
++# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
++#elif defined(TIOCSETA)
+ # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
++#elif defined(TCSETS)
++# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
+ #else
+-# if defined(_HPUX_SOURCE) || defined(__CYGWIN__)
+-#  define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
+-# else
+-#  define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
+-# endif
++# error No method available to set terminal attributes
+ #endif
+ 
+ #include <QtCore>
diff --git a/debian/patches/series b/debian/patches/series
index 165c0d7..5a659d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ mkoctfile-mpi.diff
 octave-cli-manpage.diff
 doc-compressed-info.diff
 dblquad-s390x.diff
+kfreebsd_tcgetattr.diff

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git