use -lXrendr, zipman, comment the source array and simplify the source loop, thanks prash

This commit is contained in:
mar77i
2016-09-03 13:34:17 +02:00
parent dc05f486ca
commit 278ae33272

View File

@@ -4,14 +4,16 @@
pkgname=st-git pkgname=st-git
_pkgname=st _pkgname=st
pkgver=20151011.f56c58a pkgver=20160309.3996461
pkgrel=1 pkgrel=1
pkgdesc='Simple virtual terminal emulator for X' pkgdesc='Simple virtual terminal emulator for X'
url='http://git.suckless.org/st/' url='http://git.suckless.org/st/'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
license=('MIT') license=('MIT')
options=('zipman')
depends=('libxft') depends=('libxft')
makedepends=('ncurses' 'libxext' 'git') makedepends=('ncurses' 'libxext' 'git')
# include config.h and any patches you want to have applied here
source=('git://git.suckless.org/st') source=('git://git.suckless.org/st')
sha1sums=('SKIP') sha1sums=('SKIP')
@@ -36,6 +38,7 @@ prepare() {
-e 's/CFLAGS =/CFLAGS +=/g' \ -e 's/CFLAGS =/CFLAGS +=/g' \
-e 's/LDFLAGS =/LDFLAGS +=/g' \ -e 's/LDFLAGS =/LDFLAGS +=/g' \
-e 's/_BSD_SOURCE/_DEFAULT_SOURCE/' \ -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/' \
-e 's/\(-lXft\)/\1 -lXrender/' \
-i config.mk -i config.mk
sed '/@tic/d' -i Makefile sed '/@tic/d' -i Makefile
for file in "${source[@]}"; do for file in "${source[@]}"; do
@@ -43,10 +46,9 @@ prepare() {
# add config.h if present in source array # add config.h if present in source array
# Note: this supersedes the above sed to config.def.h # Note: this supersedes the above sed to config.def.h
cp "$srcdir/$file" . cp "$srcdir/$file" .
continue elif [[ "$file" == *.diff || "$file" == *.patch ]]; then
elif [[ "$file" == *.diff ]]; then
# add all patches present in source array # add all patches present in source array
patch -Np1 <"$srcdir/$file" patch -Np1 <"$srcdir/$(basename ${file})"
fi fi
done done
} }