fwupd: update to 1.5.8.

This commit is contained in:
Érico Nogueira 2021-03-29 14:55:23 -03:00 committed by Érico Nogueira Rolim
parent b3b42d6317
commit 375f003566
2 changed files with 47 additions and 2 deletions

View file

@ -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"));

View file

@ -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*)