Add patches and fix PKGBUILD to apply them.

PKGBUILD

@@ -6,23 +6,23 @@
 # Contributor: Christoph Vigano <mail@cvigano.de>
 
 pkgname=st-git
-pkgver=0.8.3.r19.g9ba7ecf
+pkgver=0.8.5.r7.gef05519
 pkgrel=1
 pkgdesc='A simple virtual terminal emulator for X.'
 arch=('i686' 'x86_64' 'armv7h')
 license=('MIT')
-depends=(libxft)
+depends=(libxft-bgra)
 makedepends=('ncurses' 'libxext' 'git')
 provides=(st)
 conflicts=(st)
 url=https://st.suckless.org
 source=(git://git.suckless.org/st
-	terminfo.patch
-	README.terminfo.rst)
+        terminfo.patch
+        README.terminfo.rst)
 sha256sums=(SKIP
-	    SKIP
+            SKIP
             SKIP)
-_gitname="st"	    
+_gitname="st"
 _sourcedir="$_gitname"
 _makeopts="--directory=$_sourcedir"
 _gitdir=${pkgname%'-git'}
@@ -34,17 +34,15 @@ pkgver() {
 }
 
 prepare() {
+  patch --directory="$_sourcedir" --strip=0 < terminfo.patch
 
-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 ..."
-		        patch -p1 -s -i "$patch"
-		done;
-	fi;
+  echo 'Applying patches from '"$_startdir"' if they exist...'
+  if [ -d "$_startdir/patches" ]; then
+    for patch in $_startdir/patches/*.diff; do
+      echo "Applying $patch ..."
+      patch -d "$_sourcedir" -p1 -s -i "$patch"
+    done;
+  fi;
 
   # This package provides a mechanism to provide a custom config.h. Multiple
   # configuration states are determined by the presence of two files in