[qgis] 01/02: Add patch to add support for kFreeBSD to GRASS plugin.

[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 c024d5a491fb901a9e35fac054295d5bfda4d6fc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu May 12 23:20:56 2016 +0200

    Add patch to add support for kFreeBSD to GRASS plugin.
---
 debian/changelog                          |  7 +++++++
 debian/patches/qtermwidget-kfreebsd.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3ff48e4..cc5e7aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qgis (2.14.2+dfsg-2) UNRELEASED; urgency=medium
+
+  * Add patch to add support for kFreeBSD to GRASS plugin.
+    (closes: #824079)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 12 May 2016 23:20:13 +0200
+
 qgis (2.14.2+dfsg-1) unstable; urgency=medium
 
   * Disable check for new version of QGIS at startup.
diff --git a/debian/patches/qtermwidget-kfreebsd.patch b/debian/patches/qtermwidget-kfreebsd.patch
new file mode 100644
index 0000000..531a703
--- /dev/null
+++ b/debian/patches/qtermwidget-kfreebsd.patch
@@ -0,0 +1,25 @@
+Description: Add support for kFreeBSD to grass plugin.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/824079
+Forwarded: https://github.com/qgis/QGIS/pull/3068
+
+--- a/src/plugins/grass/qtermwidget/kpty.cpp
++++ b/src/plugins/grass/qtermwidget/kpty.cpp
+@@ -117,7 +117,7 @@ extern "C" {
+ # define _NEW_TTY_CTRL
+ #endif
+ 
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
++#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__)
+@@ -127,7 +127,7 @@ extern "C" {
+ # endif
+ #endif
+ 
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
++#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__)
diff --git a/debian/patches/series b/debian/patches/series
index 5d76f65..a2c34c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ developersmap-use-debian-package.patch
 exclude-elvensword-resources.patch
 occurred-typo.patch
 number-typo.patch
+qtermwidget-kfreebsd.patch

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