Fix AUR build failure without git identity
The `git cherry-pick` command creates a commit and thus requires a git identity (username and/or email), if those are not set in the git config, it will fail. Since we don't really need a commit, this now just applies the changes without committing them. Fixes #748
This commit is contained in:
parent
69992223bd
commit
ba1276cb7d
@ -3,9 +3,11 @@ pkgbase = polybar
|
||||
pkgver = 3.0.5
|
||||
pkgrel = 3
|
||||
url = https://github.com/jaagr/polybar
|
||||
install = polybar.install
|
||||
arch = i686
|
||||
arch = x86_64
|
||||
license = MIT
|
||||
makedepends = clang
|
||||
makedepends = cmake
|
||||
makedepends = git
|
||||
makedepends = python
|
||||
@ -20,12 +22,11 @@ pkgbase = polybar
|
||||
optdepends = wireless_tools: network module support
|
||||
optdepends = jsoncpp: i3 module support
|
||||
optdepends = i3ipc-glib-git: i3 module support
|
||||
optdepends = curl: github module support
|
||||
optdepends = ttf-unifont: Font used in example config
|
||||
optdepends = siji-git: Font used in example config
|
||||
optdepends = curl: github module support
|
||||
conflicts = polybar-git
|
||||
source = polybar::git+https://github.com/jaagr/polybar.git#tag=3.0.5
|
||||
install = polybar.install
|
||||
md5sums = SKIP
|
||||
|
||||
pkgname = polybar
|
||||
|
@ -24,7 +24,7 @@ md5sums=("SKIP")
|
||||
|
||||
prepare() {
|
||||
git -C "${pkgname}" submodule update --init --recursive
|
||||
git -C "${pkgname}" cherry-pick d35abc7620c8f06618b4708d9a969dfa2f309e96
|
||||
git -C "${pkgname}" cherry-pick -n d35abc7620c8f06618b4708d9a969dfa2f309e96
|
||||
mkdir -p "${pkgname}/build"
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user