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

diff --git a/PKGBUILD b/PKGBUILD
index b68e76f..1bd003d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,34 @@
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# 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=20150603.71fa10f
+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')
-source=('git://git.suckless.org/st'
-        'scrollback.patch')
-sha1sums=('SKIP'
-          '2e10ac47eb020d50c7f861f3923bb4152255a027')
+epoch=1
+# include config.h and any patches you want to have applied here
+source=('git://git.suckless.org/st')
+sha1sums=('SKIP')
 
 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() {
-	cd "${srcdir}/${_pkgname}"
-	patch -p1 -i ../scrollback.patch # http://st.suckless.org/patches/st-scrollback.diff
+	local file
+	cd "${_pkgname}"
 	sed \
 		-e '/char font/s/= .*/= "Fixed:pixelsize=13:style=SemiCondensed";/' \
 		-e '/char worddelimiters/s/= .*/= " '"'"'`\\\"()[]{}<>|";/' \
@@ -39,17 +41,26 @@ prepare() {
 		-e 's/_BSD_SOURCE/_DEFAULT_SOURCE/' \
 		-i config.mk
 	sed '/@tic/d' -i Makefile
+	for file in "${source[@]}"; do
+		if [[ "$file" == "config.h" ]]; then
+			# add config.h if present in source array
+			# Note: this supersedes the above sed to config.def.h
+			cp "$srcdir/$file" .
+		elif [[ "$file" == *.diff || "$file" == *.patch ]]; then
+			# add all patches present in source array
+			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"
-	tic -s -o "${pkgdir}/usr/share/terminfo" st.info
 }