chang order of patches

This commit is contained in:
Ryan Kes 2019-02-14 16:56:39 +01:00
parent 132aba920b
commit 22b6fb726a

View file

@ -12,8 +12,10 @@ options=(zipman)
depends=('libx11' 'libxinerama' 'libxft' 'freetype2' 'st' 'dmenu' 'nerd-fonts-source-code-pro') depends=('libx11' 'libxinerama' 'libxft' 'freetype2' 'st' 'dmenu' 'nerd-fonts-source-code-pro')
install=dwm.install install=dwm.install
_patches=("https://dwm.suckless.org/patches/alpha/dwm-alpha-20180613-b69c870.diff" _patches=(
"https://dwm.suckless.org/patches/noborder/dwm-noborder-20170207-bb3bd6f.diff") "https://dwm.suckless.org/patches/noborder/dwm-noborder-20170207-bb3bd6f.diff"
"https://dwm.suckless.org/patches/alpha/dwm-alpha-20180613-b69c870.diff"
)
source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz
config.h config.h
@ -21,18 +23,14 @@ source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz
"${_patches[@]}") "${_patches[@]}")
md5sums=('9929845ccdec4d2cc191f16210dd7f3d' md5sums=('9929845ccdec4d2cc191f16210dd7f3d'
'49875b8dd04346410b570bb85c9c6f3a' '40309255ec6aeadeb8075f41f6e2e085'
'939f403a71b6e85261d09fc3412269ee' '939f403a71b6e85261d09fc3412269ee'
'4e5893e04c443530168223639c97bc47' 'fbb786263f2d714b18368ff64779d669'
'fbb786263f2d714b18368ff64779d669') '4e5893e04c443530168223639c97bc47')
prepare() { prepare() {
cd $srcdir/$pkgname-$pkgver cd $srcdir/$pkgname-$pkgver
# Update systray patch to fix conflicts
#sed -i 's/+253,24/+254,24/g' "$srcdir/$(basename ${_patches[3]})"
#sed -i '117 a \ static void xinitvisual();' "$srcdir/$(basename ${_patches[2]})"
for patch in "${_patches[@]}"; do for patch in "${_patches[@]}"; do
echo "Applying patch $(basename $patch)..." echo "Applying patch $(basename $patch)..."
patch -Np1 -i "$srcdir/$(basename $patch)" patch -Np1 -i "$srcdir/$(basename $patch)"