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

2015-06-28 Thread Gaetan Bisson
Date: Monday, June 29, 2015 @ 03:56:35
  Author: bisson
Revision: 241387

upstream update

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

--+
 PKGBUILD |   13 +++--
 resize.patch |   24 
 2 files changed, 3 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-28 21:54:30 UTC (rev 241386)
+++ PKGBUILD2015-06-29 01:56:35 UTC (rev 241387)
@@ -4,8 +4,8 @@
 # Committer: dorphell dorph...@gmx.net
 
 pkgname=screen
-pkgver=4.3.0
-pkgrel=3
+pkgver=4.3.1
+pkgrel=1
 pkgdesc='Full-screen window manager that multiplexes a physical terminal'
 url='http://www.gnu.org/software/screen/'
 arch=('i686' 'x86_64')
@@ -13,10 +13,8 @@
 depends=('ncurses' 'pam')
 validpgpkeys=('2EE59A5D0C50167B5535BBF1B708A383C53EF3A4')
 source=(http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz{,.sig}
-'resize.patch'
 'pam.d')
-sha1sums=('504c424f719cd44907a3390d5238759e1cb56741' 'SKIP'
-  'ec34e5bb69444706538f089d4c9b3c9f1ad58641'
+sha1sums=('a524761504e28480517e338b20c852f2ab100c93' 'SKIP'
   '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
 
 backup=('etc/screenrc' 'etc/pam.d/screen')
@@ -25,11 +23,6 @@
 
 _ptygroup=5 #the UID of our PTY/TTY group
 
-prepare() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   patch -p2 -i ../resize.patch
-}
-
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 

Deleted: resize.patch
===
--- resize.patch2015-06-28 21:54:30 UTC (rev 241386)
+++ resize.patch2015-06-29 01:56:35 UTC (rev 241387)
@@ -1,24 +0,0 @@
-From 27a8c9677a95b8de67c91f983b25691f0864c194 Mon Sep 17 00:00:00 2001
-From: Amadeusz Sławiński am...@asmblr.net
-Date: Sun, 21 Jun 2015 20:34:29 +
-Subject: Fix off by one error when resizing windows
-
-Bug: 45321
-
-Signed-off-by: Amadeusz Sławiński am...@asmblr.net

-diff --git a/src/resize.c b/src/resize.c
-index d48be5f..7dfd77c 100644
 a/src/resize.c
-+++ b/src/resize.c
-@@ -538,7 +538,7 @@ int wi;
- wi = MAXWIDTH;
-   if (wi = maxwidth)
- return;
--  maxwidth = wi;
-+  maxwidth = wi + 1;
-   debug1(New maxwidth: %d\n, maxwidth);
-   blank = (unsigned char *)xrealloc((char *)blank, maxwidth);
-   null = (unsigned char *)xrealloc((char *)null, maxwidth);
---
-cgit v0.9.0.2


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

2015-06-23 Thread Gaetan Bisson
Date: Wednesday, June 24, 2015 @ 01:01:39
  Author: bisson
Revision: 241245

fix FS#45441

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

--+
 PKGBUILD |9 -
 resize.patch |   24 
 2 files changed, 32 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-23 19:30:12 UTC (rev 241244)
+++ PKGBUILD2015-06-23 23:01:39 UTC (rev 241245)
@@ -5,7 +5,7 @@
 
 pkgname=screen
 pkgver=4.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Full-screen window manager that multiplexes a physical terminal'
 url='http://www.gnu.org/software/screen/'
 arch=('i686' 'x86_64')
@@ -13,8 +13,10 @@
 depends=('ncurses' 'pam')
 validpgpkeys=('2EE59A5D0C50167B5535BBF1B708A383C53EF3A4')
 source=(http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz{,.sig}
+'resize.patch'
 'pam.d')
 sha1sums=('504c424f719cd44907a3390d5238759e1cb56741' 'SKIP'
+  'ec34e5bb69444706538f089d4c9b3c9f1ad58641'
   '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
 
 backup=('etc/screenrc' 'etc/pam.d/screen')
@@ -23,6 +25,11 @@
 
 _ptygroup=5 #the UID of our PTY/TTY group
 
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p2 -i ../resize.patch
+}
+
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 

Added: resize.patch
===
--- resize.patch(rev 0)
+++ resize.patch2015-06-23 23:01:39 UTC (rev 241245)
@@ -0,0 +1,24 @@
+From 27a8c9677a95b8de67c91f983b25691f0864c194 Mon Sep 17 00:00:00 2001
+From: Amadeusz Sławiński am...@asmblr.net
+Date: Sun, 21 Jun 2015 20:34:29 +
+Subject: Fix off by one error when resizing windows
+
+Bug: 45321
+
+Signed-off-by: Amadeusz Sławiński am...@asmblr.net
+---
+diff --git a/src/resize.c b/src/resize.c
+index d48be5f..7dfd77c 100644
+--- a/src/resize.c
 b/src/resize.c
+@@ -538,7 +538,7 @@ int wi;
+ wi = MAXWIDTH;
+   if (wi = maxwidth)
+ return;
+-  maxwidth = wi;
++  maxwidth = wi + 1;
+   debug1(New maxwidth: %d\n, maxwidth);
+   blank = (unsigned char *)xrealloc((char *)blank, maxwidth);
+   null = (unsigned char *)xrealloc((char *)null, maxwidth);
+--
+cgit v0.9.0.2