Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [wip] fwupd: update to 1.6.3
@ 2021-08-22 18:20 dkwo
  2021-08-22 19:39 ` ericonr
                   ` (80 more replies)
  0 siblings, 81 replies; 82+ messages in thread
From: dkwo @ 2021-08-22 18:20 UTC (permalink / raw)
  To: ml

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

There is a new pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

[wip] fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?


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

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

From d360bf2e4efcd61fb22f52b20c4086c7d74110e1 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..0a2bb352f017
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,13 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+makedepends="gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429

From 92a26ab944a2574e43327d425b1db2867425f99f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

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

diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..7e6a9b1c234c 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.5.8
+version=1.6.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ hostmakedepends="dejavu-fonts-ttf gnutls-tools help2man pkg-config gcab
 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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi gi-docgen valgrind-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -27,7 +27,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

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [wip] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
@ 2021-08-22 19:39 ` ericonr
  2021-08-22 19:42 ` ericonr
                   ` (79 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-08-22 19:39 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-903320041

Comment:
```
=> fwupd-devel-1.6.3_1: running pkg_install ...
mv: cannot stat '/destdir//fwupd-1.6.3/usr/share/gtk-doc': No such file or directory
```

it stopped building and/or installing gtk-doc stuff, so should either fix it so it installs it, or remove the `vmove`.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [wip] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
  2021-08-22 19:39 ` ericonr
@ 2021-08-22 19:42 ` ericonr
  2021-08-23  7:35 ` [PR PATCH] [Updated] " dkwo
                   ` (78 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-08-22 19:42 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-903320367

Comment:
Also, please pick up changes from https://github.com/ericonr/void-packages/tree/fwupd

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] [wip] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
  2021-08-22 19:39 ` ericonr
  2021-08-22 19:42 ` ericonr
@ 2021-08-23  7:35 ` dkwo
  2021-08-23  8:01 ` [PR PATCH] [Updated] " dkwo
                   ` (77 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23  7:35 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

[wip] fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From 5b6454c1ee8fd72559fcecdc9e0cd764be264d50 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..bd314d6cb31d
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,17 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+makedepends="gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429

From fc71e403f8aadbd0a7754bc874eea16302275b95 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 33 ++++++----------------
 3 files changed, 30 insertions(+), 68 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..4dbf4ee846eb 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,21 @@
 # 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
+ -Dconsolekit=false -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
+ -Db_lto=false -Delogind=true"
+# -Dgtkdoc=true -Dpkcs7=false
+hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab
  vala glib-devel polkit gettext gtk-doc 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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi gi-docgen valgrind-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -26,8 +24,8 @@ 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=4abecf930f02fc5b165831682f3915cc7f0e82e73be2e187e761220ae275a1a3
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=f889e96c006f55df185e07faf5257b4ae93a5a8ed5cecb1afbab79807f8918e5
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -59,21 +57,8 @@ 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
-	fi
-}
-
 fwupd-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libglib-devel"
 	short_desc+=" - development files"
@@ -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/gtk-doc
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (2 preceding siblings ...)
  2021-08-23  7:35 ` [PR PATCH] [Updated] " dkwo
@ 2021-08-23  8:01 ` dkwo
  2021-08-23  8:06 ` dkwo
                   ` (76 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23  8:01 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From da5e4d4ab5cb4910a004a9148b93887de496d342 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..42779e2bb562
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,22 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends+=" efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From 57023fcd90e14c4ac68ac457589226349fd9b072 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 common/shlibs                       |  2 ++
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 39 ++++++++-----------------
 4 files changed, 35 insertions(+), 71 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index b5363014957e..3335ba6052c5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -30,6 +30,8 @@ ld64.so.2 glibc-2.32_1 ppc64
 ld.so.1 glibc-2.32_1 mips
 ld.so.1 glibc-2.32_1 ppc
 ld-linux-armhf.so.3 glibc-2.32_1
+libfwupd.so.2 fwupd-1.6.3_1
+libfwupdplugin.so.2 fwupd-1.6.3_1
 libresolv.so.2 glibc-2.32_1
 libanl.so.1 glibc-2.32_1
 libthread_db.so.1 glibc-2.32_1
diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..d27d7a045a76 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,21 @@
 # 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
+ -Dconsolekit=false -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
+ -Db_lto=false -Delogind=true"
+# -Dgtkdoc=true -Dpkcs7=false
+hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab
  vala glib-devel polkit gettext gtk-doc 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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi gi-docgen valgrind-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -26,8 +24,8 @@ 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=4abecf930f02fc5b165831682f3915cc7f0e82e73be2e187e761220ae275a1a3
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=f889e96c006f55df185e07faf5257b4ae93a5a8ed5cecb1afbab79807f8918e5
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -57,22 +55,9 @@ 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
-	fi
-}
+#if [ "$CROSS_BUILD" ]; then
+#	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+#fi
 
 fwupd-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libglib-devel"
@@ -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/gtk-doc
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (3 preceding siblings ...)
  2021-08-23  8:01 ` [PR PATCH] [Updated] " dkwo
@ 2021-08-23  8:06 ` dkwo
  2021-08-23  8:16 ` dkwo
                   ` (75 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23  8:06 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From e11ba3a31b91c5ae0580a559cde971b58f2d3c39 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..60e24d59b095
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,22 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From c1379c222a2421bb41fdd7dec2c6c2a7e7afc031 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 common/shlibs                       |  2 ++
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 39 ++++++++-----------------
 4 files changed, 35 insertions(+), 71 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index b5363014957e..3335ba6052c5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -30,6 +30,8 @@ ld64.so.2 glibc-2.32_1 ppc64
 ld.so.1 glibc-2.32_1 mips
 ld.so.1 glibc-2.32_1 ppc
 ld-linux-armhf.so.3 glibc-2.32_1
+libfwupd.so.2 fwupd-1.6.3_1
+libfwupdplugin.so.2 fwupd-1.6.3_1
 libresolv.so.2 glibc-2.32_1
 libanl.so.1 glibc-2.32_1
 libthread_db.so.1 glibc-2.32_1
diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..d27d7a045a76 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,21 @@
 # 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
+ -Dconsolekit=false -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
+ -Db_lto=false -Delogind=true"
+# -Dgtkdoc=true -Dpkcs7=false
+hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab
  vala glib-devel polkit gettext gtk-doc 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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi gi-docgen valgrind-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -26,8 +24,8 @@ 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=4abecf930f02fc5b165831682f3915cc7f0e82e73be2e187e761220ae275a1a3
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=f889e96c006f55df185e07faf5257b4ae93a5a8ed5cecb1afbab79807f8918e5
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -57,22 +55,9 @@ 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
-	fi
-}
+#if [ "$CROSS_BUILD" ]; then
+#	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+#fi
 
 fwupd-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libglib-devel"
