upgpkg: 2:2.06.r591.g6425c12cd-1: fix #78938, #78963

PKGBUILD

@@ -18,8 +18,8 @@ _GRUB_EMU_BUILD="0"
 pkgname='grub'
 pkgdesc='GNU GRand Unified Bootloader (2)'
 epoch=2
-_commit='857af0e17b3f8df8a2e1b355e159c48ddb801419'
-_pkgver=2.06.r566.g857af0e17
+_commit='6425c12cd77ad51ad24be84c092aefacf0875089'
+_pkgver=2.06.r591.g6425c12cd
 _unifont_ver='15.0.06'
 pkgver=${_pkgver/-/}
 pkgrel=1
@@ -36,10 +36,10 @@ replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
 provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
 
 makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen'
-             'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2')
+             'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse3')
 depends=('sh' 'xz' 'gettext' 'device-mapper')
 optdepends=('freetype2: For grub-mkfont usage'
-            'fuse2: For grub-mount usage'
+            'fuse3: For grub-mount usage'
             'dosfstools: For grub-mkrescue FAT FS and EFI support'
             'lzop: For grub-mkrescue LZO support'
             'efibootmgr: For grub-install EFI support'
@@ -63,7 +63,6 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}"
         '0001-00_header-add-GRUB_COLOR_-variables.patch'
         '0002-10_linux-detect-archlinux-initramfs.patch'
         '0003-support-dropins-for-default-configuration.patch'
-        '0004-efi-Add-missing-__grub_efi_api-attributes.patch'
         'grub.default'
         'sbat.csv')
 
@@ -74,7 +73,6 @@ sha256sums=('SKIP'
             '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
             '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
             'b5d9fcd62ffb3c3950fdeb7089ec2dc2294ac52e9861980ad90a437dedbd3d47'
-            'dc892edc59817bdb474e960c645a8bdde60e6cb31e9a399359e883d0a3335738'
             '7df3f5cb5df7d2dfb17f4c9b5c5dedc9519ddce6f8d2c6cd43d1be17cecb65cb'
             '98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df')
 
@@ -133,10 +131,6 @@ prepare() {
 
 	echo "Patch to support dropins for default configuration..."
 	patch -Np1 -i "${srcdir}/0003-support-dropins-for-default-configuration.patch"
-
-	echo "Patch to efi: Add missing __grub_efi_api attributes..."
-	patch -Np1 -i "${srcdir}/0004-efi-Add-missing-__grub_efi_api-attributes.patch"
-
 	echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
 	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"