From 5381ec4eefd728312e1d0ec8d89a2c630b65428e Mon Sep 17 00:00:00 2001
From: David Beauchamp <david@archlinuxarm.org>
Date: Fri, 3 May 2024 08:35:46 -0400
Subject: [PATCH] extra/fwupd to 1.9.19-1

---
 extra/fwupd/.SRCINFO | 22 +++++++---------------
 extra/fwupd/PKGBUILD | 31 ++++++++++---------------------
 2 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/extra/fwupd/.SRCINFO b/extra/fwupd/.SRCINFO
index bc9a40949..d46f0d8cf 100644
--- a/extra/fwupd/.SRCINFO
+++ b/extra/fwupd/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = fwupd
 	pkgdesc = Simple daemon to allow session software to update firmware
-	pkgver = 1.9.18
-	pkgrel = 2
+	pkgver = 1.9.19
+	pkgrel = 1
 	url = https://github.com/fwupd/fwupd
 	arch = x86_64
 	license = LGPL-2.1-or-later
@@ -10,6 +10,7 @@ pkgbase = fwupd
 	makedepends = gi-docgen
 	makedepends = gnu-efi-libs
 	makedepends = gobject-introspection
+	makedepends = libdrm
 	makedepends = meson
 	makedepends = noto-fonts
 	makedepends = noto-fonts-cjk
@@ -23,10 +24,8 @@ pkgbase = fwupd
 	depends = bash
 	depends = bluez
 	depends = curl
-	depends = efivar
 	depends = flashrom
 	depends = fwupd-efi
-	depends = gcab
 	depends = gcc-libs
 	depends = glib2
 	depends = glibc
@@ -41,7 +40,6 @@ pkgbase = fwupd
 	depends = libmbim
 	depends = libmm-glib
 	depends = libqmi
-	depends = libsmbios
 	depends = libxmlb
 	depends = passim
 	depends = polkit
@@ -53,28 +51,23 @@ pkgbase = fwupd
 	depends = tpm2-tss
 	depends = xz
 	depends = zlib
-	source = https://github.com/fwupd/fwupd/releases/download/1.9.18/fwupd-1.9.18.tar.xz
-	source = https://github.com/fwupd/fwupd/releases/download/1.9.18/fwupd-1.9.18.tar.xz.asc
+	source = https://github.com/fwupd/fwupd/releases/download/1.9.19/fwupd-1.9.19.tar.xz
+	source = https://github.com/fwupd/fwupd/releases/download/1.9.19/fwupd-1.9.19.tar.xz.asc
 	source = fwupd.sysusers
-	source = more-allow-syscall-fixes.patch::https://github.com/fwupd/fwupd/pull/7171.patch
 	validpgpkeys = 163EB50119225DB3DF8F49EA17ACBA8DFA970E17
-	sha512sums = d5e0f3a8c741240f389628e2ed81f1e6ec21689bdcd39f692222114a2d495925a0f0720b10fbb0087362c0b734f4f0abfd8e105eff4695e41e645395e5587a50
+	sha512sums = e20f16aa2cf528ecc6262a5c343287aef64fb37667f8d3972daa70f96364041daa0b23149acbd20cbeff059f6428c6c2a317973bc1dd40a39e239350b0eb011e
 	sha512sums = SKIP
 	sha512sums = 637203080b55eda74a659f58c853a9a723a2dad5da70915b2b0e036c6145a649468ebec700cc83975d9cb5378b9dced8b3a3b26bdbcc75ddc774837355e75deb
-	sha512sums = 2d7066874f93406f033da6ec0cff89ef15d4026892c501f22721ff6991fc338d6f7fdbdff648978f7e762b4f7375679a417f78911196060e5efeba973d700e32
-	b2sums = 7dd1691e2db600085a61a545961730a14d74e3f8b3a66fd90092658e19336a8e11861202db063d64c936cac9ab12ebf7dcdd3a8dcd7ff01b05f0a860d8b4ba68
+	b2sums = 7e092c0ba2b094fb2041121b7b04b5a5914e85f05213cca4eafeb1826a8291bf733d1b7f8738d35b4a336a0d2d1c0d42582d21831873fae8c7884dbf5d592ee4
 	b2sums = SKIP
 	b2sums = e65ca7da22a20a40882cfc1fe4479643f9a38c90a4f2c3e71e6e5e3de1d6db212a0f17d600097619fe3cdb0a9b860422f8b0b9a9d45441518e51a7eb12a918bb
-	b2sums = 57213d3142f0d04ce8243f0c9292fe3c139c06c3740059ff9d12fcba6964d58cf9a2b5fbcd226e117707ad101f69be80fccfc7de94d5a67e3b7d8e4c6a5b4909
 
 pkgname = fwupd
 	depends = bash
 	depends = bluez
 	depends = curl
-	depends = efivar
 	depends = flashrom
 	depends = fwupd-efi
-	depends = gcab
 	depends = gcc-libs
 	depends = glib2
 	depends = glibc