@@ -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/gtk-doc
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (4 preceding siblings ...)
  2021-08-23  8:06 ` dkwo
@ 2021-08-23  8:16 ` dkwo
  2021-08-23  8:16 ` dkwo
                   ` (74 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23  8:16 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From e11ba3a31b91c5ae0580a559cde971b58f2d3c39 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..60e24d59b095
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,22 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From 147bd5ed50dd44d0938b65d8cfbd613728697d34 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 common/shlibs                       |  2 ++
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 39 ++++++++-----------------
 4 files changed, 35 insertions(+), 71 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index b5363014957e..3335ba6052c5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -30,6 +30,8 @@ ld64.so.2 glibc-2.32_1 ppc64
 ld.so.1 glibc-2.32_1 mips
 ld.so.1 glibc-2.32_1 ppc
 ld-linux-armhf.so.3 glibc-2.32_1
+libfwupd.so.2 fwupd-1.6.3_1
+libfwupdplugin.so.2 fwupd-1.6.3_1
 libresolv.so.2 glibc-2.32_1
 libanl.so.1 glibc-2.32_1
 libthread_db.so.1 glibc-2.32_1
diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..7a7bb372e126 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,21 @@
 # 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
+ -Dconsolekit=false -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
+ -Db_lto=false -Delogind=true"
+# -Dgtkdoc=true -Dpkcs7=false
+hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen
  vala glib-devel polkit gettext gtk-doc 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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi gi-docgen valgrind-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -26,8 +24,8 @@ 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=4abecf930f02fc5b165831682f3915cc7f0e82e73be2e187e761220ae275a1a3
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=f889e96c006f55df185e07faf5257b4ae93a5a8ed5cecb1afbab79807f8918e5
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -57,22 +55,9 @@ 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
-	fi
-}
+#if [ "$CROSS_BUILD" ]; then
+#	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+#fi
 
 fwupd-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libglib-devel"
