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

[Gaetan Bisson]

    Date: Sunday, June 14, 2015 @ 03:15:48
  Author: bisson
Revision: 240742

upstream update

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

------------------+
 PKGBUILD         |   14 ++++----------
 hardstatus.patch |   28 ----------------------------
 2 files changed, 4 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-13 23:08:53 UTC (rev 240741)
+++ PKGBUILD	2015-06-14 01:15:48 UTC (rev 240742)
@@ -4,9 +4,8 @@
 # Committer: dorphell <dorphell at gmx.net>
 
 pkgname=screen
-pkgver=4.2.1
-pkgrel=3
-_ptygroup=5 #the UID of our PTY/TTY group
+pkgver=4.3.0
+pkgrel=1
 pkgdesc='Full-screen window manager that multiplexes a physical terminal'
 url='http://www.gnu.org/software/screen/'
 arch=('i686' 'x86_64')
@@ -14,10 +13,8 @@
 depends=('ncurses' 'pam')
 validpgpkeys=('2EE59A5D0C50167B5535BBF1B708A383C53EF3A4')
 source=("http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz"{,.sig}
-        'hardstatus.patch'
         'pam.d')
-sha1sums=('21eadf5f1d64120649f3390346253c6bc8a5103c' 'SKIP'
-          'd9d0ae0427eede2523954fdec549021f0f9640cd'
+sha1sums=('504c424f719cd44907a3390d5238759e1cb56741' 'SKIP'
           '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
 
 backup=('etc/screenrc' 'etc/pam.d/screen')
@@ -24,10 +21,7 @@
 options=('!makeflags')
 install=install
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p2 -i ../hardstatus.patch
-}
+_ptygroup=5 #the UID of our PTY/TTY group
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"

Deleted: hardstatus.patch
===================================================================
--- hardstatus.patch	2015-06-13 23:08:53 UTC (rev 240741)
+++ hardstatus.patch	2015-06-14 01:15:48 UTC (rev 240742)
@@ -1,28 +0,0 @@
-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