fwupd: update to 1.6.4.
This commit is contained in:
Érico Nogueira
parent
b57de8c288
commit
bc63f42148
4 changed files with 2 additions and 139 deletions
|
|
@ -1,21 +0,0 @@
|
|||
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',
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
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')
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
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/' ],
|
||||
+]
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'fwupd'
|
||||
pkgname=fwupd
|
||||
version=1.6.3
|
||||
version=1.6.4
|
||||
revision=1
|
||||
build_style=meson
|
||||
build_helper="gir"
|
||||
|
|
@ -22,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=f889e96c006f55df185e07faf5257b4ae93a5a8ed5cecb1afbab79807f8918e5
|
||||
checksum=4bbbc47a3bdbae197a7071ceba56cdf5cc79da51ad895c2303c652dd41b019fe
|
||||
replaces="fwupdate>=0"
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
|
|
|
|||
Loading…
Reference in a new issue