From 7eec83e9064d53911f5e2dc6f146f39777ecad7e Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 18 Nov 2023 17:06:51 +0000
Subject: [PATCH] extra/fwupd to 1.9.8-3

---
 extra/fwupd/.SRCINFO | 23 +++++++++++---------
 extra/fwupd/PKGBUILD | 52 +++++++++++++++++++++++++++++---------------
 2 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/extra/fwupd/.SRCINFO b/extra/fwupd/.SRCINFO
index 24f1db147..912b15a84 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.8
-	pkgrel = 1
+	pkgrel = 3
 	url = https://github.com/fwupd/fwupd
 	arch = x86_64
 	license = LGPL
@@ -43,15 +43,6 @@ pkgbase = fwupd
 	depends = python
 	depends = shared-mime-info
 	depends = tpm2-tss
-	optdepends = udisks2: UEFI firmware upgrade support
-	provides = libfwupd.so
-	backup = etc/fwupd/fwupd.conf
-	backup = etc/fwupd/remotes.d/dell-esrt.conf
-	backup = etc/fwupd/remotes.d/fwupd-tests.conf
-	backup = etc/fwupd/remotes.d/lvfs-testing.conf
-	backup = etc/fwupd/remotes.d/lvfs.conf
-	backup = etc/fwupd/remotes.d/vendor-directory.conf
-	backup = etc/fwupd/remotes.d/vendor.conf
 	source = https://github.com/fwupd/fwupd/releases/download/1.9.8/fwupd-1.9.8.tar.xz
 	source = https://github.com/fwupd/fwupd/releases/download/1.9.8/fwupd-1.9.8.tar.xz.asc
 	source = fwupd.sysusers
@@ -64,3 +55,15 @@ pkgbase = fwupd
 	b2sums = e65ca7da22a20a40882cfc1fe4479643f9a38c90a4f2c3e71e6e5e3de1d6db212a0f17d600097619fe3cdb0a9b860422f8b0b9a9d45441518e51a7eb12a918bb
 
 pkgname = fwupd
+	optdepends = udisks2: UEFI firmware upgrade support
+	provides = libfwupd.so
+	backup = etc/fwupd/fwupd.conf
+	backup = etc/fwupd/remotes.d/fwupd-tests.conf
+	backup = etc/fwupd/remotes.d/lvfs-testing.conf
+	backup = etc/fwupd/remotes.d/lvfs.conf
+	backup = etc/fwupd/remotes.d/vendor-directory.conf
+	backup = etc/fwupd/remotes.d/vendor.conf
+
+pkgname = fwupd-docs
+	pkgdesc = Simple daemon to allow session software to update firmware - documentation
+	depends = 
diff --git a/extra/fwupd/PKGBUILD b/extra/fwupd/PKGBUILD
index 9d67ed9b4..6daed35f4 100644
--- a/extra/fwupd/PKGBUILD
+++ b/extra/fwupd/PKGBUILD
@@ -11,12 +11,12 @@
 #  - meson with -Dplugin_intel_spi=false
 #  - remove makedepend on pandoc, meson with -Dman=false
 
-pkgname=fwupd
+pkgname=(fwupd fwupd-docs)
 pkgver=1.9.8
-pkgrel=1
+pkgrel=3
 pkgdesc="Simple daemon to allow session software to update firmware"
 arch=(x86_64)
-url="https://github.com/fwupd/fwupd"
+url='https://github.com/fwupd/fwupd'
 license=(LGPL)
 depends=(
   bluez
@@ -40,9 +40,6 @@ depends=(
   python
   shared-mime-info
 )
-optdepends=(
-  'udisks2: UEFI firmware upgrade support'
-)
 makedepends=(
   bash-completion
   gi-docgen
@@ -56,16 +53,6 @@ makedepends=(
   vala
 )
 checkdepends=(umockdev)
-provides=(libfwupd.so)
-backup=(
-  'etc/fwupd/fwupd.conf'
-  'etc/fwupd/remotes.d/dell-esrt.conf'
-  'etc/fwupd/remotes.d/fwupd-tests.conf'
-  'etc/fwupd/remotes.d/lvfs-testing.conf'
-  'etc/fwupd/remotes.d/lvfs.conf'
-  'etc/fwupd/remotes.d/vendor-directory.conf'
-  'etc/fwupd/remotes.d/vendor.conf'
-)
 source=(
   "https://github.com/fwupd/fwupd/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}
   fwupd.sysusers
@@ -96,7 +83,30 @@ check() {
   meson test -C build
 }
 
-package() {
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
+package_fwupd() {
+  optdepends=(
+    'udisks2: UEFI firmware upgrade support'
+  )
+  provides=(libfwupd.so)
+  backup=(
+    'etc/fwupd/fwupd.conf'
+    'etc/fwupd/remotes.d/fwupd-tests.conf'
+    'etc/fwupd/remotes.d/lvfs-testing.conf'
+    'etc/fwupd/remotes.d/lvfs.conf'
+    'etc/fwupd/remotes.d/vendor-directory.conf'
+    'etc/fwupd/remotes.d/vendor.conf'
+  )
+
   DESTDIR="${pkgdir}" meson install -C build
   # Add fwupd user https://bugs.archlinux.org/task/79653
   install -D -m644 fwupd.sysusers "${pkgdir}"/usr/lib/sysusers.d/fwupd.conf
@@ -109,4 +119,12 @@ package() {
   # Remove msr module-load config as it is built-in
   #rm "${pkgdir}"/usr/lib/modules-load.d/fwupd-msr.conf
   #rmdir "${pkgdir}"/usr/lib/modules-load.d
+
+  _pick docs "${pkgdir}"/usr/share/doc/{,fwupd/}{libfwupdplugin,libfwupd}
+}
+
+package_fwupd-docs() {
+  pkgdesc="Simple daemon to allow session software to update firmware - documentation"
+  depends=()
+  mv docs/* "${pkgdir}"
 }