From 6b02ffc8603d20a641cfbe71b997b9faeb0bbceb Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 5 Aug 2024 17:56:35 +0000
Subject: [PATCH] extra/fwupd to 1.9.23-1

---
 extra/fwupd/.SRCINFO | 15 ++++++---------
 extra/fwupd/PKGBUILD | 20 ++++++--------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/extra/fwupd/.SRCINFO b/extra/fwupd/.SRCINFO
index 0ac63a219..7c8d61fd3 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.22
-	pkgrel = 2
+	pkgver = 1.9.23
+	pkgrel = 1
 	url = https://github.com/fwupd/fwupd
 	arch = x86_64
 	license = LGPL-2.1-or-later
@@ -51,19 +51,16 @@ pkgbase = fwupd
 	depends = tpm2-tss
 	depends = xz
 	depends = zlib
-	source = https://github.com/fwupd/fwupd/releases/download/1.9.22/fwupd-1.9.22.tar.xz
-	source = https://github.com/fwupd/fwupd/releases/download/1.9.22/fwupd-1.9.22.tar.xz.asc
+	source = https://github.com/fwupd/fwupd/releases/download/1.9.23/fwupd-1.9.23.tar.xz
+	source = https://github.com/fwupd/fwupd/releases/download/1.9.23/fwupd-1.9.23.tar.xz.asc
 	source = fwupd.sysusers
-	source = https://github.com/fwupd/fwupd/pull/7553.patch
 	validpgpkeys = 163EB50119225DB3DF8F49EA17ACBA8DFA970E17
-	sha512sums = 8141431ce04a9d141868c9a9137ec749d1b8fd754abafc5b1959ca8205e739e2c66bd967db054de3d9cd750081922a8ed51fc4831d6bd295fcc13d8781a5d8ab
+	sha512sums = 379adcc79d40795f4895749bc944689ffee6fadc7c3dd1974df98c15120ca47d020ad4efabc68d0371cb36ebd3b549698c05a81bee0a673745a867bb32c4eeb5
 	sha512sums = SKIP
 	sha512sums = 637203080b55eda74a659f58c853a9a723a2dad5da70915b2b0e036c6145a649468ebec700cc83975d9cb5378b9dced8b3a3b26bdbcc75ddc774837355e75deb
-	sha512sums = 5869660de4b6af70aa873b962ccff8e9da8a314d37993f548bf16f0b7a09cd34c0d78d048f35b854a0e7450e62dc4f08ed63c89d3a633a227ae31ed7609efe94
-	b2sums = 434fa15718206caf9ab08474459df136e7e2a8f7dfed99240ac07f54fd2e4d042bab7009a05db9485460740956f8cf8971e216812cf710799921d3ce3103dd0b
+	b2sums = d084244f99b5edccf4bf6a783846623876e9b4344c05bfe3cd412235bcde63d1f36db5528572e371fd0bde27f72c2bd61ba7b6472504ade4c9a068a00e34ca4e
 	b2sums = SKIP
 	b2sums = e65ca7da22a20a40882cfc1fe4479643f9a38c90a4f2c3e71e6e5e3de1d6db212a0f17d600097619fe3cdb0a9b860422f8b0b9a9d45441518e51a7eb12a918bb
-	b2sums = aaf2a8368159d7272ca262dd5aa4d8d195c0c15203e532e3333f7f518fccdac1d0e84ab7945af3ef10f12303a8ba54c649a7284592de3baac90f4ae1172b6e06
 
 pkgname = fwupd
 	depends = bash
diff --git a/extra/fwupd/PKGBUILD b/extra/fwupd/PKGBUILD
index 89e6fa91d..9746de73f 100644
--- a/extra/fwupd/PKGBUILD
+++ b/extra/fwupd/PKGBUILD
@@ -18,8 +18,8 @@ pkgname=(
   fwupd
   fwupd-docs
 )
-pkgver=1.9.22
-pkgrel=2
+pkgver=1.9.23
+pkgrel=1
 pkgdesc="Simple daemon to allow session software to update firmware"
 arch=(x86_64)
 url='https://github.com/fwupd/fwupd'
@@ -71,23 +71,15 @@ checkdepends=(umockdev)
 source=(
   "https://github.com/fwupd/fwupd/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}
   fwupd.sysusers
-  https://github.com/fwupd/fwupd/pull/7553.patch
 )
-sha512sums=('8141431ce04a9d141868c9a9137ec749d1b8fd754abafc5b1959ca8205e739e2c66bd967db054de3d9cd750081922a8ed51fc4831d6bd295fcc13d8781a5d8ab'
+sha512sums=('379adcc79d40795f4895749bc944689ffee6fadc7c3dd1974df98c15120ca47d020ad4efabc68d0371cb36ebd3b549698c05a81bee0a673745a867bb32c4eeb5'
             'SKIP'
-            '637203080b55eda74a659f58c853a9a723a2dad5da70915b2b0e036c6145a649468ebec700cc83975d9cb5378b9dced8b3a3b26bdbcc75ddc774837355e75deb'
-            '5869660de4b6af70aa873b962ccff8e9da8a314d37993f548bf16f0b7a09cd34c0d78d048f35b854a0e7450e62dc4f08ed63c89d3a633a227ae31ed7609efe94')
-b2sums=('434fa15718206caf9ab08474459df136e7e2a8f7dfed99240ac07f54fd2e4d042bab7009a05db9485460740956f8cf8971e216812cf710799921d3ce3103dd0b'
+            '637203080b55eda74a659f58c853a9a723a2dad5da70915b2b0e036c6145a649468ebec700cc83975d9cb5378b9dced8b3a3b26bdbcc75ddc774837355e75deb')
+b2sums=('d084244f99b5edccf4bf6a783846623876e9b4344c05bfe3cd412235bcde63d1f36db5528572e371fd0bde27f72c2bd61ba7b6472504ade4c9a068a00e34ca4e'
         'SKIP'
-        'e65ca7da22a20a40882cfc1fe4479643f9a38c90a4f2c3e71e6e5e3de1d6db212a0f17d600097619fe3cdb0a9b860422f8b0b9a9d45441518e51a7eb12a918bb'
-        'aaf2a8368159d7272ca262dd5aa4d8d195c0c15203e532e3333f7f518fccdac1d0e84ab7945af3ef10f12303a8ba54c649a7284592de3baac90f4ae1172b6e06')
+        'e65ca7da22a20a40882cfc1fe4479643f9a38c90a4f2c3e71e6e5e3de1d6db212a0f17d600097619fe3cdb0a9b860422f8b0b9a9d45441518e51a7eb12a918bb')
 validpgpkeys=(163EB50119225DB3DF8F49EA17ACBA8DFA970E17) # Richard Hughes <richard@hughsie.com>
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 < ../7553.patch
-}
-
 build() {
   local meson_options=(
     -D docs=enabled