From 491bf9298cf5197ddbdda07d5d8aa09309b0c2fe Mon Sep 17 00:00:00 2001
From: "Sebastian J. Bronner" <waschtl@sbronner.com>
Date: Tue, 15 Oct 2019 18:12:51 +0200
Subject: Fix remaining issue with terminfo files

---
 .SRCINFO   |  7 ++-----
 .gitignore |  4 ++++
 PKGBUILD   | 13 +++++++------
 3 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 .gitignore

diff --git a/.SRCINFO b/.SRCINFO
index 67b8284..736f5ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,15 @@
-# Generated by mksrcinfo v8
-# Wed Apr 10 09:19:45 UTC 2019
 pkgbase = st
 	pkgdesc = A simple virtual terminal emulator for X.
 	pkgver = 0.8.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://st.suckless.org
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	license = MIT
+	makedepends = libxext
 	makedepends = ncurses
 	depends = libxft
-	depends = libxext
-	depends = xorg-fonts-misc
 	source = http://dl.suckless.org/st/st-0.8.2.tar.gz
 	source = config.h
 	sha256sums = aeb74e10aa11ed364e1bcc635a81a523119093e63befd2f231f8b0705b15bf35
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d59381f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/*.pkg.tar.xz
+/pkg/
+/src/
+/st-*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 8d3a2c3..d2cbc2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,23 @@
 # Maintainer: Jose Riha <jose1711 gmail com>
+# Maintainer: Sebastian J. Bronner <waschtl@sbronner.com>
 # Contributor: Patrick Jackson <PatrickSJackson gmail com>
 # Contributor: Christoph Vigano <mail@cvigano.de>
 
 pkgname=st
 pkgver=0.8.2
-pkgrel=2
+pkgrel=3
 pkgdesc='A simple virtual terminal emulator for X.'
 arch=('i686' 'x86_64' 'armv7h')
 license=('MIT')
-depends=('libxft' 'libxext' 'xorg-fonts-misc')
-makedepends=('ncurses')
+depends=(libxft)
+makedepends=(libxext ncurses)
 url="http://st.suckless.org"
 source=(http://dl.suckless.org/st/$pkgname-$pkgver.tar.gz config.h)
 sha256sums=('aeb74e10aa11ed364e1bcc635a81a523119093e63befd2f231f8b0705b15bf35' 'SKIP')
 
 prepare() {
+  sed '/@tic/d' -i $pkgname-$pkgver/Makefile
+
   # user is supposed to maintain config.h him/herself
   cp $srcdir/config.h $srcdir/$pkgname-$pkgver/config.h
 }
@@ -26,9 +29,7 @@ build() {
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make PREFIX=/usr DESTDIR="$pkgdir" TERMINFO="$pkgdir/usr/share/terminfo" install
+  make PREFIX=/usr DESTDIR="$pkgdir" 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" 
 }
-- 
cgit v1.2.3