[arch-commits] Commit in vi/repos (5 files)

2019-11-13 Thread Evangelos Foutras via arch-commits
Date: Wednesday, November 13, 2019 @ 18:09:49
  Author: foutrelis
Revision: 368447

archrelease: copy trunk to staging-x86_64

Added:
  vi/repos/staging-x86_64/
  vi/repos/staging-x86_64/PKGBUILD
(from rev 368446, vi/trunk/PKGBUILD)
  vi/repos/staging-x86_64/fix-tubesize-short-overflow.patch
(from rev 368446, vi/trunk/fix-tubesize-short-overflow.patch)
  vi/repos/staging-x86_64/navkeys.patch
(from rev 368446, vi/trunk/navkeys.patch)
  vi/repos/staging-x86_64/preserve-dir.patch
(from rev 368446, vi/trunk/preserve-dir.patch)

---+
 PKGBUILD  |   50 ++
 fix-tubesize-short-overflow.patch |   12 
 navkeys.patch |   55 
 preserve-dir.patch|   99 
 4 files changed, 216 insertions(+)

Copied: vi/repos/staging-x86_64/PKGBUILD (from rev 368446, vi/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-11-13 18:09:49 UTC (rev 368447)
@@ -0,0 +1,50 @@
+# Maintainer: Evangelos Foutras 
+# Contributor: Eric Bélanger 
+
+pkgname=vi
+pkgver=070224
+pkgrel=4
+epoch=1
+pkgdesc="The original ex/vi text editor"
+arch=('x86_64')
+url="http://ex-vi.sourceforge.net/;
+license=('custom:ex')
+depends=('ncurses')
+optdepends=('s-nail: used by the preserve command for notification')
+source=(https://sources.archlinux.org/other/$pkgname/ex-$pkgver.tar.xz{,.sig}
+fix-tubesize-short-overflow.patch
+navkeys.patch
+preserve-dir.patch)
+sha256sums=('c3e52dd44edd1f6bf0b52207f717c56149dc50aac0d131fff3851d589727f52f'
+'SKIP'
+'42167fabebe30a13d594346b1d254db82090ba41742a9f35b8895d37092053f0'
+'0e9e2d381f1d8cb86daae68462b3849825b003c08007725c0db9939d3d5bf58d'
+'f0ef9ed2ccea98bf47b08dd3faa2abb911b4e6c0579f5294e9d0e8742282ff65')
+validpgpkeys=('86CFFCA918CF3AF47147588051E8B148AC34')
+
+prepare() {
+  cd ex-$pkgver
+
+  patch -Np1 -i ../fix-tubesize-short-overflow.patch
+  patch -Np1 -i ../navkeys.patch
+
+  # https://bugs.archlinux.org/task/20653
+  patch -Np1 -i ../preserve-dir.patch
+}
+
+build() {
+  cd ex-$pkgver
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+TERMLIB=ncurses FEATURES="-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8"
+}
+
+package() {
+  cd ex-$pkgver
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+INSTALL=/usr/bin/install DESTDIR="$pkgdir" install
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: vi/repos/staging-x86_64/fix-tubesize-short-overflow.patch (from rev 
368446, vi/trunk/fix-tubesize-short-overflow.patch)
===
--- staging-x86_64/fix-tubesize-short-overflow.patch
(rev 0)
+++ staging-x86_64/fix-tubesize-short-overflow.patch2019-11-13 18:09:49 UTC 
(rev 368447)
@@ -0,0 +1,12 @@
+diff -upr ex-070224.orig/ex_vis.h ex-070224/ex_vis.h
+--- ex-070224.orig/ex_vis.h2005-08-06 14:41:15.0 +0300
 ex-070224/ex_vis.h 2015-05-02 20:41:13.938665281 +0300
+@@ -104,7 +104,7 @@ var enum {
+  */
+ var   short   TUBELINES;
+ var   short   TUBECOLS;
+-var   short   TUBESIZE;
++var   int TUBESIZE;
+ 
+ /*
+  * The screen in visual and crtopen is of varying size; the basic

Copied: vi/repos/staging-x86_64/navkeys.patch (from rev 368446, 
vi/trunk/navkeys.patch)
===
--- staging-x86_64/navkeys.patch(rev 0)
+++ staging-x86_64/navkeys.patch2019-11-13 18:09:49 UTC (rev 368447)
@@ -0,0 +1,55 @@
+diff -ru ex-050325/ex_tty.c ex-050325-du/ex_tty.c
+--- ex-050325/ex_tty.c 2005-03-04 13:42:58.0 +0100
 ex-050325-du/ex_tty.c  2009-06-25 20:06:57.0 +0200
+@@ -132,7 +132,8 @@
+   , , , , , , , , , , , ,
+   , , , , , , , , , , , , , ,
+   , , , , , , , , , , , , , ,
+-  _PARM, _PARM, _PARM, _PARM, _PARM, _PARM
++  _PARM, _PARM, _PARM, _PARM, _PARM, _PARM,
++  , , , , , 
+ };
+ bool *sflags[] = {
+   , , , , , ,
+@@ -170,7 +171,12 @@
+   addmac1(KD, "j", "down", arrows, 1);
+   addmac1(KL, "h", "left", arrows, 1);
+   addmac1(KR, "l", "right", arrows, 1);
+-  addmac1(KH, "H", "home", arrows, 1);
++  addmac1(kI, "i", "insert", arrows, 1);
++  addmac1(kD, "x", "delete", arrows, 1);
++  addmac1(kh, "^", "home", arrows, 1);
++  addmac1(at7, "$", "end", arrows, 1);
++  addmac1(kP, "", "pgup", arrows, 1);
++  addmac1(kN, "", "pgdn", arrows, 1);
+ 
+   /*
+* Handle funny termcap capabilities
+@@ -341,7 +347,7 @@
+   *(*fp++) = flag;
+   namp += 2;
+   } while (*namp);
+-  namp = 

[arch-commits] Commit in vi/repos (5 files)

2018-06-03 Thread Evangelos Foutras via arch-commits
Date: Monday, June 4, 2018 @ 04:13:23
  Author: foutrelis
Revision: 325754

archrelease: copy trunk to testing-x86_64

Added:
  vi/repos/testing-x86_64/
  vi/repos/testing-x86_64/PKGBUILD
(from rev 325753, vi/trunk/PKGBUILD)
  vi/repos/testing-x86_64/fix-tubesize-short-overflow.patch
(from rev 325753, vi/trunk/fix-tubesize-short-overflow.patch)
  vi/repos/testing-x86_64/navkeys.patch
(from rev 325753, vi/trunk/navkeys.patch)
  vi/repos/testing-x86_64/preserve-dir.patch
(from rev 325753, vi/trunk/preserve-dir.patch)

---+
 PKGBUILD  |   52 ++
 fix-tubesize-short-overflow.patch |   12 
 navkeys.patch |   55 
 preserve-dir.patch|   99 
 4 files changed, 218 insertions(+)

Copied: vi/repos/testing-x86_64/PKGBUILD (from rev 325753, vi/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-06-04 04:13:23 UTC (rev 325754)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Evangelos Foutras 
+# Contributor: Eric Bélanger 
+
+pkgname=vi
+pkgver=070224
+pkgrel=3
+epoch=1
+pkgdesc="The original ex/vi text editor"
+arch=('x86_64')
+url="http://ex-vi.sourceforge.net/;
+license=('custom:ex')
+groups=('base')
+depends=('ncurses')
+optdepends=('s-nail: used by the preserve command for notification')
+source=(https://sources.archlinux.org/other/$pkgname/ex-$pkgver.tar.xz{,.sig}
+fix-tubesize-short-overflow.patch
+navkeys.patch
+preserve-dir.patch)
+sha256sums=('c3e52dd44edd1f6bf0b52207f717c56149dc50aac0d131fff3851d589727f52f'
+'SKIP'
+'42167fabebe30a13d594346b1d254db82090ba41742a9f35b8895d37092053f0'
+'0e9e2d381f1d8cb86daae68462b3849825b003c08007725c0db9939d3d5bf58d'
+'f0ef9ed2ccea98bf47b08dd3faa2abb911b4e6c0579f5294e9d0e8742282ff65')
+validpgpkeys=('86CFFCA918CF3AF47147588051E8B148AC34')
+
+prepare() {
+  cd ex-$pkgver
+
+  patch -Np1 -i ../fix-tubesize-short-overflow.patch
+  patch -Np1 -i ../navkeys.patch
+
+  # https://bugs.archlinux.org/task/20653
+  patch -Np1 -i ../preserve-dir.patch
+}
+
+build() {
+  cd ex-$pkgver
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+TERMLIB=ncurses FEATURES="-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8"
+}
+
+package() {
+  cd ex-$pkgver
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+INSTALL=/usr/bin/install DESTDIR="$pkgdir" install
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: vi/repos/testing-x86_64/fix-tubesize-short-overflow.patch (from rev 
325753, vi/trunk/fix-tubesize-short-overflow.patch)
===
--- testing-x86_64/fix-tubesize-short-overflow.patch
(rev 0)
+++ testing-x86_64/fix-tubesize-short-overflow.patch2018-06-04 04:13:23 UTC 
(rev 325754)
@@ -0,0 +1,12 @@
+diff -upr ex-070224.orig/ex_vis.h ex-070224/ex_vis.h
+--- ex-070224.orig/ex_vis.h2005-08-06 14:41:15.0 +0300
 ex-070224/ex_vis.h 2015-05-02 20:41:13.938665281 +0300
+@@ -104,7 +104,7 @@ var enum {
+  */
+ var   short   TUBELINES;
+ var   short   TUBECOLS;
+-var   short   TUBESIZE;
++var   int TUBESIZE;
+ 
+ /*
+  * The screen in visual and crtopen is of varying size; the basic

Copied: vi/repos/testing-x86_64/navkeys.patch (from rev 325753, 
vi/trunk/navkeys.patch)
===
--- testing-x86_64/navkeys.patch(rev 0)
+++ testing-x86_64/navkeys.patch2018-06-04 04:13:23 UTC (rev 325754)
@@ -0,0 +1,55 @@
+diff -ru ex-050325/ex_tty.c ex-050325-du/ex_tty.c
+--- ex-050325/ex_tty.c 2005-03-04 13:42:58.0 +0100
 ex-050325-du/ex_tty.c  2009-06-25 20:06:57.0 +0200
+@@ -132,7 +132,8 @@
+   , , , , , , , , , , , ,
+   , , , , , , , , , , , , , ,
+   , , , , , , , , , , , , , ,
+-  _PARM, _PARM, _PARM, _PARM, _PARM, _PARM
++  _PARM, _PARM, _PARM, _PARM, _PARM, _PARM,
++  , , , , , 
+ };
+ bool *sflags[] = {
+   , , , , , ,
+@@ -170,7 +171,12 @@
+   addmac1(KD, "j", "down", arrows, 1);
+   addmac1(KL, "h", "left", arrows, 1);
+   addmac1(KR, "l", "right", arrows, 1);
+-  addmac1(KH, "H", "home", arrows, 1);
++  addmac1(kI, "i", "insert", arrows, 1);
++  addmac1(kD, "x", "delete", arrows, 1);
++  addmac1(kh, "^", "home", arrows, 1);
++  addmac1(at7, "$", "end", arrows, 1);
++  addmac1(kP, "", "pgup", arrows, 1);
++  addmac1(kN, "", "pgdn", arrows, 1);
+ 
+   /*
+* Handle funny termcap capabilities
+@@ -341,7 +347,7 @@
+   *(*fp++) = flag;
+   namp += 2;
+   } while (*namp);
+-  namp =