X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=PKGBUILD;h=314d1436e2ee065fb09a3df0c9ecef5546638a64;hb=89c41b34fbbef7e071d88d421e63ab89ef620f1b;hp=ff5e10ca18e6f354421a56e5c2c10edfddae499a;hpb=d24ea821b52ab30087241873c32001f64cbbd76d;p=perso%2FImmae%2FConfig%2FAUR.git

diff --git a/PKGBUILD b/PKGBUILD
index ff5e10c..314d143 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,19 @@
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: mar77i <mysatyre at gmail dot com>
+# Past Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Scytrin dai Kinthra <scytrin@gmail.com>
 
 pkgname=st-git
 _pkgname=st
-pkgver=20150603.71fa10f
+pkgver=20151011.f56c58a
 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')
 depends=('libxft')
 makedepends=('ncurses' 'libxext' 'git')
-source=('git://git.suckless.org/st'
-        'scrollback.patch')
-sha1sums=('SKIP'
-          '2e10ac47eb020d50c7f861f3923bb4152255a027')
+source=('git://git.suckless.org/st')
+sha1sums=('SKIP')
 
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
@@ -25,13 +24,31 @@ pkgver() {
 }
 
 prepare() {
+	local file
 	cd "${srcdir}/${_pkgname}"
-	patch -p1 -i ../scrollback.patch # http://st.suckless.org/patches/st-scrollback.diff
 	sed \
 		-e '/char font/s/= .*/= "Fixed:pixelsize=13:style=SemiCondensed";/' \
 		-e '/char worddelimiters/s/= .*/= " '"'"'`\\\"()[]{}<>|";/' \
 		-e '/int defaultcs/s/= .*/= 1;/' \
 		-i config.def.h
+	sed \
+		-e 's/CPPFLAGS =/CPPFLAGS +=/g' \
+		-e 's/CFLAGS =/CFLAGS +=/g' \
+		-e 's/LDFLAGS =/LDFLAGS +=/g' \
+		-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" .
+			continue
+		elif [[ "$file" == *.diff ]]; then
+			# add all patches present in source array
+			patch -Np1 <"$srcdir/$file"
+		fi
+	done
 }
 
 build() {
@@ -41,8 +58,6 @@ build() {
 
 package() {
 	cd "${srcdir}/${_pkgname}"
-	export TERMINFO="${pkgdir}/usr/share/terminfo"
-	install -d "$TERMINFO"
 	make PREFIX=/usr DESTDIR="${pkgdir}" install
 	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 README "${pkgdir}/usr/share/doc/${pkgname}/README"