From ba1276cb7dda05437235f82c9b0a0c6d0b1edd4c Mon Sep 17 00:00:00 2001 From: patrick96 Date: Wed, 13 Sep 2017 13:18:21 +0200 Subject: [PATCH] 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 --- contrib/polybar.aur/.SRCINFO | 5 +++-- contrib/polybar.aur/PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/polybar.aur/.SRCINFO b/contrib/polybar.aur/.SRCINFO index 6785cd3b..18fbc7fa 100644 --- a/contrib/polybar.aur/.SRCINFO +++ b/contrib/polybar.aur/.SRCINFO @@ -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 diff --git a/contrib/polybar.aur/PKGBUILD b/contrib/polybar.aur/PKGBUILD index dceb70d0..66735e84 100644 --- a/contrib/polybar.aur/PKGBUILD +++ b/contrib/polybar.aur/PKGBUILD @@ -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" }