X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=PKGBUILD;h=1bd003de48731d005ec396a44dc156f62cd66b8f;hb=549b41de1c97e612195bb4c06d050009f3e09825;hp=349f28f9d81e59f4855c83f2b41bf3a661febfe0;hpb=96d35f72f17e971c8b0c711ea2c186d0b899a730;p=perso%2FImmae%2FConfig%2FAUR.git

diff --git a/PKGBUILD b/PKGBUILD
index 349f28f..1bd003d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,20 @@
-# Maintainer: mar77i <mysatyre at gmail dot com>
+# Maintainer: mar77i <mar77i at mar77i dot ch>
 # Past Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Scytrin dai Kinthra <scytrin@gmail.com>
 
 pkgname=st-git
 _pkgname=st
-pkgver=20151011.f56c58a
+pkgver=0.7.1.g023225e
 pkgrel=1
 pkgdesc='Simple virtual terminal emulator for X'
 url='http://git.suckless.org/st/'
-arch=('i686' 'x86_64' 'armv7h')
+arch=('i686' 'x86_64')
 license=('MIT')
+options=('zipman')
 depends=('libxft')
 makedepends=('ncurses' 'libxext' 'git')
+epoch=1
+# include config.h and any patches you want to have applied here
 source=('git://git.suckless.org/st')
 sha1sums=('SKIP')
 
@@ -19,13 +22,13 @@ provides=("${_pkgname}")
 conflicts=("${_pkgname}")
 
 pkgver() {
-	cd "${srcdir}/${_pkgname}"
-	git log -1 --format='%cd.%h' --date=short | tr -d -
+	cd "${_pkgname}"
+	git describe --tags |sed 's/-/./g'
 }
 
 prepare() {
 	local file
-	cd "${srcdir}/${_pkgname}"
+	cd "${_pkgname}"
 	sed \
 		-e '/char font/s/= .*/= "Fixed:pixelsize=13:style=SemiCondensed";/' \
 		-e '/char worddelimiters/s/= .*/= " '"'"'`\\\"()[]{}<>|";/' \
@@ -43,21 +46,20 @@ prepare() {
 			# add config.h if present in source array
 			# Note: this supersedes the above sed to config.def.h
 			cp "$srcdir/$file" .
-			continue
-		elif [[ "$file" == *.diff ]]; then
+		elif [[ "$file" == *.diff || "$file" == *.patch ]]; then
 			# add all patches present in source array
-			patch -Np1 <"$srcdir/$file"
+			patch -Np1 <"$srcdir/$(basename ${file})"
 		fi
 	done
 }
 
 build() {
-	cd "${srcdir}/${_pkgname}"
+	cd "${_pkgname}"
 	make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
 }
 
 package() {
-	cd "${srcdir}/${_pkgname}"
+	cd "${_pkgname}"
 	make PREFIX=/usr DESTDIR="${pkgdir}" install
 	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 README "${pkgdir}/usr/share/doc/${pkgname}/README"