From 00ffc6f8500c822beef0519e167c4ba7ac3e88e1 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Fri, 13 May 2016 18:05:43 +0200 Subject: [PATCH] New kfreebsd-patch, thanks to Bas Couwenberg --- debian/patches/kfreebsd.patch | 25 +++++++++++++++++++++ debian/patches/series | 2 +- debian/patches/tcgets.patch | 42 ----------------------------------- 3 files changed, 26 insertions(+), 43 deletions(-) create mode 100644 debian/patches/kfreebsd.patch delete mode 100644 debian/patches/tcgets.patch diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch new file mode 100644 index 0000000..531a703 --- /dev/null +++ b/debian/patches/kfreebsd.patch @@ -0,0 +1,25 @@ +Description: Add support for kFreeBSD to grass plugin. +Author: Bas Couwenberg +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 6b2b4d4..26238c9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -tcgets.patch +kfreebsd.patch diff --git a/debian/patches/tcgets.patch b/debian/patches/tcgets.patch deleted file mode 100644 index 495b0cb..0000000 --- a/debian/patches/tcgets.patch +++ /dev/null @@ -1,42 +0,0 @@ -Description: fix FTBFS for non-linux - . -Author: Alf Gaida - ---- -Last-Update: - ---- a/lib/kpty.cpp -+++ b/lib/kpty.cpp -@@ -117,24 +117,20 @@ - # define _NEW_TTY_CTRL - #endif - --#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) -+#if HAVE_TCGETATTR -+# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode) -+#elif defined (__FreeBSD__) || 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__) --# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode) --# else --# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode) --# endif -+# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode) - #endif - --#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) -+#if HAVE_TCSETATTR -+# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode) -+#elif defined (__FreeBSD__) || 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__) --# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode) --# else --# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode) --# endif -+# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode) - #endif - - //#include