upgpkg: shim-efi-git 15.r55.a4a1fbe-1

Fix compilation with gnu-efi-libs 3.0.11

2 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a478d282ff1c..8abd4b59a5e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = shim-efi-git
 	pkgdesc = UEFI shim loader
-	pkgver = 15.r57.5abcc10
+	pkgver = 15.r55.a4a1fbe
 	pkgrel = 1
 	url = https://github.com/rhboot/shim
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index c14149046e19..09cb78a9a8cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor: Pablo Lezaeta <(prflr 88) (arro'a) (gmail) (puntocom)>
 pkgname=shim-efi-git
-pkgver=15.r57.5abcc10
+pkgver=15.r55.a4a1fbe
 pkgrel=1
 pkgdesc='UEFI shim loader'
 arch=('x86_64')
@@ -22,7 +22,9 @@ pkgver() {
 prepare() {
 	cd shim
 	# Fix "address of packed member" compilation error with GGC 9 (GitHub PR #183)
-	git pull origin pull/183/merge
+	git cherry-pick --no-commit 81c5570b429d69ac314e9b40186e65030055a23e
+	# Fix typo in lib/console.c EFI_WARN_UNKNOWN_GLYPH definition (GitHub PR #188)
+	git cherry-pick --no-commit 6b29eb80512fabb1396ce8b96bddbee0fb8ea70d
 }
 
 build() {