Re: [PR PATCH] [Updated] Update fwupd to 1.5.0

[ericonr <ericonr@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages fwupd
https://github.com/void-linux/void-packages/pull/25982

Update fwupd to 1.5.0


A patch file from https://github.com/void-linux/void-packages/pull/25982.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fwupd-25982.patch --]
[-- Type: text/x-diff, Size: 3611 bytes --]

From a3f82810a8aeb040e076289c9544e02dffa1801d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 30 Oct 2020 09:17:36 -0300
Subject: [PATCH 1/2] libgusb: update to 0.3.5.

---
 srcpkgs/libgusb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index 16e75648a1d..a0b23823b21 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -1,6 +1,6 @@
 # Template file for 'libgusb'
 pkgname=libgusb
-version=0.3.4
+version=0.3.5
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,13 +15,13 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libgusb"
 changelog="https://raw.githubusercontent.com/hughsie/libgusb/master/NEWS"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
-checksum=581fd24e12496654b9b2a0732f810b554dfd9212516c18c23586c0cd0b382e04
+checksum=5b2a00c6997cc4b0133c5a5748a2e616e9e7504626922105b62aadced78e65df
 
 build_options="gir vala"
 build_options_default="gir vala"
 
 libgusb-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 3ab80e19e8b837b297aaa1665fb691325ef91e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 13 Oct 2020 19:37:52 -0300
Subject: [PATCH 2/2] fwupd: update to 1.5.1, add more conf files.

---
 srcpkgs/fwupd/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index b7f0cc5ea11..69ca5fe3b4d 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,7 +1,7 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.4.6
-revision=2
+version=1.5.1
+revision=1
 build_style=meson
 build_helper="gir"
 # tests require unpackaged umockdev
@@ -9,6 +9,7 @@ configure_args="-Dconsolekit=false -Dgtkdoc=true -Dintrospection=true
  -Dsystemd=false -Dplugin_altos=false -Dtests=false
  -Dpkcs7=false -Db_lto=false -Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
  -Defi-ldsdir=${XBPS_CROSS_BASE}/usr/lib -Defi-ld=${XBPS_CROSS_BASE}/usr/bin/ld
+ -Defi-objcopy=${XBPS_CROSS_BASE}/usr/bin/objcopy
  -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib -Delogind=true
  $(vopt_bool uefi plugin_uefi) $(vopt_bool uefi plugin_redfish)
  $(vopt_bool dell plugin_dell)"
@@ -21,14 +22,14 @@ makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel
  $(vopt_if uefi 'libefivar-devel gnu-efi-libs') $(vopt_if dell libsmbios-devel)"
 depends="udisks2"
 conf_files="
- /etc/fwupd/daemon.conf
+ /etc/fwupd/*.conf
  /etc/fwupd/remotes.d/*.conf"
 short_desc="Daemon to allow session software to update firmware"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/fwupd"
 distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz"
-checksum=2e70a4221e6ca09dae768af25f19fddcdbdafb9f7d7984d19e8686846fa4420a
+checksum=16e59ea1ce6e109246f86a2932cc84d2e06ed836d62dde1412493a5d26109477
 replaces="fwupdate>=0"
 
 build_options="uefi dell"
@@ -58,8 +59,6 @@ fi
 pre_configure() {
 	# Replace the values from our patch into the system itself
 	vsed -i -e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" meson.build
-	# Replace host objcopy with the cross one
-	vsed -i -e "s|command -v objcopy|command -v ${XBPS_CROSS_BASE}/usr/bin/objcopy|" plugins/uefi/efi/generate_binary.sh
 }
 
 post_install() {