From 0b91e3f4acd042d3c88e250a4eff25217d430ef2 Mon Sep 17 00:00:00 2001 From: Vincent Grande Date: Sat, 23 May 2020 09:08:49 -0400 Subject: [PATCH] patch for the patch --- .SRCINFO | 7 +++++-- PKGBUILD | 19 +++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b1206a8..5a5e2f0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,15 @@ pkgbase = st-git pkgdesc = A simple virtual terminal emulator for X. - pkgver = 0.8.3.r9.g045a0fa - pkgrel = 1 + pkgver = 0.8.3.r13.g475a0a3 + pkgrel = 2 url = https://st.suckless.org arch = i686 arch = x86_64 arch = armv7h license = MIT + makedepends = ncurses + makedepends = libxext + makedepends = git depends = libxft provides = st conflicts = st diff --git a/PKGBUILD b/PKGBUILD index f42f2be..78764b1 100755 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,16 +1,18 @@ # Maintainer: Vincent Grande +# Contributor: Static_Rocket # Contributor: Jose Riha # Contributor: Sebastian J. Bronner # Contributor: Patrick Jackson # Contributor: Christoph Vigano pkgname=st-git -pkgver=0.8.3.r9.g045a0fa -pkgrel=1 +pkgver=0.8.3.r13.g475a0a3 +pkgrel=2 pkgdesc='A simple virtual terminal emulator for X.' arch=('i686' 'x86_64' 'armv7h') license=('MIT') depends=(libxft) +makedepends=('ncurses' 'libxext' 'git') provides=(st) conflicts=(st) url=https://st.suckless.org @@ -23,6 +25,8 @@ sha256sums=(SKIP _gitname="st" _sourcedir="$_gitname" _makeopts="--directory=$_sourcedir" +_gitdir=${pkgname%'-git'} +_startdir=$PWD pkgver() { cd "${srcdir}/st" @@ -31,11 +35,14 @@ pkgver() { prepare() { - echo 'Applying patches from $startdir if they exist...' - if [ -d "${startdir}/patches" ]; then - for patch in ${startdir}/patches/*.diff; do +patch --directory="$_sourcedir" --strip=0 < terminfo.patch + + + echo 'Applying patches from $_startdir if they exist...' + if [ -d "$_startdir}/patches" ]; then + for patch in $_startdir/patches/*.diff; do echo "Applying $patch ..." - git apply "$patch" + patch -p1 -s -i "$patch" done; fi;