[qgis] 01/01: Add patch to add support for GNU/Hurd to GRASS plugin qtermwidget.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository qgis.

commit 658f2e37b2c2d4467a015545b47e0f04bc9b7169
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 14 18:42:52 2016 +0200

    Add patch to add support for GNU/Hurd to GRASS plugin qtermwidget.
---
 debian/changelog                      |  6 ++++++
 debian/patches/qtermwidget-hurd.patch | 37 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 98e0b2a..96369c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.14.2+dfsg-3) UNRELEASED; urgency=medium
+
+  * Add patch to add support for GNU/Hurd to GRASS plugin qtermwidget.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 14 May 2016 18:42:25 +0200
+
 qgis (2.14.2+dfsg-2) unstable; urgency=medium
 
   * Add patch to add support for kFreeBSD to GRASS plugin.
diff --git a/debian/patches/qtermwidget-hurd.patch b/debian/patches/qtermwidget-hurd.patch
new file mode 100644
index 0000000..9151415
--- /dev/null
+++ b/debian/patches/qtermwidget-hurd.patch
@@ -0,0 +1,37 @@
+Description: Add support for GNU/Hurd to GRASS plugin qtermwidget/kpty.cpp.
+ The GNU/Hurd porting guidelines document the following:
+ "
+   Missing termio.h
+ .
+   Change it to use termios.h (check for it properly with autoconf HAVE_TERMIOS_H or the __GLIBC__ macro)
+ .
+   Also, change calls to ioctl(fd, TCGETS, ...) and ioctl(fd, TCSETS, ...) with tcgetattr(fd, ...) and tcsetattr(fd, ...).
+ "
+ https://www.gnu.org/software/hurd/hurd/porting/guidelines.html#Missing_termio_h_tt_
+ .
+ These changes are also included in qtermwidget upstream via:
+ https://github.com/lxde/qtermwidget/pull/69
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/qgis/QGIS/pull/3070
+Applied-Upstream: https://github.com/qgis/QGIS/commit/ae7666fad398d17a04483762e131e22ac37ef989
+
+--- a/src/plugins/grass/qtermwidget/kpty.cpp
++++ b/src/plugins/grass/qtermwidget/kpty.cpp
+@@ -120,7 +120,7 @@ extern "C" {
+ #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
+ # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
+ #else
+-# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
++# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__) || defined(__GNU__)
+ #  define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
+ # else
+ #  define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
+@@ -130,7 +130,7 @@ extern "C" {
+ #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
+ # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
+ #else
+-# if defined(_HPUX_SOURCE) || defined(__CYGWIN__)
++# if defined(_HPUX_SOURCE) || defined(__CYGWIN__) || defined(__GNU__)
+ #  define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
+ # else
+ #  define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
diff --git a/debian/patches/series b/debian/patches/series
index a2c34c3..19eb014 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ exclude-elvensword-resources.patch
 occurred-typo.patch
 number-typo.patch
 qtermwidget-kfreebsd.patch
+qtermwidget-hurd.patch

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