diff options
Diffstat (limited to 'extra/screen')
| -rw-r--r-- | extra/screen/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/screen/install | 9 | ||||
| -rw-r--r-- | extra/screen/long-term.patch | 24 |
3 files changed, 7 insertions, 45 deletions
diff --git a/extra/screen/PKGBUILD b/extra/screen/PKGBUILD index f03f31969..21efb635f 100644 --- a/extra/screen/PKGBUILD +++ b/extra/screen/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 211563 2014-04-20 06:11:13Z bisson $ +# $Id: PKGBUILD 211915 2014-04-29 18:49:14Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Committer: dorphell <dorphell@gmx.net> pkgname=screen -pkgver=4.2.0 -pkgrel=1 +pkgver=4.2.1 +pkgrel=2 _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/' @@ -13,23 +13,14 @@ arch=('i686' 'x86_64') license=('GPL') depends=('ncurses' 'pam') backup=('etc/screenrc' 'etc/pam.d/screen') -#source=("http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz" -source=("http://download.savannah.gnu.org/releases/screen/screen-${pkgver}.tar.gz" - 'long-term.patch' +source=("http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz"{,.sig} 'pam.d') -sha1sums=('85a206e1e474fd608f17e88bfe5f90a55f21c51a' - '4ca8408ec03e97777e37f45a99cf8ab503592734' +sha1sums=('21eadf5f1d64120649f3390346253c6bc8a5103c' 'SKIP' '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f') options=('!makeflags') install=install -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../long-term.patch - ./autogen.sh -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/screen/install b/extra/screen/install index e1429f787..3be83d014 100644 --- a/extra/screen/install +++ b/extra/screen/install @@ -1,11 +1,8 @@ infodir=usr/share/info -filelist=(screen.info screen.info-1 screen.info-2 screen.info-3 screen.info-4 screen.info-5) post_install() { [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done + install-info $infodir/screen.info.gz $infodir/dir 2>/dev/null } post_upgrade() { @@ -19,7 +16,5 @@ post_upgrade() { pre_remove() { [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done + install-info --delete $infodir/screen.info.gz $infodir/dir 2>/dev/null } diff --git a/extra/screen/long-term.patch b/extra/screen/long-term.patch deleted file mode 100644 index b4d6ff1f2..000000000 --- a/extra/screen/long-term.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -aur old/display.h new/display.h ---- old/display.h 2014-04-16 11:38:41.000000000 -1000 -+++ new/display.h 2014-04-17 16:20:36.992994397 -1000 -@@ -73,7 +73,7 @@ - struct win *d_other; /* pointer to other window */ - int d_nonblock; /* -1 don't block if obufmax reached */ - /* >0: block after nonblock secs */ -- char d_termname[20 + 1]; /* $TERM */ -+ char d_termname[40 + 1]; /* $TERM */ - char *d_tentry; /* buffer for tgetstr */ - char d_tcinited; /* termcap inited flag */ - int d_width, d_height; /* width/height of the screen */ -diff -aur old/screen.h new/screen.h ---- old/screen.h 2014-04-16 11:38:41.000000000 -1000 -+++ new/screen.h 2014-04-17 16:20:36.992994397 -1000 -@@ -214,7 +214,7 @@ - char preselect[20]; - int esc; /* his new escape character unless -1 */ - int meta_esc; /* his new meta esc character unless -1 */ -- char envterm[20 + 1]; /* terminal type */ -+ char envterm[40 + 1]; /* terminal type */ - int encoding; /* encoding of display */ - int detachfirst; /* whether to detach remote sessions first */ - } |