Github messages for voidlinux
 help / color / mirror / Atom feed
From: dkwo <dkwo@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] fwupd: update to 1.6.3
Date: Mon, 23 Aug 2021 10:06:18 +0200	[thread overview]
Message-ID: <20210823080618.P5y1rQV-bl4wUnr1y97I3bt8H-pNlfbxazOP-4wsnT0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32636@inbox.vuxu.org>

[-- 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
 	}
 }

  parent reply	other threads:[~2021-08-23  8:06 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-22 18:20 [PR PATCH] [wip] " 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 [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210823080618.P5y1rQV-bl4wUnr1y97I3bt8H-pNlfbxazOP-4wsnT0@z \
    --to=dkwo@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).