fwupd: update to 1.6.3

2021-05-26 18:00:16 +02:00 · 2021-05-26 18:00:16 +02:00 · f73fe219d1
commit f73fe219d1
parent fe85fb0cb6
5 changed files with 150 additions and 72 deletions
--- a/srcpkgs/fwupd/patches/fu-hash.patch
+++ b/srcpkgs/fwupd/patches/fu-hash.patch
@ -0,0 +1,21 @@
+From 22e9a074158a9eeeccc89e87a6aa941cbb743f58 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <superm1@gmail.com>
+Date: Sun, 22 Aug 2021 14:20:13 -0500
+Subject: [PATCH] trivial: fix a compilation dependency error (Fixes: #3657)
+
+---
+ plugins/tpm-eventlog/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/tpm-eventlog/meson.build b/plugins/tpm-eventlog/meson.build
+index 3f72576f68..8fae3843d2 100644
+--- a/plugins/tpm-eventlog/meson.build
+++ b/plugins/tpm-eventlog/meson.build
+@@ -60,6 +60,7 @@ endif
+ 
+ fwupdtpmevlog = executable(
+   'fwupdtpmevlog',
+  fu_hash,
+   sources : [
+     'fu-tpm-eventlog.c',
+     'fu-tpm-eventlog-common.c',
--- a/srcpkgs/fwupd/patches/gicross.patch
+++ b/srcpkgs/fwupd/patches/gicross.patch
@ -0,0 +1,21 @@
+From ae4fdeb44a4d7e3a668ce73778c65c3e37879090 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 23 Aug 2021 19:21:58 +0200
+Subject: [PATCH] trivial: make gi-docgen a host dependency on cross
+
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index bcd4cbf4d..c5f2f292a 100644
+--- a/meson.build
+++ b/meson.build
+@@ -555,6 +555,7 @@ elif get_option('docs') == 'docgen'
+   endif
+   gidocgen_dep = dependency('gi-docgen',
+     version: '>= 2021.1',
+    native: true,
+     fallback: ['gi-docgen', 'dummy_dep'],
+   )
+   gidocgen = find_program('gi-docgen')
--- a/srcpkgs/fwupd/patches/gidocgen.patch
+++ b/srcpkgs/fwupd/patches/gidocgen.patch
@ -0,0 +1,95 @@
+Fromm 19e56baf48441e023e766a1b2b5b3d65f9221c6f Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@amd.com>
+Date: Tue, 7 Sep 2021 15:08:01 -0500
+Subject: [PATCH] trivial: create urlmap for each gi-docgen target rather than
+ sharing
+
+---
+ docs/fwupd.toml.in         | 2 +-
+ docs/fwupdplugin.toml.in   | 2 +-
+ docs/meson.build           | 7 +++++--
+ docs/urlmap.js             | 5 -----
+ docs/urlmap_fwupd.js       | 4 ++++
+ docs/urlmap_fwupdplugin.js | 5 +++++
+ 6 files changed, 16 insertions(+), 9 deletions(-)
+ delete mode 100644 docs/urlmap.js
+ create mode 100644 docs/urlmap_fwupd.js
+ create mode 100644 docs/urlmap_fwupdplugin.js
+
+diff --git a/docs/fwupd.toml.in b/docs/fwupd.toml.in
+index 1b7a5e22ad..2b16758834 100644
+--- a/docs/fwupd.toml.in
+++ b/docs/fwupd.toml.in
+@@ -42,7 +42,7 @@ base_url = "https://github.com/fwupd/fwupd/blob/@version@/"
+ content_images = [
+   "../data/org.freedesktop.fwupd.svg",
+ ]
+-urlmap_file = "../urlmap.js"
+urlmap_file = "urlmap_fwupd.js"
+ 
+ [[object]]
+ name = "build_user_agent_system"
+diff --git a/docs/fwupdplugin.toml.in b/docs/fwupdplugin.toml.in
+index 17445b49d0..cb4065118a 100644
+--- a/docs/fwupdplugin.toml.in
+++ b/docs/fwupdplugin.toml.in
+@@ -49,7 +49,7 @@ content_images = [
+   "architecture-plan.svg",
+   "../data/org.freedesktop.fwupd.svg",
+ ]
+-urlmap_file = "../urlmap.js"
+urlmap_file = "urlmap_fwupdplugin.js"
+ 
+ [[object]]
+ name = "Device"
+diff --git a/docs/meson.build b/docs/meson.build
+index 1b4c6cdbbe..a88ff6d805 100644
+--- a/docs/meson.build
+++ b/docs/meson.build
+@@ -72,8 +72,11 @@ if get_option('docs') == 'docgen'
+  install_data(['index.html'],
+     install_dir : join_paths(datadir, 'doc', 'fwupd')
+   )
+- install_data(['urlmap.js'],
+-    install_dir : join_paths(datadir, 'doc', 'fwupd')
+ install_data(['urlmap_fwupd.js'],
+    install_dir : join_paths(datadir, 'doc', 'fwupd', 'libfwupd')
+  )
+ install_data(['urlmap_fwupdplugin.js'],
+    install_dir : join_paths(datadir, 'doc', 'fwupd', 'libfwupdplugin')
+   )
+ 
+ elif get_option('docs') == 'gtkdoc'
+diff --git a/docs/urlmap.js b/docs/urlmap.js
+deleted file mode 100644
+index 0ccc9a6d56..0000000000
+--- a/docs/urlmap.js
+++ /dev/null
+@@ -1,5 +0,0 @@
+-baseURLs = [
+-    [ 'Gio', 'https://people.gnome.org/~ebassi/docs/_build/Gio/' ],
+-    [ 'GObject', 'https://people.gnome.org/~ebassi/docs/_build/GObject/' ],
+-    [ 'Fwupd', '../libfwupd/' ],
+-]
+diff --git a/docs/urlmap_fwupd.js b/docs/urlmap_fwupd.js
+new file mode 100644
+index 0000000000..7e7f2cb321
+--- /dev/null
+++ b/docs/urlmap_fwupd.js
+@@ -0,0 +1,4 @@
+baseURLs = [
+	[ 'Gio', 'https://people.gnome.org/~ebassi/docs/_build/Gio/' ],
+	[ 'GObject', 'https://people.gnome.org/~ebassi/docs/_build/GObject/' ],
+]
+diff --git a/docs/urlmap_fwupdplugin.js b/docs/urlmap_fwupdplugin.js
+new file mode 100644
+index 0000000000..a41bcdb879
+--- /dev/null
+++ b/docs/urlmap_fwupdplugin.js
+@@ -0,0 +1,5 @@
+baseURLs = [
+	[ 'Gio', 'https://people.gnome.org/~ebassi/docs/_build/Gio/' ],
+	[ 'GObject', 'https://people.gnome.org/~ebassi/docs/_build/GObject/' ],
+	[ 'Fwupd', '../libfwupd/' ],
+]
+
--- a/srcpkgs/fwupd/patches/musl.patch
+++ b/srcpkgs/fwupd/patches/musl.patch
@ -1,44 +0,0 @@
-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"));
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@ -1,19 +1,14 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.5.8
+version=1.6.3
 revision=1
 build_style=meson
 build_helper="gir"
 # tests require unpackaged umockdev
-configure_args="-Dsupported_build=true
- -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}/bin/ld
- -Defi-objcopy=${XBPS_CROSS_BASE}/bin/objcopy
- -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib -Delogind=true"
-hostmakedepends="dejavu-fonts-ttf gnutls-tools help2man pkg-config gcab
- vala glib-devel polkit gettext gtk-doc pango python3-gobject python3-Pillow"
+configure_args="-Dsupported_build=true -Dconsolekit=false -Dintrospection=true
+ -Dsystemd=false -Dplugin_altos=false -Delogind=true -Dtests=false"
+hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen
+ vala glib-devel polkit gettext pango python3-gobject python3-Pillow"
 makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel
 gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel
 sqlite-devel libsoup-devel gcab-devel pango-devel elogind-devel
@ -27,7 +22,7 @@ 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=4abecf930f02fc5b165831682f3915cc7f0e82e73be2e187e761220ae275a1a3
+checksum=f889e96c006f55df185e07faf5257b4ae93a5a8ed5cecb1afbab79807f8918e5
 replaces="fwupdate>=0"

 case "$XBPS_TARGET_MACHINE" in
@ -51,26 +46,16 @@ else
 fi

 if [ -n "$_have_uefi" ]; then
-	hostmakedepends+=" efivar"
-	makedepends+=" libefivar-devel gnu-efi-libs"
+	makedepends+=" libefivar-devel fwupd-efi"
+	depends+=" fwupd-efi"
 else
 	configure_args+=" -Dplugin_redfish=false -Dplugin_uefi_capsule=false -Dplugin_uefi_pk=false"
 fi

-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
-
-	configure_args+=" -Dman=false"
-	# steal man pages from native package
-	hostmakedepends+=" fwupd"
-fi
-
-post_install() {
-	if [ "$CROSS_BUILD" ]; then
-		for _page in dbxtool dfu-tool fwupdagent fwupdate fwupdmgr fwupdtool fwupdtpmevlog
-		do
-			vman /usr/share/man/man1/$_page.1
-		done
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
 	fi
 }

@ -83,6 +68,6 @@ fwupd-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
 		vmove usr/share/vala
-		vmove usr/share/gtk-doc
+		vmove usr/share/doc
 	}
 }