From 6b6fb0e8fa99a2ceddc691466801cbfaf38caee3 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 22 Jun 2021 20:26:05 +0000
Subject: [PATCH] community/fwupd to 1.6.1-2

---
 community/fwupd/PKGBUILD | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/community/fwupd/PKGBUILD b/community/fwupd/PKGBUILD
index 5bee5a0e2..e15dd99b0 100644
--- a/community/fwupd/PKGBUILD
+++ b/community/fwupd/PKGBUILD
@@ -1,33 +1,37 @@
 # Maintainer: Bruno Pagani <archange@archlinux.org>
+# Maintainer: Filipe Laíns (FFY00) <lains@archlinux.org>
+# Maintainer: Frederik Schwan <freswa at archlinux dot org>
 # Contributor: Mirco Tischler <mt-ml at gmx dot de>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - remove depends on libsmbios, efivar
+#  - remove depends on libsmbios, efivar, fwupd-efi
 #  - remove makedepends on valgrind, gnu-efi-libs, tpm2-tss
 #  - meson with -Dplugin_dell=false (smbios dependency)
 #  - meson with -Dplugin_uefi_capsule=false -Dplugin_uefi_pk=false -Dplugin_redfish=false -Dplugin_nvme=false (efivar, gnu-efi-libs dependency)
-#  - meson with -Dplugin_tpm=false (tpm2-tss dependency)
 #  - meson with -Dplugin_msr=false
+#  - meson with -Dplugin_intel_spi=false
 
 pkgname=fwupd
-pkgver=1.6.0
-pkgrel=3
+pkgver=1.6.1
+pkgrel=2
 pkgdesc="Simple daemon to allow session software to update firmware"
 arch=(x86_64)
 url="https://github.com/fwupd/fwupd"
 license=(LGPL)
 depends=(libxmlb python libgusb
-         libsoup json-glib gcab libarchive gpgme
-         libgudev polkit shared-mime-info
-         flashrom libjcat)
+         polkit shared-mime-info tpm2-tss flashrom
+         libjcat gcab
+         libarchive.so libcurl.so libgpgme.so
+         libjson-glib-1.0.so libgudev-1.0.so libmm-glib.so
+         libqmi-glib.so)
 optdepends=(
-    'modemmanager: modem firmware upgrade support'
     'udisks2: UEFI firmware upgrade support'
 )
 makedepends=(meson gobject-introspection gtk-doc
              python-cairo noto-fonts noto-fonts-cjk python-gobject vala
              bash-completion python-pillow help2man)
 checkdepends=(umockdev)
+provides=(libfwupd.so)
 backup=('etc/fwupd/daemon.conf'
         'etc/fwupd/redfish.conf'
         'etc/fwupd/remotes.d/dell-esrt.conf'
@@ -39,21 +43,18 @@ backup=('etc/fwupd/daemon.conf'
         'etc/fwupd/thunderbolt.conf'
         'etc/fwupd/uefi_capsule.conf'
         'etc/fwupd/upower.conf')
-source=("https://people.freedesktop.org/~hughsient/releases/${pkgname}-${pkgver}.tar.xz"{,.asc}
-        "fix-efi.patch::$url/commit/197d3dc3b9acb93be30c4a7f49e8c0ad3f554818.patch")
-sha256sums=('c4d9c5a870a60517470f7c4d2ae339eccb77bbca5b474c483984d0d4ece33f5e'
-            'SKIP'
-            'bc166b15607992362723341932cca193cb13c85e84300d42246e7e54a8041aa3')
+source=("https://people.freedesktop.org/~hughsient/releases/${pkgname}-${pkgver}.tar.xz"{,.asc})
+sha256sums=('e75735cd75815a5b371c0db415bece28db555974bfa42f114bd45d8e529ecc47'
+            'SKIP')
 validpgpkeys=(163EB50119225DB3DF8F49EA17ACBA8DFA970E17) # Richard Hughes <richard@hughsie.com>
 
-prepare() {
-    cd ${pkgname}-${pkgver}
-    patch -p1 -i ../fix-efi.patch
-}
-
 build() {
     arch-meson ${pkgname}-${pkgver} build \
         -D b_lto=false \
+        -D plugin_modem_manager=true \
+        -D plugin_intel_spi=false \
+        -D lzma=true \
+        -D docs=gtkdoc \
         -D plugin_flashrom=true \
         -D supported_build=true \
         -D efi_sbat_distro_id='arch' \
@@ -61,7 +62,7 @@ build() {
         -D efi_sbat_distro_pkgname=${pkgname} \
         -D efi_sbat_distro_version=${pkgver} \
         -D efi_sbat_distro_url="https://archlinux.org/packages/community/x86_64/${pkgname}/" \
-        -Dplugin_dell=false -Dplugin_uefi_capsule=false -Dplugin_uefi_pk=false -Dplugin_redfish=false -Dplugin_nvme=false -Dplugin_tpm=false -Dplugin_msr=false
+        -Dplugin_dell=false -Dplugin_uefi_capsule=false -Dplugin_uefi_pk=false -Dplugin_redfish=false -Dplugin_nvme=false -Dplugin_msr=false
     meson compile -C build
 }