[arch-commits] Commit in screen/trunk (PKGBUILD hardstatus.patch)

[Gaetan Bisson]

    Date: Tuesday, November 11, 2014 @ 19:19:44
  Author: bisson
Revision: 226067

fix FS#42734

Added:
  screen/trunk/hardstatus.patch
Modified:
  screen/trunk/PKGBUILD

------------------+
 PKGBUILD         |    9 ++++++++-
 hardstatus.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-11 18:17:29 UTC (rev 226066)
+++ PKGBUILD	2014-11-11 18:19:44 UTC (rev 226067)
@@ -5,7 +5,7 @@
 
 pkgname=screen
 pkgver=4.2.1
-pkgrel=2
+pkgrel=3
 _ptygroup=5 #the UID of our PTY/TTY group
 pkgdesc='Full-screen window manager that multiplexes a physical terminal'
 url='http://www.gnu.org/software/screen/'
@@ -14,13 +14,20 @@
 depends=('ncurses' 'pam')
 backup=('etc/screenrc' 'etc/pam.d/screen')
 source=("http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz"{,.sig}
+        'hardstatus.patch'
         'pam.d')
 sha1sums=('21eadf5f1d64120649f3390346253c6bc8a5103c' 'SKIP'
+          'd9d0ae0427eede2523954fdec549021f0f9640cd'
           '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
 
 options=('!makeflags')
 install=install
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p2 -i ../hardstatus.patch
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 

Added: hardstatus.patch
===================================================================
--- hardstatus.patch	                        (rev 0)
+++ hardstatus.patch	2014-11-11 18:19:44 UTC (rev 226067)
@@ -0,0 +1,28 @@
+From 8ffd5f465ef4ed07b45534393ed51502b9b0ea77 Mon Sep 17 00:00:00 2001
+From: Amadeusz Sławiński <amade at asmblr.net>
+Date: Sat, 17 May 2014 10:38:01 +0000
+Subject: Fix cpation/hardstatus rendering problem
+
+https://savannah.gnu.org/bugs/?42369
+https://savannah.gnu.org/bugs/?32339
+https://savannah.gnu.org/bugs/?42247
+
+Signed-off-by: Amadeusz Sławiński <amade at asmblr.net>
+---
+diff --git a/src/screen.c b/src/screen.c
+index 473e4fa..8b36bea 100644
+--- a/src/screen.c
++++ b/src/screen.c
+@@ -2271,8 +2271,8 @@ int padlen;
+ 	  while (i-- > 0)
+ 	    *pn-- = ' ';
+ 	  numpad--;
+-	  if (r && p - buf == winmsg_rendpos[r - 1])
+-	    winmsg_rendpos[--r] = pn - buf;
++	  if (r && p - buf + 1== winmsg_rendpos[r - 1])
++	    winmsg_rendpos[--r] = pn - buf + 1;
+ 	}
+     }
+   return pn2;
+--
+cgit v0.9.0.2