upgpkg: shim-git 15.4.r64.2699836-1: remove patch merged upstream

2 files changed, 2 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a0c95b1ae75..7d816ba767f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = shim-git
 	pkgdesc = UEFI shim loader
-	pkgver = 15.4.r62.69b7bbf
+	pkgver = 15.4.r64.2699836
 	pkgrel = 1
 	url = https://github.com/rhboot/shim
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 4bfc029e8f9f..b82b9f38a62b 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-git
-pkgver=15.4.r62.69b7bbf
+pkgver=15.4.r64.2699836
 pkgrel=1
 pkgdesc='UEFI shim loader'
 arch=('x86_64')
@@ -30,9 +30,6 @@ 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
 }