upgpkg: shim-git 15.4.r62.69b7bbf-1: fix test suite compilation

Add a required dependency and a patch to make it work on Arch.

2 files changed, 7 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4b75719e86e4..7a0c95b1ae75 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = shim-git
 	pkgdesc = UEFI shim loader
-	pkgver = 15.4.r7.9f973e4
+	pkgver = 15.4.r62.69b7bbf
 	pkgrel = 1
 	url = https://github.com/rhboot/shim
 	arch = x86_64
 	license = BSD
+	checkdepends = efivar
 	checkdepends = xxd
 	makedepends = git
 	provides = shim
diff --git a/PKGBUILD b/PKGBUILD
index 17935b4ea8ff..4bfc029e8f9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor: Pablo Lezaeta <(prflr 88) (arro'a) (gmail) (puntocom)>
 pkgname=shim-git
-pkgver=15.4.r7.9f973e4
+pkgver=15.4.r62.69b7bbf
 pkgrel=1
 pkgdesc='UEFI shim loader'
 arch=('x86_64')
 url='https://github.com/rhboot/shim'
 license=('BSD')
 makedepends=('git')
-checkdepends=('xxd')
+checkdepends=('efivar' 'xxd')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 replaces=('shim-efi-git')
@@ -30,6 +30,9 @@ prepare() {
 	git config submodule.gnu-efi.url "$srcdir/rhboot-gnu-efi"
 	git submodule update
 
+	# Fix compilation of the test suite (https://github.com/rhboot/shim/pull/415)
+	git cherry-pick --no-commit 447148f573018a9af09c1a8b84acdca2f45f864d
+
 	sed -e 's/-Werror //g' -i Makefile Make.defaults
 }