[PR PATCH] fwupd: update to 1.5.8.

[PR PATCH] fwupd: update to 1.5.8.

[ericonr]

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

There is a new 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/29857

fwupd: update to 1.5.8.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From a57015fcc1d37c51c02f4a5cb6a8f4f8d37c32d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 29 Mar 2021 14:55:23 -0300
Subject: [PATCH] fwupd: update to 1.5.8.

---
 srcpkgs/fwupd/patches/musl.patch | 52 ++++++++++++++++++++++++++++++++
 srcpkgs/fwupd/template           |  5 +--
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
new file mode 100644
index 000000000000..70c7b0cf98ee
--- /dev/null
+++ b/srcpkgs/fwupd/patches/musl.patch
@@ -0,0 +1,52 @@
+commit 89704c42dbf6cc9fe035ca008f093aeaaebceb7f
+Author: Érico Nogueira <erico.erc@gmail.com>
+Date:   Mon Mar 29 14:45:20 2021 -0300
+
+    Fix build on musl.
+    
+    malloc_trim isn't a linux function, it's a GNU extension to malloc.  We
+    can check for it in meson.build, which avoids hardcoding platform
+    knowledge.
+
+diff --git a/meson.build b/meson.build
+index 86e70573..e870f7b6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -309,6 +309,12 @@ endif
+ if cc.has_header('fnmatch.h')
+   conf.set('HAVE_FNMATCH_H', '1')
+ endif
++if cc.has_header('malloc.h')
++  conf.set('HAVE_MALLOC_H', '1')
++  if cc.has_function('malloc_trim', prefix: '#include <malloc.h>')
++	 conf.set('HAVE_MALLOC_TRIM', '1')
++  endif
++endif
+ if cc.has_header('cpuid.h') and cc.has_header_symbol('cpuid.h', '__get_cpuid_count') and (host_cpu == 'x86' or host_cpu == 'x86_64')
+   conf.set('HAVE_CPUID_H', '1')
+ else
+diff --git a/src/fu-main.c b/src/fu-main.c
+index b7afde98..5f5de334 100644
+--- a/src/fu-main.c
++++ b/src/fu-main.c
+@@ -14,7 +14,9 @@
+ #include <glib/gi18n.h>
+ #include <glib-unix.h>
+ #include <locale.h>
++#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
++#endif
+ #ifdef HAVE_POLKIT
+ #include <polkit/polkit.h>
+ #endif
+@@ -2037,8 +2039,10 @@ main (int argc, char *argv[])
+ 	else if (timed_exit)
+ 		g_timeout_add_seconds (5, fu_main_timed_exit_cb, priv->loop);
+ 
++#ifdef HAVE_MALLOC_TRIM
+ 	/* drop heap except one page */
+ 	malloc_trim (4096);
++#endif
+ 
+ 	/* wait */
+ 	g_message ("Daemon ready for requests (locale %s)", g_getenv ("LANG"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index a2b66a212af4..b0828273d2f0 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.5.5
+version=1.5.8
 revision=1
 build_style=meson
 build_helper="gir"
@@ -27,8 +27,9 @@ 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=1a6d5026ae37708718b7c0bb277050c96934acb636605f1c0295eba8ff627ea3
+checksum=4abecf930f02fc5b165831682f3915cc7f0e82e73be2e187e761220ae275a1a3
 replaces="fwupdate>=0"
+patch_args=-Np1
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*)

Re: [PR PATCH] [Updated] fwupd: update to 1.5.8.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1588 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/29857

fwupd: update to 1.5.8.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 570b99ac0d62d75157b3aa243cbe9c1f4cbc0e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 29 Mar 2021 14:55:23 -0300
Subject: [PATCH] fwupd: update to 1.5.8.

---
 srcpkgs/fwupd/patches/musl.patch | 44 ++++++++++++++++++++++++++++++++
 srcpkgs/fwupd/template           |  5 ++--
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
new file mode 100644
index 000000000000..fd7dfb19308b
--- /dev/null
+++ b/srcpkgs/fwupd/patches/musl.patch
@@ -0,0 +1,44 @@
+Upstream: https://github.com/fwupd/fwupd/pull/3080
+
+diff --git a/meson.build b/meson.build
+index 86e70573..e870f7b6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -309,6 +309,12 @@ endif
+ if cc.has_header('fnmatch.h')
+   conf.set('HAVE_FNMATCH_H', '1')
+ endif
++if cc.has_header('malloc.h')
++  conf.set('HAVE_MALLOC_H', '1')
++  if cc.has_function('malloc_trim', prefix: '#include <malloc.h>')
++	 conf.set('HAVE_MALLOC_TRIM', '1')
++  endif
++endif
+ if cc.has_header('cpuid.h') and cc.has_header_symbol('cpuid.h', '__get_cpuid_count') and (host_cpu == 'x86' or host_cpu == 'x86_64')
+   conf.set('HAVE_CPUID_H', '1')
+ else
+diff --git a/src/fu-main.c b/src/fu-main.c
+index b7afde98..5f5de334 100644
+--- a/src/fu-main.c
++++ b/src/fu-main.c
+@@ -14,7 +14,9 @@
+ #include <glib/gi18n.h>
+ #include <glib-unix.h>
+ #include <locale.h>
++#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
++#endif
+ #ifdef HAVE_POLKIT
+ #include <polkit/polkit.h>
+ #endif
+@@ -2037,8 +2039,10 @@ main (int argc, char *argv[])
+ 	else if (timed_exit)
+ 		g_timeout_add_seconds (5, fu_main_timed_exit_cb, priv->loop);
+ 
++#ifdef HAVE_MALLOC_TRIM
+ 	/* drop heap except one page */
+ 	malloc_trim (4096);
++#endif
+ 
+ 	/* wait */
+ 	g_message ("Daemon ready for requests (locale %s)", g_getenv ("LANG"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index a2b66a212af4..b0828273d2f0 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.5.5
+version=1.5.8
 revision=1
 build_style=meson
 build_helper="gir"
@@ -27,8 +27,9 @@ 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=1a6d5026ae37708718b7c0bb277050c96934acb636605f1c0295eba8ff627ea3
+checksum=4abecf930f02fc5b165831682f3915cc7f0e82e73be2e187e761220ae275a1a3
 replaces="fwupdate>=0"
+patch_args=-Np1
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*)

Re: fwupd: update to 1.5.8.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29857#issuecomment-809642500

Comment:
Tentatively waiting on https://github.com/fwupd/fwupd/issues/3081

Re: [PR PATCH] [Merged]: fwupd: update to 1.5.8.

[ericonr]

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

There's a merged pull request on the void-packages repository

fwupd: update to 1.5.8.
https://github.com/void-linux/void-packages/pull/29857

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->