diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2012-06-03 22:39:05 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2012-06-03 22:39:05 +0200 |
| commit | 7d2ca27976054878a90a32293159ecdb9324212c (patch) | |
| tree | 0af7e624e018711622a13a18cd71114d9bd64e4f /debian/patches | |
| parent | 4c1eb12d00a29bc0164432eb46e8cf483f6e09b8 (diff) | |
| download | screen-7d2ca27976054878a90a32293159ecdb9324212c.tar.gz | |
Add patch to fix terminal handling on kfreebsd (Closes: #660567)
Thanks Jan Christoph Nordholz!
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/53-fix-terminal-handling-on-kfreebsd.patch | 27 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/53-fix-terminal-handling-on-kfreebsd.patch b/debian/patches/53-fix-terminal-handling-on-kfreebsd.patch new file mode 100644 index 0000000..d4bfb8b --- /dev/null +++ b/debian/patches/53-fix-terminal-handling-on-kfreebsd.patch @@ -0,0 +1,27 @@ +Description: Add some missing defined(__GLIBC__) to get linux-ish terminal handling. +Author: Axel Beckert <abe@debian.org> +Thanks: Jan Christoph Nordholz +Closes: #660567 + +Index: screen-4.1.0~20120320gitdb59704/pty.c +=================================================================== +--- screen-4.1.0~20120320gitdb59704.orig/pty.c 2011-10-05 00:32:21.000000000 +0200 ++++ screen-4.1.0~20120320gitdb59704/pty.c 2012-06-03 21:42:56.000000000 +0200 +@@ -136,7 +136,7 @@ + { + if (f < 0) + return; +-#if defined(I_PUSH) && defined(HAVE_SVR4_PTYS) && !defined(sgi) && !defined(linux) && !defined(__osf__) && !defined(M_UNIX) ++#if defined(I_PUSH) && defined(HAVE_SVR4_PTYS) && !defined(sgi) && !defined(linux) && !defined(__GLIBC__) && !defined(__osf__) && !defined(M_UNIX) + if (ioctl(f, I_PUSH, "ptem")) + Panic(errno, "InitPTY: cannot I_PUSH ptem"); + if (ioctl(f, I_PUSH, "ldterm")) +@@ -260,7 +260,7 @@ + sigret_t (*sigcld)__P(SIGPROTOARG); + + strcpy(PtyName, "/dev/ptmx"); +-#if defined(HAVE_GETPT) && defined(linux) ++#if defined(HAVE_GETPT) && (defined(linux) || defined(__GLIBC__)) + if ((f = getpt()) == -1) + #else + if ((f = open(PtyName, O_RDWR | O_NOCTTY)) == -1) diff --git a/debian/patches/series b/debian/patches/series index ab09f30..6c4a6de 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,6 +21,7 @@ 50increase-max-TERM-length.patch 51fix-utf8-status-padding-bug.patch 52fix_screen_utf8_nfd.patch +53-fix-terminal-handling-on-kfreebsd.patch 58-show-encoding-hardstatus.patch # 80-99: experimental patches, new features etc. 80EXP_session_creation_time.patch |