Merge remote-tracking branch 'aur/master'

.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
 

PKGBUILD

@@ -1,29 +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
-        https://gitlab.com/SirJson/nord-st-unofficial/raw/master/nord-theme.patch)
-sha256sums=('c4fb0fe2b8d2d3bd5e72763e80a8ae05b7d44dbac8f8e3bb18ef0161c7266926'
-            '9ff04c071056be99ad9fc32092348a5a7601e23a60fdd9f0ff68eb70fee3afd4'
-            '6393617bdbc396e7e0cbb59b9c7fefe2b0525bd6c4241c7a4a0642f6f9b66bea')
+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
-  # apply patches
-  patch -p0 config.h $srcdir/nord-theme.patch
+  # user is supposed to maintain config.h him/herself
+  cp $srcdir/config.h $srcdir/$pkgname-$pkgver/config.h
 }
 
 build() {
@@ -36,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" 
 }

config.h

@@ -176,8 +176,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} },
 };
 
 /*