@@ -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/gtk-doc
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (5 preceding siblings ...)
  2021-08-23  8:16 ` dkwo
@ 2021-08-23  8:16 ` dkwo
  2021-08-23  8:28 ` [PR PATCH] [Updated] " dkwo
                   ` (73 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23  8:16 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-903545941

Comment:
Done. Now it looks better.
Why do certain arch's not find package gi-docgen? does it have to be in hostmakedeps?

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (6 preceding siblings ...)
  2021-08-23  8:16 ` dkwo
@ 2021-08-23  8:28 ` dkwo
  2021-08-23  8:37 ` dkwo
                   ` (72 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23  8:28 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From e11ba3a31b91c5ae0580a559cde971b58f2d3c39 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..60e24d59b095
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,22 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From 69f97ef07859f801b0e81184ce8a0f8fc227e24f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 common/shlibs                       |  2 ++
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 34 +++++++---------------
 4 files changed, 33 insertions(+), 68 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index b5363014957e..3335ba6052c5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -30,6 +30,8 @@ ld64.so.2 glibc-2.32_1 ppc64
 ld.so.1 glibc-2.32_1 mips
 ld.so.1 glibc-2.32_1 ppc
 ld-linux-armhf.so.3 glibc-2.32_1
+libfwupd.so.2 fwupd-1.6.3_1
+libfwupdplugin.so.2 fwupd-1.6.3_1
 libresolv.so.2 glibc-2.32_1
 libanl.so.1 glibc-2.32_1
 libthread_db.so.1 glibc-2.32_1
diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..e8a4815b6e36 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,21 @@
 # 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
+ -Dconsolekit=false -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
+ -Db_lto=false -Delogind=true"
+# -Dgtkdoc=true -Dpkcs7=false
+hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen
  vala glib-devel polkit gettext gtk-doc 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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi gi-docgen valgrind-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -26,8 +24,8 @@ 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=4abecf930f02fc5b165831682f3915cc7f0e82e73be2e187e761220ae275a1a3
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=f889e96c006f55df185e07faf5257b4ae93a5a8ed5cecb1afbab79807f8918e5
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -58,22 +56,10 @@ else
 fi
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
-
+	# need help to fix this
 	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
-	fi
-}
-
 fwupd-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libglib-devel"
 	short_desc+=" - development files"
@@ -83,6 +69,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/gtk-doc
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (7 preceding siblings ...)
  2021-08-23  8:28 ` [PR PATCH] [Updated] " dkwo
@ 2021-08-23  8:37 ` dkwo
  2021-08-23  8:39 ` [PR PATCH] [Updated] " dkwo
                   ` (71 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23  8:37 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-903545941

Comment:
Done. Now I need a little help with `gi-docgen` failing to build for certain arch's.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (8 preceding siblings ...)
  2021-08-23  8:37 ` dkwo
@ 2021-08-23  8:39 ` dkwo
  2021-08-23 12:12 ` [PR REVIEW] " ericonr
                   ` (70 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23  8:39 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From e11ba3a31b91c5ae0580a559cde971b58f2d3c39 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..60e24d59b095
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,22 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From 57913a290b709aad17aa9117d473d6020eb91c01 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 common/shlibs                       |  2 ++
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 37 ++++++------------------
 4 files changed, 32 insertions(+), 72 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index b5363014957e..3335ba6052c5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -30,6 +30,8 @@ ld64.so.2 glibc-2.32_1 ppc64
 ld.so.1 glibc-2.32_1 mips
 ld.so.1 glibc-2.32_1 ppc
 ld-linux-armhf.so.3 glibc-2.32_1
+libfwupd.so.2 fwupd-1.6.3_1
+libfwupdplugin.so.2 fwupd-1.6.3_1
 libresolv.so.2 glibc-2.32_1
 libanl.so.1 glibc-2.32_1
 libthread_db.so.1 glibc-2.32_1
diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..6566e4a79fc5 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,21 @@
 # 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
+ -Dconsolekit=false -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
+ -Db_lto=false -Delogind=true"
+# -Dgtkdoc=true -Dpkcs7=false
+hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen
  vala glib-devel polkit gettext gtk-doc 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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi gi-docgen valgrind-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -26,8 +24,8 @@ 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=4abecf930f02fc5b165831682f3915cc7f0e82e73be2e187e761220ae275a1a3
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=f889e96c006f55df185e07faf5257b4ae93a5a8ed5cecb1afbab79807f8918e5
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -57,23 +55,6 @@ 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
-	fi
-}
-
 fwupd-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libglib-devel"
 	short_desc+=" - development files"
@@ -83,6 +64,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/gtk-doc
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (9 preceding siblings ...)
  2021-08-23  8:39 ` [PR PATCH] [Updated] " dkwo
@ 2021-08-23 12:12 ` ericonr
  2021-08-23 12:28 ` [PR PATCH] [Updated] " dkwo
                   ` (69 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-08-23 12:12 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r693914699

Comment:
Are these just to fix the warnings? If nothing links against them, we don't need to add them.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (10 preceding siblings ...)
  2021-08-23 12:12 ` [PR REVIEW] " ericonr
@ 2021-08-23 12:28 ` dkwo
  2021-08-23 12:41 ` dkwo
                   ` (68 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 12:28 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From e11ba3a31b91c5ae0580a559cde971b58f2d3c39 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..60e24d59b095
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,22 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From 55b8dd6185e1d3d3d21ae45702d274be5feec1d4 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 common/shlibs                       |  2 ++
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 37 ++++++------------------
 4 files changed, 32 insertions(+), 72 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index b5363014957e..3335ba6052c5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -30,6 +30,8 @@ ld64.so.2 glibc-2.32_1 ppc64
 ld.so.1 glibc-2.32_1 mips
 ld.so.1 glibc-2.32_1 ppc
 ld-linux-armhf.so.3 glibc-2.32_1
+libfwupd.so.2 fwupd-1.6.3_1
+libfwupdplugin.so.2 fwupd-1.6.3_1
 libresolv.so.2 glibc-2.32_1
 libanl.so.1 glibc-2.32_1
 libthread_db.so.1 glibc-2.32_1
diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..665fd832388d 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,21 @@
 # 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
+ -Dconsolekit=false -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
+ -Db_lto=false -Delogind=true"
+# -Dgtkdoc=true -Dpkcs7=false
+hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen json-glib-devel
  vala glib-devel polkit gettext gtk-doc 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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi gi-docgen valgrind-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -26,8 +24,8 @@ 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=4abecf930f02fc5b165831682f3915cc7f0e82e73be2e187e761220ae275a1a3
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=f889e96c006f55df185e07faf5257b4ae93a5a8ed5cecb1afbab79807f8918e5
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -57,23 +55,6 @@ 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
-	fi
-}
-
 fwupd-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libglib-devel"
 	short_desc+=" - development files"
@@ -83,6 +64,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/gtk-doc
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (11 preceding siblings ...)
  2021-08-23 12:28 ` [PR PATCH] [Updated] " dkwo
@ 2021-08-23 12:41 ` dkwo
  2021-08-23 12:42 ` [PR REVIEW] " dkwo
                   ` (67 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 12:41 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-903728797

Comment:
> Could try json-glib-devel in hostmakedeps too.

It still says
```
[462/463] Generating doc-fwupdplugin with a custom command
FAILED: docs/libfwupdplugin 
/usr/bin/gi-docgen generate --quiet --add-include-path=/builddir/fwupd-1.6.3/build/docs/../libfwupd --add-include-path=/builddir/fwupd-1.6.3/build/docs/../libfwupdplugin --config=docs/fwupdplugin.toml --output-dir=docs/libfwupdplugin --no-namespace-dir --content-dir=/builddir/fwupd-1.6.3/docs libfwupdplugin/FwupdPlugin-1.0.gir
ERROR: Could not find GIR dependency in the search paths: GUsb-1.0
```

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (12 preceding siblings ...)
  2021-08-23 12:41 ` dkwo
@ 2021-08-23 12:42 ` dkwo
  2021-08-23 12:43 ` paper42
                   ` (66 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 12:42 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r693935691

Comment:
Yes. I will then remove them.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (13 preceding siblings ...)
  2021-08-23 12:42 ` [PR REVIEW] " dkwo
@ 2021-08-23 12:43 ` paper42
  2021-08-23 12:45 ` [PR PATCH] [Updated] " dkwo
                   ` (65 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 12:43 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-903730068

Comment:
> ```
> [462/463] Generating doc-fwupdplugin with a custom command
> FAILED: docs/libfwupdplugin 
> /usr/bin/gi-docgen generate --quiet --add-include-path=/builddir/fwupd-1.6.3/build/docs/../libfwupd --add-include-path=/builddir/fwupd-1.6.3/build/docs/../libfwupdplugin --config=docs/fwupdplugin.toml --output-dir=docs/libfwupdplugin --no-namespace-dir --content-dir=/builddir/fwupd-1.6.3/docs libfwupdplugin/FwupdPlugin-1.0.gir
> ERROR: Could not find GIR dependency in the search paths: GUsb-1.0
> ```

gi-docgen can not find gir files from cross directories, there is an easy fix for this, look at gtk4 or libadwaita

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (14 preceding siblings ...)
  2021-08-23 12:43 ` paper42
@ 2021-08-23 12:45 ` dkwo
  2021-08-23 12:54 ` dkwo
                   ` (64 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 12:45 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From e11ba3a31b91c5ae0580a559cde971b58f2d3c39 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..60e24d59b095
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,22 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From a9aff5e4db5f444e181f78f913dfb9e227226255 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 38 +++++++++----------------
 3 files changed, 34 insertions(+), 69 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..9dc0cb9f3d97 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,21 @@
 # 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
+ -Dconsolekit=false -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
+ -Db_lto=false -Delogind=true"
+# -Dgtkdoc=true -Dpkcs7=false
+hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen json-glib-devel
  vala glib-devel polkit gettext gtk-doc 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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi gi-docgen valgrind-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -26,8 +24,8 @@ 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=4abecf930f02fc5b165831682f3915cc7f0e82e73be2e187e761220ae275a1a3
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=f889e96c006f55df185e07faf5257b4ae93a5a8ed5cecb1afbab79807f8918e5
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -57,20 +55,10 @@ 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 +71,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/gtk-doc
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (15 preceding siblings ...)
  2021-08-23 12:45 ` [PR PATCH] [Updated] " dkwo
@ 2021-08-23 12:54 ` dkwo
  2021-08-23 16:11 ` [PR REVIEW] " paper42
                   ` (63 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 12:54 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-903737928

Comment:
Thanks, that fixes it.
It is now ready for review.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (16 preceding siblings ...)
  2021-08-23 12:54 ` dkwo
@ 2021-08-23 16:11 ` paper42
  2021-08-23 16:11 ` paper42
                   ` (62 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 16:11 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694106637

Comment:
please don't use $homepage in $distfiles

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (17 preceding siblings ...)
  2021-08-23 16:11 ` [PR REVIEW] " paper42
@ 2021-08-23 16:11 ` paper42
  2021-08-23 16:12 ` paper42
                   ` (61 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 16:11 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694107290

Comment:
did you leave this comment here by accident?

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (18 preceding siblings ...)
  2021-08-23 16:11 ` paper42
@ 2021-08-23 16:12 ` paper42
  2021-08-23 16:12 ` paper42
                   ` (60 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 16:12 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694107406

Comment:
same

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (19 preceding siblings ...)
  2021-08-23 16:12 ` paper42
@ 2021-08-23 16:12 ` paper42
  2021-08-23 16:13 ` paper42
                   ` (59 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 16:12 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694110081

Comment:
what's going on here? it installs docs to /usr/share/doc

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (20 preceding siblings ...)
  2021-08-23 16:12 ` paper42
@ 2021-08-23 16:13 ` paper42
  2021-08-23 16:13 ` paper42
                   ` (58 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 16:13 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694108770

Comment:
* gi-docgen should be only in hostmakedepends
* it seems to build a GTK GUI, but we don't have gtk, python3-gobject and possibly other runtime dependencies listed

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (21 preceding siblings ...)
  2021-08-23 16:13 ` paper42
@ 2021-08-23 16:13 ` paper42
  2021-08-23 16:38 ` ericonr
                   ` (57 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 16:13 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694111003

Comment:
if you added json-glib-devel here just to fix gi-docgen, you can remove it now

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (22 preceding siblings ...)
  2021-08-23 16:13 ` paper42
@ 2021-08-23 16:38 ` ericonr
  2021-08-23 16:49 ` dkwo
                   ` (56 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-08-23 16:38 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694134278

Comment:
Maybe we should consider splitting the GUI into its own subpackage? `fwupd` is very useful for headless usage.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (23 preceding siblings ...)
  2021-08-23 16:38 ` ericonr
@ 2021-08-23 16:49 ` dkwo
  2021-08-23 16:57 ` dkwo
                   ` (55 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 16:49 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694142282

Comment:
Yes.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (24 preceding siblings ...)
  2021-08-23 16:49 ` dkwo
@ 2021-08-23 16:57 ` dkwo
  2021-08-23 17:00 ` [PR PATCH] [Updated] " dkwo
                   ` (54 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 16:57 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694148059

Comment:
I'm not sure. The only place I see gtk in meson-options is
`option('docs', type : 'combo', choices : ['none', 'gtkdoc', 'docgen'], value : 'docgen', description : 'developer documentation type')`
so I think they just changed the way they deal with docs.
Do you want to use the value `gtkdoc` instead?
This should explain the comment below.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (25 preceding siblings ...)
  2021-08-23 16:57 ` dkwo
@ 2021-08-23 17:00 ` dkwo
  2021-08-23 17:06 ` [PR REVIEW] " dkwo
                   ` (53 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 17:00 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From e90496dc1425f0f45916734090a95212bd50d177 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..e42a012d9003
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,22 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From 70d07236cef1d51454e6b203479fa03ed73ff570 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 34 +++++++---------------
 3 files changed, 31 insertions(+), 68 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..ab1c6c8cdce7 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,20 @@
 # 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
+ -Dconsolekit=false -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
+ -Db_lto=false -Delogind=true"
+hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen
  vala glib-devel polkit gettext gtk-doc 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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi valgrind-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -27,7 +24,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
@@ -57,20 +54,10 @@ 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 +70,5 @@ fwupd-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
 		vmove usr/share/vala
-		vmove usr/share/gtk-doc
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (26 preceding siblings ...)
  2021-08-23 17:00 ` [PR PATCH] [Updated] " dkwo
@ 2021-08-23 17:06 ` dkwo
  2021-08-23 17:08 ` [PR PATCH] [Updated] " dkwo
                   ` (52 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 17:06 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694154673

Comment:
see above

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (27 preceding siblings ...)
  2021-08-23 17:06 ` [PR REVIEW] " dkwo
@ 2021-08-23 17:08 ` dkwo
  2021-08-23 17:10 ` [PR REVIEW] " dkwo
                   ` (51 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 17:08 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From e90496dc1425f0f45916734090a95212bd50d177 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..e42a012d9003
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,22 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From 34d99014b4979ce1a647283676451f591762427c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 34 +++++++---------------
 3 files changed, 31 insertions(+), 68 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..af4e0a87badf 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,20 @@
 # 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
+ -Dconsolekit=false -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
+ -Db_lto=false -Delogind=true"
+hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen
  vala glib-devel polkit gettext gtk-doc 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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi valgrind-devel gi-docgen"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -27,7 +24,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
@@ -57,20 +54,10 @@ 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 +70,5 @@ fwupd-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
 		vmove usr/share/vala
-		vmove usr/share/gtk-doc
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (28 preceding siblings ...)
  2021-08-23 17:08 ` [PR PATCH] [Updated] " dkwo
@ 2021-08-23 17:10 ` dkwo
  2021-08-23 17:11 ` paper42
                   ` (50 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 17:10 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694157845

Comment:
Btw, if I remove it from makedepends, certain archs do fail with
```
Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
Looking for a fallback subproject for the dependency gi-docgen
meson.build:556:2: ERROR: Automatic wrap-based subproject downloading is disabled
```

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (29 preceding siblings ...)
  2021-08-23 17:10 ` [PR REVIEW] " dkwo
@ 2021-08-23 17:11 ` paper42
  2021-08-23 17:17 ` paper42
                   ` (49 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 17:11 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694158641

Comment:
My first suggestion is to have gi-docgen **only** in hostmakedepends, we don't need it in makedepends. I think we should always go with gi-docgen if possible, because it's more modern, some projects drop gtkdoc and it produces prettier documentation.

The second comment is unrelated to documentation and also totally wrong (my bad). I thought they ship GTK GUI, but they just use python3-gobject. So ignore the second part and @ericonr's comment

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (30 preceding siblings ...)
  2021-08-23 17:11 ` paper42
@ 2021-08-23 17:17 ` paper42
  2021-08-23 17:18 ` dkwo
                   ` (48 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 17:17 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694162884

Comment:
it seems like they don't like host gi-docgen in cross compilation, I will look into it in a second

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (31 preceding siblings ...)
  2021-08-23 17:17 ` paper42
@ 2021-08-23 17:18 ` dkwo
  2021-08-23 17:18 ` dkwo
                   ` (47 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 17:18 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694163017

Comment:
With `gi-docgen` in both makedepends _and_ hostmakedepends, all builds are fine on ci.
If I put it only in hostmakedepends, then armv7l and aarch fail, with the error above.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (32 preceding siblings ...)
  2021-08-23 17:18 ` dkwo
@ 2021-08-23 17:18 ` dkwo
  2021-08-23 17:19 ` ericonr
                   ` (46 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 17:18 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694163417

Comment:
exactly

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (33 preceding siblings ...)
  2021-08-23 17:18 ` dkwo
@ 2021-08-23 17:19 ` ericonr
  2021-08-23 17:33 ` paper42
                   ` (45 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-08-23 17:19 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694163906

Comment:
Something wrong with how they look for `gi-docgen`, then. Should be fixable, but I'd be okay with having it in both vars.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (34 preceding siblings ...)
  2021-08-23 17:19 ` ericonr
@ 2021-08-23 17:33 ` paper42
  2021-08-23 17:39 ` paper42
                   ` (44 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 17:33 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694173811

Comment:
It's very simple to fix, could you add this PR as a patch? https://github.com/fwupd/fwupd/pull/3664

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (35 preceding siblings ...)
  2021-08-23 17:33 ` paper42
@ 2021-08-23 17:39 ` paper42
  2021-08-23 17:56 ` paper42
                   ` (43 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 17:39 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694177697

Comment:
removing this line means documentation is installed to the main package, we don't want that

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (36 preceding siblings ...)
  2021-08-23 17:39 ` paper42
@ 2021-08-23 17:56 ` paper42
  2021-08-23 17:56 ` paper42
                   ` (42 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 17:56 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694188783

Comment:
Could you wrap this at 80 columns? It can be much shorter.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (37 preceding siblings ...)
  2021-08-23 17:56 ` paper42
@ 2021-08-23 17:56 ` paper42
  2021-08-23 18:32 ` dkwo
                   ` (41 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 17:56 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694189276

Comment:
do we still need gtk-doc here?

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (38 preceding siblings ...)
  2021-08-23 17:56 ` paper42
@ 2021-08-23 18:32 ` dkwo
  2021-08-23 18:33 ` dkwo
                   ` (40 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 18:32 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694213328

Comment:
Sure.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (39 preceding siblings ...)
  2021-08-23 18:32 ` dkwo
@ 2021-08-23 18:33 ` dkwo
  2021-08-23 18:34 ` dkwo
                   ` (39 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 18:33 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694213792

Comment:
Sorry. What should it be then, `vmove usr/share/doc` ?

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (40 preceding siblings ...)
  2021-08-23 18:33 ` dkwo
@ 2021-08-23 18:34 ` dkwo
  2021-08-23 18:34 ` dkwo
                   ` (38 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 18:34 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694214245

Comment:
Sure.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (41 preceding siblings ...)
  2021-08-23 18:34 ` dkwo
@ 2021-08-23 18:34 ` dkwo
  2021-08-23 18:36 ` [PR PATCH] [Updated] " dkwo
                   ` (37 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 18:34 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694214367

Comment:
let me remove it.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (42 preceding siblings ...)
  2021-08-23 18:34 ` dkwo
@ 2021-08-23 18:36 ` dkwo
  2021-08-23 18:47 ` dkwo
                   ` (36 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 18:36 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From e90496dc1425f0f45916734090a95212bd50d177 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..e42a012d9003
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,22 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From 5f7b94569ebe76eb57b15eb6d9624a3dc252de91 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/gicross.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 39 ++++++++-----------------
 4 files changed, 54 insertions(+), 71 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 create mode 100644 srcpkgs/fwupd/patches/gicross.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/gicross.patch b/srcpkgs/fwupd/patches/gicross.patch
new file mode 100644
index 000000000000..e720898f3545
--- /dev/null
+++ 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')
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..fe53c227aec4 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,18 @@
 # 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 -Dtests=false -Db_lto=false -Delogind=true"
+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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi valgrind-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -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
@@ -57,20 +52,10 @@ 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
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (43 preceding siblings ...)
  2021-08-23 18:36 ` [PR PATCH] [Updated] " dkwo
@ 2021-08-23 18:47 ` dkwo
  2021-08-23 18:48 ` [PR REVIEW] " dkwo
                   ` (35 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 18:47 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-904022148

Comment:
Btw, there's no `-Db_lto=false` option, so I'll remove that.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (44 preceding siblings ...)
  2021-08-23 18:47 ` dkwo
@ 2021-08-23 18:48 ` dkwo
  2021-08-23 18:48 ` paper42
                   ` (34 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 18:48 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694223687

Comment:
it seems to work, let me know in case you're unhappy with that.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (45 preceding siblings ...)
  2021-08-23 18:48 ` [PR REVIEW] " dkwo
@ 2021-08-23 18:48 ` paper42
  2021-08-23 18:49 ` [PR PATCH] [Updated] " dkwo
                   ` (33 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 18:48 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r694223718

Comment:
yes, the documentation moved from /usr/share/gtk-doc/ to /usr/share/doc/

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (46 preceding siblings ...)
  2021-08-23 18:48 ` paper42
@ 2021-08-23 18:49 ` dkwo
  2021-08-23 19:32 ` paper42
                   ` (32 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-23 18:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From e90496dc1425f0f45916734090a95212bd50d177 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..e42a012d9003
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,22 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From d802c96cce4554caa71168b435d1df12172053c5 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/gicross.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 39 ++++++++-----------------
 4 files changed, 54 insertions(+), 71 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 create mode 100644 srcpkgs/fwupd/patches/gicross.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/gicross.patch b/srcpkgs/fwupd/patches/gicross.patch
new file mode 100644
index 000000000000..e720898f3545
--- /dev/null
+++ 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')
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..b5036ef21407 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,18 @@
 # 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 -Dtests=false -Delogind=true"
+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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi valgrind-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -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
@@ -57,20 +52,10 @@ 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
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (47 preceding siblings ...)
  2021-08-23 18:49 ` [PR PATCH] [Updated] " dkwo
@ 2021-08-23 19:32 ` paper42
  2021-08-24  6:54 ` dkwo
                   ` (31 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-08-23 19:32 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-904062097

Comment:
fwupd now installs /etc/grub.d/35_fwupd, I think we should regenerate grub config when the package is installed like in memtest86+.

@ericonr what do you think?

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (48 preceding siblings ...)
  2021-08-23 19:32 ` paper42
@ 2021-08-24  6:54 ` dkwo
  2021-08-24  6:55 ` [PR PATCH] [Updated] " dkwo
                   ` (30 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-24  6:54 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-904372769

Comment:
`lto` was introduced at https://github.com/void-linux/void-packages/commit/307b17aa426a161571c235644dcf208947a49ddf#
I will put it back for the moment.
Maybe @maxice8 can comment
(it seems Arch uses it as well, btw.)

Let me know what to do with grub.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (49 preceding siblings ...)
  2021-08-24  6:54 ` dkwo
@ 2021-08-24  6:55 ` dkwo
  2021-08-24  6:56 ` maxice8
                   ` (29 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-24  6:55 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From e90496dc1425f0f45916734090a95212bd50d177 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..e42a012d9003
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,22 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From 34b7c69df79cf93da75a6365a642380609d82c9b Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/gicross.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 39 ++++++++-----------------
 4 files changed, 54 insertions(+), 71 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 create mode 100644 srcpkgs/fwupd/patches/gicross.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/gicross.patch b/srcpkgs/fwupd/patches/gicross.patch
new file mode 100644
index 000000000000..e720898f3545
--- /dev/null
+++ 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')
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..f910e99f8ba7 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,18 @@
 # 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 -Dtests=false -Delogind=true -Db_lto=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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi valgrind-devel"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -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
@@ -57,20 +52,10 @@ 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
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (50 preceding siblings ...)
  2021-08-24  6:55 ` [PR PATCH] [Updated] " dkwo
@ 2021-08-24  6:56 ` maxice8
  2021-08-27 17:44 ` [PR REVIEW] " ericonr
                   ` (28 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: maxice8 @ 2021-08-24  6:56 UTC (permalink / raw)
  To: ml

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

New comment by maxice8 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-904373472

Comment:
iirc linking failure

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (51 preceding siblings ...)
  2021-08-24  6:56 ` maxice8
@ 2021-08-27 17:44 ` ericonr
  2021-08-28  9:05 ` dkwo
                   ` (27 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-08-27 17:44 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r697616003

Comment:
Sure valgrind isn't a `checkdepends`?

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (52 preceding siblings ...)
  2021-08-27 17:44 ` [PR REVIEW] " ericonr
@ 2021-08-28  9:05 ` dkwo
  2021-08-29 19:52 ` ericonr
                   ` (26 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-28  9:05 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r697840697

Comment:
I must have added it when trying to troubleshoot some errors, but you're right, it can be built without it.
Shall I remove it, as well as `-Db_lto=false`?

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (53 preceding siblings ...)
  2021-08-28  9:05 ` dkwo
@ 2021-08-29 19:52 ` ericonr
  2021-08-30  7:28 ` [PR PATCH] [Updated] " dkwo
                   ` (25 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-08-29 19:52 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r698062554

Comment:
Remove it or move to `checkdepends` only... And yeah, I think we can leave LTO enabled.



^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (54 preceding siblings ...)
  2021-08-29 19:52 ` ericonr
@ 2021-08-30  7:28 ` dkwo
  2021-08-30  7:30 ` [PR REVIEW] " dkwo
                   ` (24 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-30  7:28 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From 6ea58015005ce80284993f6e9d7cb51c13737252 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..e42a012d9003
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,22 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From a94d279d196df522520a144bd654d8fdcb99d22e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/gicross.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 39 ++++++++-----------------
 4 files changed, 54 insertions(+), 71 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 create mode 100644 srcpkgs/fwupd/patches/gicross.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/gicross.patch b/srcpkgs/fwupd/patches/gicross.patch
new file mode 100644
index 000000000000..e720898f3545
--- /dev/null
+++ 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')
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..4600d273b77d 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,23 +1,18 @@
 # 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 -Dtests=false -Delogind=true"
+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
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel fwupd-efi"
 depends="udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -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
@@ -57,20 +52,10 @@ 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
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (55 preceding siblings ...)
  2021-08-30  7:28 ` [PR PATCH] [Updated] " dkwo
@ 2021-08-30  7:30 ` dkwo
  2021-09-06 18:31 ` ericonr
                   ` (23 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-08-30  7:30 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r698257858

Comment:
Done.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (57 preceding siblings ...)
  2021-09-06 18:31 ` ericonr
@ 2021-09-06 18:31 ` ericonr
  2021-09-06 18:31 ` ericonr
                   ` (21 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-09-06 18:31 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r703036881

Comment:
Does `fwupd-efi` get bundled into `fwupd`? Otherwise I think we should add it to `depends` as well. (I'm pretty sure we should, seeing as the `/usr/libexec/fwupd/efi/fwupdx64.efi` file used to be in `fwupd`.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (56 preceding siblings ...)
  2021-08-30  7:30 ` [PR REVIEW] " dkwo
@ 2021-09-06 18:31 ` ericonr
  2021-09-06 18:31 ` ericonr
                   ` (22 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-09-06 18:31 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r703037235

Comment:
Below this, there are some options for dealing with `_have_uefi`. You should fix them so they stop bringing in the dependencies like `libefivar-devel`, and instead only add `fwupd-efi` to dependencies. But it shouldn't be added at the top for all archs.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (58 preceding siblings ...)
  2021-09-06 18:31 ` ericonr
@ 2021-09-06 18:31 ` ericonr
  2021-09-06 18:37 ` ericonr
                   ` (20 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-09-06 18:31 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r703037562

Comment:
I think you should restrict this for the same archs as it used to be in `fwupd`, as well.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (59 preceding siblings ...)
  2021-09-06 18:31 ` ericonr
@ 2021-09-06 18:37 ` ericonr
  2021-09-07  8:08 ` [PR REVIEW] " dkwo
                   ` (19 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-09-06 18:37 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-913806790

Comment:
Ok, per https://github.com/fwupd/fwupd/commit/197d3dc3b9acb93be30c4a7f49e8c0ad3f554818 we do need `fwupd-efi` in depends *for the archs where it's needed*.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (60 preceding siblings ...)
  2021-09-06 18:37 ` ericonr
@ 2021-09-07  8:08 ` dkwo
  2021-09-07  8:08 ` dkwo
                   ` (18 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-09-07  8:08 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r703280061

Comment:
Let me keep everything for the moment, and then start eliminating stuff after we fix the gi-docgen error.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (61 preceding siblings ...)
  2021-09-07  8:08 ` [PR REVIEW] " dkwo
@ 2021-09-07  8:08 ` dkwo
  2021-09-07  8:09 ` [PR REVIEW] " dkwo
                   ` (17 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-09-07  8:08 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-914087031

Comment:
After the update of `gi-docgen` a few days ago, I get a new error:
```
[51/57] Generating doc-fwupd with a custom command
FAILED: docs/libfwupd
/usr/bin/gi-docgen generate --quiet --add-include-path=/builddir/fwupd-1.6.3/build/docs/../libfwupd --config=docs/fwupd.toml --output-dir=docs/libfwupd --no-namespace-dir --content-dir=/builddir/fwupd-1.6.3/docs libfwupd/Fwupd-2.0.gir
Traceback (most recent call last):
  File "/usr/lib/python3.9/site-packages/gidocgen/gidocmain.py", line 74, in run
    res = options.run_func(options)
  File "/usr/lib/python3.9/site-packages/gidocgen/gdgenerate.py", line 2837, in run
    gen_reference(conf, options, parser.get_repository(), templates_dir, theme_conf, content_dirs, output_dir)
  File "/usr/lib/python3.9/site-packages/gidocgen/gdgenerate.py", line 2767, in gen_reference
    src = utils.find_extra_content_file(content_dirs, config.urlmap_file)
  File "/usr/lib/python3.9/site-packages/gidocgen/utils.py", line 880, in find_extra_content_file
    raise FileNotFoundError(f"Content file {file} not found in any content directory")
FileNotFoundError: Content file ../urlmap.js not found in any content directory
```
is the file urlmap.js supposed to be provided by fwupd?

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (62 preceding siblings ...)
  2021-09-07  8:08 ` dkwo
@ 2021-09-07  8:09 ` dkwo
  2021-09-07  8:21 ` [PR PATCH] [Updated] " dkwo
                   ` (16 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-09-07  8:09 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r703281336

Comment:
Sure.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (63 preceding siblings ...)
  2021-09-07  8:09 ` [PR REVIEW] " dkwo
@ 2021-09-07  8:21 ` dkwo
  2021-09-07  8:38 ` [PR REVIEW] " dkwo
                   ` (15 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-09-07  8:21 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From c4976017072c5098ade59dc59f81ec90df5841d7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..f6df8370a503
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,23 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+archs="x86_64* i686* arm* aarch64*"
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From 374a8c271fdf3edf86ee22838e78241521b80ff6 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/gicross.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 40 +++++++++-----------------
 4 files changed, 55 insertions(+), 71 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 create mode 100644 srcpkgs/fwupd/patches/gicross.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/gicross.patch b/srcpkgs/fwupd/patches/gicross.patch
new file mode 100644
index 000000000000..e720898f3545
--- /dev/null
+++ 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')
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..38fde962ab4e 100644
--- 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 -Dtests=false -Delogind=true"
+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
@@ -52,25 +47,16 @@ fi
 
 if [ -n "$_have_uefi" ]; then
 	hostmakedepends+=" efivar"
-	makedepends+=" libefivar-devel gnu-efi-libs"
+	makedepends+=" libefivar-devel gnu-efi-libs 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 +69,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
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (64 preceding siblings ...)
  2021-09-07  8:21 ` [PR PATCH] [Updated] " dkwo
@ 2021-09-07  8:38 ` dkwo
  2021-09-07 11:35 ` [PR PATCH] [Updated] " dkwo
                   ` (14 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-09-07  8:38 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r703303570

Comment:
Actually, they all seem to be required as in present state.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (65 preceding siblings ...)
  2021-09-07  8:38 ` [PR REVIEW] " dkwo
@ 2021-09-07 11:35 ` dkwo
  2021-09-07 11:35 ` dkwo
                   ` (13 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-09-07 11:35 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From c4976017072c5098ade59dc59f81ec90df5841d7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..f6df8370a503
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,23 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+archs="x86_64* i686* arm* aarch64*"
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From 220050c2f4b61d67cd1b4eedc5f5f376c0e31bb8 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/gicross.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 40 +++++++++-----------------
 4 files changed, 56 insertions(+), 70 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 create mode 100644 srcpkgs/fwupd/patches/gicross.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/gicross.patch b/srcpkgs/fwupd/patches/gicross.patch
new file mode 100644
index 000000000000..e720898f3545
--- /dev/null
+++ 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')
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..f2e14bf8f89a 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,19 +1,15 @@
 # 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"
+# temporarily switch back to gtk-doc
+configure_args="-Dsupported_build=true -Dconsolekit=false -Dintrospection=true
+ -Dsystemd=false -Dplugin_altos=false -Delogind=true -Dtests=false -Ddocs=gtkdoc"
+hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen
+ vala glib-devel polkit gettext pango python3-gobject python3-Pillow gtk-doc"
 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 +23,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
@@ -52,25 +48,16 @@ fi
 
 if [ -n "$_have_uefi" ]; then
 	hostmakedepends+=" efivar"
-	makedepends+=" libefivar-devel gnu-efi-libs"
+	makedepends+=" libefivar-devel gnu-efi-libs 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 +70,7 @@ fwupd-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
 		vmove usr/share/vala
+#		vmove usr/share/doc
 		vmove usr/share/gtk-doc
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (66 preceding siblings ...)
  2021-09-07 11:35 ` [PR PATCH] [Updated] " dkwo
@ 2021-09-07 11:35 ` dkwo
  2021-09-07 17:13 ` [PR REVIEW] " ericonr
                   ` (12 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-09-07 11:35 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-914228544

Comment:
Switching back to gtk-doc temporarily.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (67 preceding siblings ...)
  2021-09-07 11:35 ` dkwo
@ 2021-09-07 17:13 ` ericonr
  2021-09-07 17:22 ` ericonr
                   ` (11 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-09-07 17:13 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r703692154

Comment:
Ok, thanks for checking!

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (68 preceding siblings ...)
  2021-09-07 17:13 ` [PR REVIEW] " ericonr
@ 2021-09-07 17:22 ` ericonr
  2021-09-07 19:31 ` [PR PATCH] [Updated] " dkwo
                   ` (10 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-09-07 17:22 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r703697885

Comment:
ok! last nit I think: the commit message should mention we are still using `gtk-doc`, but we are going to move to `gi-docgen` (assuming that's the plan), and there should be a comment in this line explaining what the deal is. Also it should look like:

`#vmove ....` instead of `#     vmove`

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (69 preceding siblings ...)
  2021-09-07 17:22 ` ericonr
@ 2021-09-07 19:31 ` dkwo
  2021-09-07 19:39 ` [PR REVIEW] " dkwo
                   ` (9 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-09-07 19:31 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From f18080850dee04f32d3ebbffb3ec53a826072eb7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..f6df8370a503
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,23 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+archs="x86_64* i686* arm* aarch64*"
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From c8b93755582665501f0e7df1d05c08be470bf7f2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

we keep gtk-doc, but plan to switch to gi-docgen
once issue 3718 with new gi-docgen is fixed
see https://github.com/fwupd/fwupd/issues/3718
---
 srcpkgs/fwupd/patches/fu-hash.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/gicross.patch | 21 ++++++++++++++
 srcpkgs/fwupd/patches/musl.patch    | 44 -----------------------------
 srcpkgs/fwupd/template              | 41 +++++++++------------------
 4 files changed, 56 insertions(+), 71 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 create mode 100644 srcpkgs/fwupd/patches/gicross.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/gicross.patch b/srcpkgs/fwupd/patches/gicross.patch
new file mode 100644
index 000000000000..e720898f3545
--- /dev/null
+++ 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')
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..5b1ecfc4356b 100644
--- 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 -Ddocs=gtkdoc"
+hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen
+ vala glib-devel polkit gettext pango python3-gobject python3-Pillow gtk-doc"
 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,8 @@ fwupd-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
 		vmove usr/share/vala
+		# temporarily switch back to gtk-doc
+		#vmove usr/share/doc
 		vmove usr/share/gtk-doc
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (70 preceding siblings ...)
  2021-09-07 19:31 ` [PR PATCH] [Updated] " dkwo
@ 2021-09-07 19:39 ` dkwo
  2021-09-07 19:42 ` dkwo
                   ` (8 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-09-07 19:39 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r703780188

Comment:
Done.
Indeed, once the issue with gi-docgen is fixed, we should switch to it.
Presumably at next release, where all our other patches will be discarded as well.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR REVIEW] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (71 preceding siblings ...)
  2021-09-07 19:39 ` [PR REVIEW] " dkwo
@ 2021-09-07 19:42 ` dkwo
  2021-09-07 20:32 ` paper42
                   ` (7 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-09-07 19:42 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#discussion_r703781685

Comment:
Actually, `efivar` and `gnu-efi-libs` could be removed, which I did, and it still builds fine.
Had to keep the new `fwupd-efi` in both deps and makedeps though, otherwise it would fail or not pick it up as deps.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (72 preceding siblings ...)
  2021-09-07 19:42 ` dkwo
@ 2021-09-07 20:32 ` paper42
  2021-09-08  7:18 ` [PR PATCH] [Updated] " dkwo
                   ` (6 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-09-07 20:32 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-914611622

Comment:
@dkwo the error with new gi-docgen is fixed in https://github.com/fwupd/fwupd/pull/3721, can you import it as a patch and switch back to gi-docgen? I will make sure to test all packages (including open PRs) on the next gi-docgen update.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (73 preceding siblings ...)
  2021-09-07 20:32 ` paper42
@ 2021-09-08  7:18 ` dkwo
  2021-09-08  7:21 ` dkwo
                   ` (5 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-09-08  7:18 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages fwupd
https://github.com/void-linux/void-packages/pull/32636

fwupd: update to 1.6.3
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


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

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

From 7f85b4bf7d5975f89ce92f69cb8ac145b9cf9a1a Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0200
Subject: [PATCH 1/2] New package: fwupd-efi 1.1

---
 srcpkgs/fwupd-efi/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/fwupd-efi/template

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
new file mode 100644
index 000000000000..f6df8370a503
--- /dev/null
+++ b/srcpkgs/fwupd-efi/template
@@ -0,0 +1,23 @@
+# Template file for 'fwupd-efi'
+pkgname=fwupd-efi
+version=1.1
+revision=1
+archs="x86_64* i686* arm* aarch64*"
+build_style=meson
+build_helper="gir"
+configure_args="-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"
+hostmakedepends="efivar"
+makedepends="libefivar-devel gnu-efi-libs"
+short_desc="EFI Application used by uefi-capsule plugin in fwupd"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fwupd/fwupd-efi"
+distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
+checksum=a11da90f88b06f2733760b4dcb7450d5e8dc8bf94d0ba7fccd62a9b67e995429
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
+fi

From cc582ba08070f237fa668ceeb4ed6a2c5895b37f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 26 May 2021 18:00:16 +0200
Subject: [PATCH 2/2] fwupd: update to 1.6.3

---
 srcpkgs/fwupd/patches/fu-hash.patch  | 21 ++++++
 srcpkgs/fwupd/patches/gicross.patch  | 21 ++++++
 srcpkgs/fwupd/patches/gidocgen.patch | 95 ++++++++++++++++++++++++++++
 srcpkgs/fwupd/patches/musl.patch     | 44 -------------
 srcpkgs/fwupd/template               | 41 ++++--------
 5 files changed, 150 insertions(+), 72 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/fu-hash.patch
 create mode 100644 srcpkgs/fwupd/patches/gicross.patch
 create mode 100644 srcpkgs/fwupd/patches/gidocgen.patch
 delete mode 100644 srcpkgs/fwupd/patches/musl.patch

diff --git a/srcpkgs/fwupd/patches/fu-hash.patch b/srcpkgs/fwupd/patches/fu-hash.patch
new file mode 100644
index 000000000000..49a4c0b37454
--- /dev/null
+++ 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',
diff --git a/srcpkgs/fwupd/patches/gicross.patch b/srcpkgs/fwupd/patches/gicross.patch
new file mode 100644
index 000000000000..e720898f3545
--- /dev/null
+++ 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')
diff --git a/srcpkgs/fwupd/patches/gidocgen.patch b/srcpkgs/fwupd/patches/gidocgen.patch
new file mode 100644
index 000000000000..4d5effb68927
--- /dev/null
+++ 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/' ],
++]
+
diff --git a/srcpkgs/fwupd/patches/musl.patch b/srcpkgs/fwupd/patches/musl.patch
deleted file mode 100644
index fd7dfb19308b..000000000000
--- a/srcpkgs/fwupd/patches/musl.patch
+++ /dev/null
@@ -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"));
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 6e6612d9bfd9..afe369923922 100644
--- 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
 	}
 }

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (74 preceding siblings ...)
  2021-09-08  7:18 ` [PR PATCH] [Updated] " dkwo
@ 2021-09-08  7:21 ` dkwo
  2021-09-08 17:26 ` ericonr
                   ` (4 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: dkwo @ 2021-09-08  7:21 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-914986673

Comment:
Switched to gi-docgen, with the patch provided upstream.
Note all the patches are already merged upstream, so on next release they can be dropped.
I've been asked to contribute this to fwupd ci once it is approved, do you know what should be done?

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (75 preceding siblings ...)
  2021-09-08  7:21 ` dkwo
@ 2021-09-08 17:26 ` ericonr
  2021-09-08 17:26 ` [PR PATCH] [Merged]: " ericonr
                   ` (3 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-09-08 17:26 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-915429159

Comment:
I saw the suggestion, I'm not sure how to plug new builds into xbps-src. Have been thinking about it recently to figure something out, but nothing concrete has come out yet.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: [PR PATCH] [Merged]: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (76 preceding siblings ...)
  2021-09-08 17:26 ` ericonr
@ 2021-09-08 17:26 ` ericonr
  2021-09-08 17:26 ` ericonr
                   ` (2 subsequent siblings)
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-09-08 17:26 UTC (permalink / raw)
  To: ml

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

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

fwupd: update to 1.6.3
https://github.com/void-linux/void-packages/pull/32636

Description:
I have build error.
Any obvious mistake @ericonr ?
Will need to change some config options as well.


^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (77 preceding siblings ...)
  2021-09-08 17:26 ` [PR PATCH] [Merged]: " ericonr
@ 2021-09-08 17:26 ` ericonr
  2021-09-08 17:44 ` paper42
  2021-09-08 17:45 ` paper42
  80 siblings, 0 replies; 82+ messages in thread
From: ericonr @ 2021-09-08 17:26 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-915429326

Comment:
Thanks for the update, too!

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (78 preceding siblings ...)
  2021-09-08 17:26 ` ericonr
@ 2021-09-08 17:44 ` paper42
  2021-09-08 17:45 ` paper42
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-09-08 17:44 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-915441447

Comment:
> I've been asked to contribute this to fwupd ci once it is approved, do you know what should be done?

They are running a build in a void container right now. Eventually it would be nice to run a regular xbps-src build. Right now we could enable building docs with gi-docgen. Of course that will not show cross compilation issues.

^ permalink raw reply	[flat|nested] 82+ messages in thread

* Re: fwupd: update to 1.6.3
  2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
                   ` (79 preceding siblings ...)
  2021-09-08 17:44 ` paper42
@ 2021-09-08 17:45 ` paper42
  80 siblings, 0 replies; 82+ messages in thread
From: paper42 @ 2021-09-08 17:45 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32636#issuecomment-915441447

Comment:
> I've been asked to contribute this to fwupd ci once it is approved, do you know what should be done?

They are running a build in a void container right now. Eventually it would be nice to run a regular xbps-src build. Right now we could enable building docs with gi-docgen, but of course that will not show cross compilation issues.

^ permalink raw reply	[flat|nested] 82+ messages in thread

end of thread, other threads:[~2021-09-08 17:45 UTC | newest]

Thread overview: 82+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-22 18:20 [PR PATCH] [wip] fwupd: update to 1.6.3 dkwo
2021-08-22 19:39 ` ericonr
2021-08-22 19:42 ` ericonr
2021-08-23  7:35 ` [PR PATCH] [Updated] " dkwo
2021-08-23  8:01 ` [PR PATCH] [Updated] " dkwo
2021-08-23  8:06 ` dkwo
2021-08-23  8:16 ` dkwo
2021-08-23  8:16 ` dkwo
2021-08-23  8:28 ` [PR PATCH] [Updated] " dkwo
2021-08-23  8:37 ` dkwo
2021-08-23  8:39 ` [PR PATCH] [Updated] " dkwo
2021-08-23 12:12 ` [PR REVIEW] " ericonr
2021-08-23 12:28 ` [PR PATCH] [Updated] " dkwo
2021-08-23 12:41 ` dkwo
2021-08-23 12:42 ` [PR REVIEW] " dkwo
2021-08-23 12:43 ` paper42
2021-08-23 12:45 ` [PR PATCH] [Updated] " dkwo
2021-08-23 12:54 ` dkwo
2021-08-23 16:11 ` [PR REVIEW] " paper42
2021-08-23 16:11 ` paper42
2021-08-23 16:12 ` paper42
2021-08-23 16:12 ` paper42
2021-08-23 16:13 ` paper42
2021-08-23 16:13 ` paper42
2021-08-23 16:38 ` ericonr
2021-08-23 16:49 ` dkwo
2021-08-23 16:57 ` dkwo
2021-08-23 17:00 ` [PR PATCH] [Updated] " dkwo
2021-08-23 17:06 ` [PR REVIEW] " dkwo
2021-08-23 17:08 ` [PR PATCH] [Updated] " dkwo
2021-08-23 17:10 ` [PR REVIEW] " dkwo
2021-08-23 17:11 ` paper42
2021-08-23 17:17 ` paper42
2021-08-23 17:18 ` dkwo
2021-08-23 17:18 ` dkwo
2021-08-23 17:19 ` ericonr
2021-08-23 17:33 ` paper42
2021-08-23 17:39 ` paper42
2021-08-23 17:56 ` paper42
2021-08-23 17:56 ` paper42
2021-08-23 18:32 ` dkwo
2021-08-23 18:33 ` dkwo
2021-08-23 18:34 ` dkwo
2021-08-23 18:34 ` dkwo
2021-08-23 18:36 ` [PR PATCH] [Updated] " dkwo
2021-08-23 18:47 ` dkwo
2021-08-23 18:48 ` [PR REVIEW] " dkwo
2021-08-23 18:48 ` paper42
2021-08-23 18:49 ` [PR PATCH] [Updated] " dkwo
2021-08-23 19:32 ` paper42
2021-08-24  6:54 ` dkwo
2021-08-24  6:55 ` [PR PATCH] [Updated] " dkwo
2021-08-24  6:56 ` maxice8
2021-08-27 17:44 ` [PR REVIEW] " ericonr
2021-08-28  9:05 ` dkwo
2021-08-29 19:52 ` ericonr
2021-08-30  7:28 ` [PR PATCH] [Updated] " dkwo
2021-08-30  7:30 ` [PR REVIEW] " dkwo
2021-09-06 18:31 ` ericonr
2021-09-06 18:31 ` ericonr
2021-09-06 18:31 ` ericonr
2021-09-06 18:37 ` ericonr
2021-09-07  8:08 ` [PR REVIEW] " dkwo
2021-09-07  8:08 ` dkwo
2021-09-07  8:09 ` [PR REVIEW] " dkwo
2021-09-07  8:21 ` [PR PATCH] [Updated] " dkwo
2021-09-07  8:38 ` [PR REVIEW] " dkwo
2021-09-07 11:35 ` [PR PATCH] [Updated] " dkwo
2021-09-07 11:35 ` dkwo
2021-09-07 17:13 ` [PR REVIEW] " ericonr
2021-09-07 17:22 ` ericonr
2021-09-07 19:31 ` [PR PATCH] [Updated] " dkwo
2021-09-07 19:39 ` [PR REVIEW] " dkwo
2021-09-07 19:42 ` dkwo
2021-09-07 20:32 ` paper42
2021-09-08  7:18 ` [PR PATCH] [Updated] " dkwo
2021-09-08  7:21 ` dkwo
2021-09-08 17:26 ` ericonr
2021-09-08 17:26 ` [PR PATCH] [Merged]: " ericonr
2021-09-08 17:26 ` ericonr
2021-09-08 17:44 ` paper42
2021-09-08 17:45 ` paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).