Merge branch 'master' into base16-synth-midnight

3 files changed, 19 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e19bc4b..67b8284 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
 # Generated by mksrcinfo v8
-# Thu Mar 22 14:40:54 UTC 2018
+# Wed Apr 10 09:19:45 UTC 2019
 pkgbase = st
 	pkgdesc = A simple virtual terminal emulator for X.
-	pkgver = 0.8.1
-	pkgrel = 1
+	pkgver = 0.8.2
+	pkgrel = 2
 	url = http://st.suckless.org
 	arch = i686
 	arch = x86_64
+	arch = armv7h
 	license = MIT
 	makedepends = ncurses
 	depends = libxft
 	depends = libxext
 	depends = xorg-fonts-misc
-	source = http://dl.suckless.org/st/st-0.8.1.tar.gz
+	source = http://dl.suckless.org/st/st-0.8.2.tar.gz
 	source = config.h
-	sha256sums = c4fb0fe2b8d2d3bd5e72763e80a8ae05b7d44dbac8f8e3bb18ef0161c7266926
-	sha256sums = bed7977c855f02e3968a754e813015e4214b52102e3c54712d8a52245bcceeec
+	sha256sums = aeb74e10aa11ed364e1bcc635a81a523119093e63befd2f231f8b0705b15bf35
+	sha256sums = SKIP
 
 pkgname = st
 
diff --git a/PKGBUILD b/PKGBUILD
index 1176d52..8d3a2c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,22 @@
+# Maintainer: Jose Riha <jose1711 gmail com>
 # Contributor: Patrick Jackson <PatrickSJackson gmail com>
-# Maintainer: Christoph Vigano <mail@cvigano.de>
+# Contributor: Christoph Vigano <mail@cvigano.de>
 
 pkgname=st
-pkgver=0.8.1
-pkgrel=1
+pkgver=0.8.2
+pkgrel=2
 pkgdesc='A simple virtual terminal emulator for X.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv7h')
 license=('MIT')
 depends=('libxft' 'libxext' 'xorg-fonts-misc')
 makedepends=('ncurses')
 url="http://st.suckless.org"
-source=(http://dl.suckless.org/st/$pkgname-$pkgver.tar.gz
-        config.h)
-sha256sums=('c4fb0fe2b8d2d3bd5e72763e80a8ae05b7d44dbac8f8e3bb18ef0161c7266926'
-            'f6f330f37c084c8c10a06c0c4766a4fc65752536cc431e0593c2323beea67068')
+source=(http://dl.suckless.org/st/$pkgname-$pkgver.tar.gz config.h)
+sha256sums=('aeb74e10aa11ed364e1bcc635a81a523119093e63befd2f231f8b0705b15bf35' 'SKIP')
 
 prepare() {
-  cd $srcdir/$pkgname-$pkgver
-  # skip terminfo which conflicts with nsurses
-  sed -i '/tic /d' Makefile
-  cp $srcdir/config.h config.h
+  # user is supposed to maintain config.h him/herself
+  cp $srcdir/config.h $srcdir/$pkgname-$pkgver/config.h
 }
 
 build() {
@@ -32,4 +29,6 @@ package() {
   make PREFIX=/usr DESTDIR="$pkgdir" TERMINFO="$pkgdir/usr/share/terminfo" install
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
+  # remove to avoid conflict with ncurses
+  rm "${pkgdir}/usr/share/terminfo/s/st" "${pkgdir}/usr/share/terminfo/s/st-256color" 
 }
diff --git a/config.h b/config.h
index 10995c0..df47a5a 100644
--- a/config.h
+++ b/config.h
@@ -162,8 +162,8 @@ static Shortcut shortcuts[] = {
 	{ TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
 	{ TERMMOD,              XK_V,           clippaste,      {.i =  0} },
 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
+	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-	{ TERMMOD,              XK_I,           iso14755,       {.i =  0} },
 };
 
 /*