@@ -89,7 +82,6 @@ pkgname = fwupd
 	depends = libmbim
 	depends = libmm-glib
 	depends = libqmi
-	depends = libsmbios
 	depends = libxmlb
 	depends = passim
 	depends = polkit
diff --git a/extra/fwupd/PKGBUILD b/extra/fwupd/PKGBUILD
index 2625f1524..8e024c34a 100644
--- a/extra/fwupd/PKGBUILD
+++ b/extra/fwupd/PKGBUILD
@@ -4,11 +4,12 @@
 # Contributor: Mirco Tischler <mt-ml at gmx dot de>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - remove depends on libsmbios, efivar, fwupd-efi, tmp2-tss
-#  - remove makedepends on valgrind, gnu-efi-libs
-#  - meson with -Dplugin_uefi_capsule=disabled -Dplugin_uefi_pk=disabled -Dplugin_redfish=disabled -Dplugin_nvme=disabled (efivar, gnu-efi-libs dependency)
+#  - remove depends on fwupd-efi, tmp2-tss
+#  - remove makedepends on valgrind, gnu-efi-libs, libdrm (amdgpu dependency)
+#  - meson with -Dplugin_uefi_capsule=disabled -Dplugin_uefi_pk=disabled -Dplugin_redfish=disabled -Dplugin_nvme=disabled (gnu-efi-libs dependency)
 #  - meson with -Dplugin_msr=disabled
 #  - meson with -Dplugin_intel_spi=false
+#  - meson with -Dplugin_amdgpu=disabled
 #  - remove makedepend on pandoc, meson with -Dman=false
 
 pkgbase=fwupd
@@ -16,8 +17,8 @@ pkgname=(
   fwupd
   fwupd-docs
 )
-pkgver=1.9.18
-pkgrel=2
+pkgver=1.9.19
+pkgrel=1
 pkgdesc="Simple daemon to allow session software to update firmware"
 arch=(x86_64)
 url='https://github.com/fwupd/fwupd'
@@ -27,7 +28,6 @@ depends=(
   bluez
   curl
   flashrom
-  gcab
   gcc-libs
   glib2
   glibc
@@ -70,26 +70,15 @@ checkdepends=(umockdev)
 source=(
   "https://github.com/fwupd/fwupd/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}
   fwupd.sysusers
-  more-allow-syscall-fixes.patch::https://github.com/fwupd/fwupd/pull/7171.patch
 )
-sha512sums=('d5e0f3a8c741240f389628e2ed81f1e6ec21689bdcd39f692222114a2d495925a0f0720b10fbb0087362c0b734f4f0abfd8e105eff4695e41e645395e5587a50'
+sha512sums=('e20f16aa2cf528ecc6262a5c343287aef64fb37667f8d3972daa70f96364041daa0b23149acbd20cbeff059f6428c6c2a317973bc1dd40a39e239350b0eb011e'
             'SKIP'
-            '637203080b55eda74a659f58c853a9a723a2dad5da70915b2b0e036c6145a649468ebec700cc83975d9cb5378b9dced8b3a3b26bdbcc75ddc774837355e75deb'
-            '2d7066874f93406f033da6ec0cff89ef15d4026892c501f22721ff6991fc338d6f7fdbdff648978f7e762b4f7375679a417f78911196060e5efeba973d700e32')
-b2sums=('7dd1691e2db600085a61a545961730a14d74e3f8b3a66fd90092658e19336a8e11861202db063d64c936cac9ab12ebf7dcdd3a8dcd7ff01b05f0a860d8b4ba68'
+            '637203080b55eda74a659f58c853a9a723a2dad5da70915b2b0e036c6145a649468ebec700cc83975d9cb5378b9dced8b3a3b26bdbcc75ddc774837355e75deb')
+b2sums=('7e092c0ba2b094fb2041121b7b04b5a5914e85f05213cca4eafeb1826a8291bf733d1b7f8738d35b4a336a0d2d1c0d42582d21831873fae8c7884dbf5d592ee4'
         'SKIP'
-        'e65ca7da22a20a40882cfc1fe4479643f9a38c90a4f2c3e71e6e5e3de1d6db212a0f17d600097619fe3cdb0a9b860422f8b0b9a9d45441518e51a7eb12a918bb'
-        '57213d3142f0d04ce8243f0c9292fe3c139c06c3740059ff9d12fcba6964d58cf9a2b5fbcd226e117707ad101f69be80fccfc7de94d5a67e3b7d8e4c6a5b4909')
+        'e65ca7da22a20a40882cfc1fe4479643f9a38c90a4f2c3e71e6e5e3de1d6db212a0f17d600097619fe3cdb0a9b860422f8b0b9a9d45441518e51a7eb12a918bb')
 validpgpkeys=(163EB50119225DB3DF8F49EA17ACBA8DFA970E17) # Richard Hughes <richard@hughsie.com>
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  # Unbreak syscall filtering check
-  # https://github.com/fwupd/fwupd/pull/7171
-  patch -Np1 -i ../more-allow-syscall-fixes.patch
-}
-
 build() {
   local meson_options=(
     -D docs=enabled