diff --git a/PKGBUILD b/PKGBUILD index bd71d80..f141a94 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,12 +13,19 @@ url="https://github.com/vivien/i3blocks" license=('GPL3') makedepends=('git') depends=('glibc') -source=("${pkgname}-${pkgver}::git+https://github.com/vivien/${pkgname}#tag=${pkgver}?signed") -sha512sums=('SKIP') +source=("${pkgname}-${pkgver}::git+https://github.com/vivien/${pkgname}#tag=${pkgver}?signed" + i3blocks-1.5-fix-Makefile-bash-completion-dependency.patch) +sha512sums=('SKIP' + 'd3d21b200f71559156c994f94f2e05f92c61b807e7d4916f474730ad8e8769b813ecc1073b6cf7ab8ee5e6b13eed12c9d94d7d23d3c3bbb44943ebea28e504fd') backup=('etc/i3blocks.conf') validpgpkeys=('44C919BDF206CFDC49C7101A66C63FBDFD79670A') install=i3blocks.install +prepare() { + # https://github.com/vivien/i3blocks/commit/a004d63291b937775934e226205cd65f1726d557 + patch -Np1 -i ../i3blocks-1.5-fix-Makefile-bash-completion-dependency.patch -d "${pkgname}-${pkgver}" +} + build () { cd "${pkgname}-${pkgver}" ./autogen.sh diff --git a/i3blocks-1.5-fix-Makefile-bash-completion-dependency.patch b/i3blocks-1.5-fix-Makefile-bash-completion-dependency.patch new file mode 100644 index 0000000..f947d5e --- /dev/null +++ b/i3blocks-1.5-fix-Makefile-bash-completion-dependency.patch @@ -0,0 +1,28 @@ +From a004d63291b937775934e226205cd65f1726d557 Mon Sep 17 00:00:00 2001 +From: rvalue +Date: Fri, 12 Nov 2021 18:59:41 +0800 +Subject: [PATCH] Makefile.am: fix bash-completion dependency + +Target `install-data-local` might be made before bashcompletion is +ready. This change fix it. + +[vivien: reword commit message] +Fixes: #402 +Closes: #457 +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index d755a2b8..d72439c3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,7 +34,7 @@ if ENABLE_BASH_COMPLETION + bashcompletiondir = $(BASH_COMPLETION_DIR) + bashcompletion_DATA = bash-completion + +-install-data-local: ++install-data-local: install-bashcompletionDATA + ( cd '$(DESTDIR)$(BASH_COMPLETION_DIR)' && mv bash-completion i3blocks ) + + uninstall-local: