[PR PATCH] fwupd + libjcat update

[PR PATCH] fwupd + libjcat update

[dataCobra]

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

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

https://github.com/dataCobra/void-packages fwupd
https://github.com/void-linux/void-packages/pull/52372

fwupd + libjcat update
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

`fwupd` does need the new version of `libjcat`.

Since `libjcat` is only used for `fwupd` I put both updates into this PR.


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

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

From 05633dbddfb6554b0b592978134c785e87459de9 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 27 Sep 2024 11:36:08 +0200
Subject: [PATCH 1/2] libjcat: update to 0.2.1.

---
 srcpkgs/libjcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libjcat/template b/srcpkgs/libjcat/template
index 4d01dbccd4aab5..f1136f13503129 100644
--- a/srcpkgs/libjcat/template
+++ b/srcpkgs/libjcat/template
@@ -1,6 +1,6 @@
 # Template file for 'libjcat'
 pkgname=libjcat
-version=0.1.14
+version=0.2.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="marmeladema <xademax@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libjcat"
 distfiles="https://github.com/hughsie/libjcat/archive/${version}.tar.gz"
-checksum=e754051419d9955cfa4dcf4503aa86105c45bcbb5e95222a938ba95cc8f0569b
+checksum=f623815ac855471277dc9d1b3b5ada1a9aaad6da67659c751dc3dec899dc2658
 
 jcat-tool_package() {
 	short_desc+=" - tools"

From 59bbbfb79aea640e119f5bca02923b178c8a7710 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 27 Sep 2024 11:37:21 +0200
Subject: [PATCH 2/2] fwupd: update to 1.9.25.

---
 srcpkgs/fwupd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 06af297a89e72d..38da5a4f0315db 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.9.24
+version=1.9.25
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -25,7 +25,7 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd"
 changelog="https://github.com/fwupd/fwupd/releases"
 distfiles="https://github.com/fwupd/fwupd/archive/${version}.tar.gz"
-checksum=8a8785be525551ee70fa6e747f2a23ba5873f5f3a9c66f614c1d28b7f994e960
+checksum=dff657b9ebae0f93baba9a9bab45806db28a6a5e444eb912dfc3f78dd8c0407b
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in

Re: fwupd + libjcat update

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/52372#issuecomment-2379184575

Comment:
Hey, do you mind also updating `fwupd-efi`?

Re: fwupd + libjcat update

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52372#issuecomment-2380588808

Comment:
> Hey, do you mind also updating `fwupd-efi`?

I can also update `fwupd-efi` but it seems not to be trivial so I would create a separate PR for that.

Re: [PR PATCH] [Updated] fwupd + libjcat update

[dataCobra]

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

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

https://github.com/dataCobra/void-packages fwupd
https://github.com/void-linux/void-packages/pull/52372

fwupd + libjcat update
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

`fwupd` does need the new version of `libjcat`.

Since `libjcat` is only used for `fwupd` I put both updates into this PR.


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

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

From 0c57050beef6b9a4004c50c56252225a9b536f93 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 27 Sep 2024 11:36:08 +0200
Subject: [PATCH 1/2] libjcat: update to 0.2.1.

---
 srcpkgs/libjcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libjcat/template b/srcpkgs/libjcat/template
index 4d01dbccd4aab5..f1136f13503129 100644
--- a/srcpkgs/libjcat/template
+++ b/srcpkgs/libjcat/template
@@ -1,6 +1,6 @@
 # Template file for 'libjcat'
 pkgname=libjcat
-version=0.1.14
+version=0.2.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="marmeladema <xademax@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libjcat"
 distfiles="https://github.com/hughsie/libjcat/archive/${version}.tar.gz"
-checksum=e754051419d9955cfa4dcf4503aa86105c45bcbb5e95222a938ba95cc8f0569b
+checksum=f623815ac855471277dc9d1b3b5ada1a9aaad6da67659c751dc3dec899dc2658
 
 jcat-tool_package() {
 	short_desc+=" - tools"

From 36382bc8b5415627bbdfd7d539d84721c535f3df Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 27 Sep 2024 11:37:21 +0200
Subject: [PATCH 2/2] fwupd: update to 1.9.25.

---
 srcpkgs/fwupd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 06af297a89e72d..38da5a4f0315db 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.9.24
+version=1.9.25
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -25,7 +25,7 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd"
 changelog="https://github.com/fwupd/fwupd/releases"
 distfiles="https://github.com/fwupd/fwupd/archive/${version}.tar.gz"
-checksum=8a8785be525551ee70fa6e747f2a23ba5873f5f3a9c66f614c1d28b7f994e960
+checksum=dff657b9ebae0f93baba9a9bab45806db28a6a5e444eb912dfc3f78dd8c0407b
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in

Re: fwupd + libjcat update

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/52372#issuecomment-2394551435

Comment:
it may not be necessary anymore to carry the patch disabling test: that test has been moved to test-slow, which should be disabled by default (at least in qemu). can you try dropping it?

Re: fwupd + libjcat update

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/52372#issuecomment-2395103115

Comment:
Also, v2.0 is out with many changes in case you're interested.

Re: fwupd + libjcat update

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52372#issuecomment-2395103828

Comment:
Currently in the work of getting 2.0 to work.

Re: fwupd + libjcat update

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52372#issuecomment-2404218148

Comment:
The major update does need way more tinkering and testing.

We should update to this version while I'm still working on the big update.

Re: [PR PATCH] [Updated] fwupd + libjcat update

[dataCobra]

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

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

https://github.com/dataCobra/void-packages fwupd
https://github.com/void-linux/void-packages/pull/52372

fwupd + libjcat update
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

`fwupd` does need the new version of `libjcat`.

Since `libjcat` is only used for `fwupd` I put both updates into this PR.


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

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

From 8060be23872b047009cd9d17b4c1cc39ffe17a32 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 28 Sep 2024 14:25:45 +0200
Subject: [PATCH 1/5] gnu-efi-libs: update to 3.0.18.

---
 srcpkgs/gnu-efi-libs/patches/riscv64.patch | 22 ----------------------
 srcpkgs/gnu-efi-libs/template              |  4 ++--
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/gnu-efi-libs/patches/riscv64.patch

diff --git a/srcpkgs/gnu-efi-libs/patches/riscv64.patch b/srcpkgs/gnu-efi-libs/patches/riscv64.patch
deleted file mode 100644
index eb10d1bb176c66..00000000000000
--- a/srcpkgs/gnu-efi-libs/patches/riscv64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-riscv64: adjust type definitions
-
-CHAR8 needs to be defined while BOOLEAN should be removed
-here to prevent typedef conflicts
-
-Source: https://sourceforge.net/p/gnu-efi/code/ci/1de509497826faa0ad84b82f5e2c3d21ee613459/
----
---- a/inc/riscv64/efibind.h	2023-05-02 13:51:45.000000000 +0200
-+++ -	2024-02-16 17:14:57.455180520 +0100
-@@ -32,11 +32,9 @@
- typedef int16_t                 INT16;
- typedef uint8_t                 UINT8;
- typedef int8_t                  INT8;
-+typedef char                    CHAR8;
- typedef wchar_t                 CHAR16;
- #define WCHAR                   CHAR16
--#ifndef BOOLEAN
--typedef uint8_t                 BOOLEAN;
--#endif
- #undef VOID
- typedef void                    VOID;
- typedef int64_t                 INTN;
diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
index 5c25df7ef5b3d5..c47d33046f2020 100644
--- a/srcpkgs/gnu-efi-libs/template
+++ b/srcpkgs/gnu-efi-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'gnu-efi-libs'
 pkgname=gnu-efi-libs
 reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8
-version=3.0.17
+version=3.0.18
 revision=1
 makedepends="pciutils-devel"
 short_desc="Library for building UEFI Applications using GNU toolchain"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/gnu-efi/"
 distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2"
-checksum=7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4
+checksum=7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c
 nostrip=yes
 
 # If we are cross-building we need to pass the cross-compilation triplet

From 0b6bbe304faa88766368149ae42a68ca9cc4aead Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Oct 2024 09:17:28 +0200
Subject: [PATCH 2/5] fwupd-efi: update to 1.7, orphan.

---
 srcpkgs/fwupd-efi/patches/cc-as-ld.patch | 78 ------------------------
 srcpkgs/fwupd-efi/template               |  8 +--
 2 files changed, 4 insertions(+), 82 deletions(-)
 delete mode 100644 srcpkgs/fwupd-efi/patches/cc-as-ld.patch

diff --git a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch b/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
deleted file mode 100644
index 67092dd0fb6792..00000000000000
--- a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -9,7 +9,6 @@
- conf.set_quoted('PACKAGE_VERSION', meson.project_version())
- 
- cc = meson.get_compiler('c')
--ld = cc.get_linker_id()
- objcopy = find_program('objcopy')
- objcopy_version = run_command(objcopy, '--version').stdout().split('\n')[0].split(' ')[-1]
- 
---- a/efi/generate_binary.py
-+++ b/efi/generate_binary.py
-@@ -29,9 +29,9 @@
-         "-j",
-         ".rodata",
-         "-j",
-+        ".areloc",
-+        "-j",
-         ".rel*",
--        "--section-alignment",
--        "512",
-         args.infile,
-         args.outfile,
-     ]
---- a/efi/meson.build
-+++ b/efi/meson.build
-@@ -72,6 +72,11 @@
-         coff_header_in_crt0 = false
- endif
- 
-+# For NX compat, we must ensure we have .note.GNU-stack
-+if run_command('grep', '-q', '.note.GNU-stack', join_paths(efi_crtdir, arch_crt), check: false).returncode() != 0
-+    error('Cannot find NX section in @0@, update to gnu-efi 3.0.15+'.format(join_paths(efi_crtdir, arch_crt)))
-+endif
-+
- # older objcopy for Aarch64 and ARM32 are not EFI capable.
- # Use 'binary' instead, and add required symbols manually.
- if host_cpu == 'arm' or (host_cpu == 'aarch64' and (objcopy_version.version_compare ('< 2.38') or coff_header_in_crt0))
-@@ -95,7 +100,6 @@
- # is the system crt0 for arm and aarch64 new enough to know about SBAT?
- if objcopy_manualsymbols
-   if get_option('efi_sbat_distro_id') != ''
--    arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch)
-     cmd = run_command('grep', '-q', 'sbat', join_paths(efi_crtdir, arch_crt))
-     if cmd.returncode() != 0
-       warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt)))
-@@ -163,6 +167,12 @@
-                '-L', efi_libdir,
-                join_paths(efi_crtdir, arch_crt)]
- 
-+if host_cpu == 'aarch64'
-+# Don't use 64KiB pages
-+  efi_ldflags += ['-z', 'common-page-size=4096']
-+  efi_ldflags += ['-z', 'max-page-size=4096']
-+endif
-+
- if objcopy_manualsymbols
-   # older objcopy for Aarch64 and ARM32 are not EFI capable.
-   # Use 'binary' instead, and add required symbols manually.
-@@ -223,11 +233,16 @@
-   fwupd_so_deps += [o_crt0]
- endif
- 
-+efi_cc_ldflags = []
-+foreach flag : efi_ldflags
-+  efi_cc_ldflags += ['-Wl,' + flag]
-+endforeach
-+
- so = custom_target('fwup.so',
-                    input : [o_file1, o_file2, o_file3, o_file4, o_file5],
-                    output : 'fwup.so',
--                   command : [ld, '-o', '@OUTPUT@'] +
--                             efi_ldflags + ['@INPUT@'] +
-+                   command : [cc.cmd_array(), '-nostdlib', '-o', '@OUTPUT@'] +
-+                             efi_cc_ldflags + ['@INPUT@'] +
-                              ['-lefi', '-lgnuefi', libgcc_file_name],
-                    depends: fwupd_so_deps)
- 
diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
index 2d811f6165f51f..75a40c82847b13 100644
--- a/srcpkgs/fwupd-efi/template
+++ b/srcpkgs/fwupd-efi/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd-efi'
 pkgname=fwupd-efi
-version=1.4
+version=1.7
 revision=1
 archs="x86_64* i686* arm* aarch64*"
 build_style=meson
@@ -8,11 +8,11 @@ build_helper="gir"
 configure_args="-Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
  -Defi-ldsdir=${XBPS_CROSS_BASE}/usr/lib
  -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="efivar python3-pefile"
+hostmakedepends="efivar python3-pefile cmake pkg-config"
 makedepends="libefivar-devel gnu-efi-libs"
 short_desc="EFI Application used by uefi-capsule plugin in fwupd"
-maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 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=b1f5fe72e16d4e2f4c616da416dc93bd79331057336208465da37bafe8f8f83d
+checksum=96d4fc45467159b2664ce86ee7d5030e265fdb4d4a4d774080654d2f5b1561ff

From 1e50d8ffc3dbde947587a159e6e780a6d05793e1 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 27 Sep 2024 11:36:08 +0200
Subject: [PATCH 3/5] libjcat: update to 0.2.1.

---
 srcpkgs/libjcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libjcat/template b/srcpkgs/libjcat/template
index 4d01dbccd4aab5..f1136f13503129 100644
--- a/srcpkgs/libjcat/template
+++ b/srcpkgs/libjcat/template
@@ -1,6 +1,6 @@
 # Template file for 'libjcat'
 pkgname=libjcat
-version=0.1.14
+version=0.2.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="marmeladema <xademax@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libjcat"
 distfiles="https://github.com/hughsie/libjcat/archive/${version}.tar.gz"
-checksum=e754051419d9955cfa4dcf4503aa86105c45bcbb5e95222a938ba95cc8f0569b
+checksum=f623815ac855471277dc9d1b3b5ada1a9aaad6da67659c751dc3dec899dc2658
 
 jcat-tool_package() {
 	short_desc+=" - tools"

From 12ed95633a93cc1aa5e4d581d610705ab0ea1275 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Oct 2024 16:09:55 +0200
Subject: [PATCH 4/5] flashrom: update to 1.4.0, add -devel package.

---
 common/shlibs             |  1 +
 srcpkgs/flashrom-devel    |  1 +
 srcpkgs/flashrom/template | 27 ++++++++++++++++++++-------
 3 files changed, 22 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/flashrom-devel

diff --git a/common/shlibs b/common/shlibs
index 95f5918baf9991..ebe8232591b816 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4534,3 +4534,4 @@ libsfdo-basedir.so.0 libsfdo-0.1.3_1
 libsfdo-desktop.so.0 libsfdo-0.1.3_1
 libsfdo-desktop-file.so.0 libsfdo-0.1.3_1
 libsfdo-icon.so.0 libsfdo-0.1.3_1
+libflashrom.so.1 flashrom-1.4.0_1
diff --git a/srcpkgs/flashrom-devel b/srcpkgs/flashrom-devel
new file mode 120000
index 00000000000000..183c7f43a41c8d
--- /dev/null
+++ b/srcpkgs/flashrom-devel
@@ -0,0 +1 @@
+flashrom
\ No newline at end of file
diff --git a/srcpkgs/flashrom/template b/srcpkgs/flashrom/template
index 849ffa47b6863f..889d883e0f54b0 100644
--- a/srcpkgs/flashrom/template
+++ b/srcpkgs/flashrom/template
@@ -1,17 +1,30 @@
 # Template file for 'flashrom'
 pkgname=flashrom
-version=1.3.0
+version=1.4.0
 revision=1
-build_style=gnu-makefile
-hostmakedepends="pkg-config"
-makedepends="pciutils-devel libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel"
+build_style=meson
+configure_args="-Duse_internal_dmi=false -Ddocumentation=enabled"
+hostmakedepends="pkg-config python3-Sphinx"
+makedepends="pciutils-devel libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel libjaylink-devel"
+depends="dmidecode"
 short_desc="Utility for reading, writing, erasing and verifying flash ROM chips"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.flashrom.org"
 distfiles=https://github.com/flashrom/flashrom/archive/v$version.tar.gz
-checksum=91d3ae239e435682561966350d00890b8bf5ae1a947af1f647198aa391196890
+checksum=b77ce458b3b874387270a71805e899ac63f057d7553dc320da7e4c58e750577c
+make_check=no # can't run without special setup..?
 
-post_patch() {
-	vsed -i 's/sbin/bin/' Makefile
+flashrom-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} pciutils-devel
+	 libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel
+	 libjaylink-devel python3-Sphinx"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+		vmove usr/share/doc
+	}
 }

From 94b358be6b5a3a7316ba8978c166fea11c973379 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Oct 2024 16:10:14 +0200
Subject: [PATCH 5/5] fwupd: update to 2.0.0.

---
 ...c35339111d92add461fc3ad2a032e90abc9c.patch | 32 +++++++++++++++++++
 srcpkgs/fwupd/template                        | 13 +++++---
 2 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/9637c35339111d92add461fc3ad2a032e90abc9c.patch

diff --git a/srcpkgs/fwupd/patches/9637c35339111d92add461fc3ad2a032e90abc9c.patch b/srcpkgs/fwupd/patches/9637c35339111d92add461fc3ad2a032e90abc9c.patch
new file mode 100644
index 00000000000000..b31fe2804b4d1c
--- /dev/null
+++ b/srcpkgs/fwupd/patches/9637c35339111d92add461fc3ad2a032e90abc9c.patch
@@ -0,0 +1,32 @@
+From 9637c35339111d92add461fc3ad2a032e90abc9c Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Fri, 4 Oct 2024 18:18:29 +0200
+Subject: [PATCH] meson: fix source version outside git
+
+when git is not found the whole conf var is skipped, and that fails to compile
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 08fb1bc141c..20241cef418 100644
+--- a/meson.build
++++ b/meson.build
+@@ -18,6 +18,7 @@ conf.set('MICRO_VERSION', fwupd_micro_version)
+ conf.set_quoted('PACKAGE_VERSION', fwupd_version)
+ 
+ # get source version, falling back to package version
++source_version = fwupd_version
+ git = find_program('git', required: false)
+ tag = false
+ if git.found()
+@@ -26,8 +27,8 @@ if git.found()
+     source_version = fwupd_version
+   endif
+   tag = run_command([git, 'describe', '--exact-match'], check: false).returncode() == 0
+-  conf.set_quoted('SOURCE_VERSION', source_version)
+ endif
++conf.set_quoted('SOURCE_VERSION', source_version)
+ 
+ # libtool versioning - this applies to libfwupd
+ #
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 06af297a89e72d..8b7992c99c3071 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.9.24
+version=2.0.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -12,8 +12,9 @@ hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen vala
  protobuf-c-devel"
 makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel
  gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel
- sqlite-devel gcab-devel pango-devel elogind-devel
- tpm2-tss-devel libjcat-devel libcurl-devel protobuf-c-devel"
+ sqlite-devel gcab-devel pango-devel elogind-devel flashrom-devel
+ tpm2-tss-devel libjcat-devel libcurl-devel protobuf-c-devel pciutils-devel
+ gi-docgen"
 depends="dbus udisks2"
 checkdepends="umockdev"
 conf_files="
@@ -25,7 +26,7 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd"
 changelog="https://github.com/fwupd/fwupd/releases"
 distfiles="https://github.com/fwupd/fwupd/archive/${version}.tar.gz"
-checksum=8a8785be525551ee70fa6e747f2a23ba5873f5f3a9c66f614c1d28b7f994e960
+checksum=6957160bd6fb8f4e126f538d387f3b5fe8a591440fae3ec7a793fee31ffd5e81
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -55,6 +56,10 @@ pre_build() {
 	fi
 }
 
+if [ -n "$CROSS_BUILD" ]; then
+	configure_args+=" -Dvendor_ids_dir=${XBPS_CROSS_BASE}/usr/share/hwdata/"
+fi
+
 post_install() {
 	vcompletion data/bash-completion/fwupdmgr bash fwupdmgr
 	vcompletion data/bash-completion/fwupdtool bash fwupdtool

Re: fwupd + libjcat update

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52372#issuecomment-2405210886

Comment:
To make sure everything works together as intended I've updates this PR.

Re: fwupd(-efi), libjcat, flashrom, gnu-efi-libs update and compatibility checks.

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52372#issuecomment-2406750953

Comment:
Tested the whole functionality successful on a Laptop.

:white_check_mark: -> fwupd
:whi

Re: fwupd(-efi), libjcat, flashrom, gnu-efi-libs update and compatibility checks.

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52372#issuecomment-2406750953

Comment:
Tested the whole functionality successful on a Laptop.

:white_check_mark: -> fwupd
:whit

Re: fwupd(-efi), libjcat, flashrom, gnu-efi-libs update and compatibility checks.

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52372#issuecomment-2406750953

Comment:
Tested the whole functionality successful on a Laptop.

:white_check_mark: -> fwupd (+ dependencies)
:white_check_mark: -> fwupd-efi (+ dependencies)

Re: [PR PATCH] [Updated] fwupd(-efi), libjcat, flashrom, gnu-efi-libs update and compatibility checks.

[dataCobra]

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

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

https://github.com/dataCobra/void-packages fwupd
https://github.com/void-linux/void-packages/pull/52372

fwupd(-efi), libjcat, flashrom, gnu-efi-libs update and compatibility checks.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64 (cross)
  - armv7l (cross)

`fwupd` does need the new version of `libjcat`.

Since `libjcat` is only used for `fwupd` I put both updates into this PR.


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

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

From 6323aab45ad874b767e1f0130db4ab2c23166305 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 28 Sep 2024 14:25:45 +0200
Subject: [PATCH 1/5] gnu-efi-libs: update to 3.0.18.

---
 srcpkgs/gnu-efi-libs/patches/riscv64.patch | 22 ----------------------
 srcpkgs/gnu-efi-libs/template              |  4 ++--
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/gnu-efi-libs/patches/riscv64.patch

diff --git a/srcpkgs/gnu-efi-libs/patches/riscv64.patch b/srcpkgs/gnu-efi-libs/patches/riscv64.patch
deleted file mode 100644
index eb10d1bb176c66..00000000000000
--- a/srcpkgs/gnu-efi-libs/patches/riscv64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-riscv64: adjust type definitions
-
-CHAR8 needs to be defined while BOOLEAN should be removed
-here to prevent typedef conflicts
-
-Source: https://sourceforge.net/p/gnu-efi/code/ci/1de509497826faa0ad84b82f5e2c3d21ee613459/
----
---- a/inc/riscv64/efibind.h	2023-05-02 13:51:45.000000000 +0200
-+++ -	2024-02-16 17:14:57.455180520 +0100
-@@ -32,11 +32,9 @@
- typedef int16_t                 INT16;
- typedef uint8_t                 UINT8;
- typedef int8_t                  INT8;
-+typedef char                    CHAR8;
- typedef wchar_t                 CHAR16;
- #define WCHAR                   CHAR16
--#ifndef BOOLEAN
--typedef uint8_t                 BOOLEAN;
--#endif
- #undef VOID
- typedef void                    VOID;
- typedef int64_t                 INTN;
diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
index 5c25df7ef5b3d5..c47d33046f2020 100644
--- a/srcpkgs/gnu-efi-libs/template
+++ b/srcpkgs/gnu-efi-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'gnu-efi-libs'
 pkgname=gnu-efi-libs
 reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8
-version=3.0.17
+version=3.0.18
 revision=1
 makedepends="pciutils-devel"
 short_desc="Library for building UEFI Applications using GNU toolchain"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/gnu-efi/"
 distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2"
-checksum=7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4
+checksum=7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c
 nostrip=yes
 
 # If we are cross-building we need to pass the cross-compilation triplet

From 414a62982224ec8784f226814b72369e4b202acb Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Oct 2024 09:17:28 +0200
Subject: [PATCH 2/5] fwupd-efi: update to 1.7, orphan.

---
 srcpkgs/fwupd-efi/patches/cc-as-ld.patch | 78 ------------------------
 srcpkgs/fwupd-efi/template               |  8 +--
 2 files changed, 4 insertions(+), 82 deletions(-)
 delete mode 100644 srcpkgs/fwupd-efi/patches/cc-as-ld.patch

diff --git a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch b/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
deleted file mode 100644
index 67092dd0fb6792..00000000000000
--- a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -9,7 +9,6 @@
- conf.set_quoted('PACKAGE_VERSION', meson.project_version())
- 
- cc = meson.get_compiler('c')
--ld = cc.get_linker_id()
- objcopy = find_program('objcopy')
- objcopy_version = run_command(objcopy, '--version').stdout().split('\n')[0].split(' ')[-1]
- 
---- a/efi/generate_binary.py
-+++ b/efi/generate_binary.py
-@@ -29,9 +29,9 @@
-         "-j",
-         ".rodata",
-         "-j",
-+        ".areloc",
-+        "-j",
-         ".rel*",
--        "--section-alignment",
--        "512",
-         args.infile,
-         args.outfile,
-     ]
---- a/efi/meson.build
-+++ b/efi/meson.build
-@@ -72,6 +72,11 @@
-         coff_header_in_crt0 = false
- endif
- 
-+# For NX compat, we must ensure we have .note.GNU-stack
-+if run_command('grep', '-q', '.note.GNU-stack', join_paths(efi_crtdir, arch_crt), check: false).returncode() != 0
-+    error('Cannot find NX section in @0@, update to gnu-efi 3.0.15+'.format(join_paths(efi_crtdir, arch_crt)))
-+endif
-+
- # older objcopy for Aarch64 and ARM32 are not EFI capable.
- # Use 'binary' instead, and add required symbols manually.
- if host_cpu == 'arm' or (host_cpu == 'aarch64' and (objcopy_version.version_compare ('< 2.38') or coff_header_in_crt0))
-@@ -95,7 +100,6 @@
- # is the system crt0 for arm and aarch64 new enough to know about SBAT?
- if objcopy_manualsymbols
-   if get_option('efi_sbat_distro_id') != ''
--    arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch)
-     cmd = run_command('grep', '-q', 'sbat', join_paths(efi_crtdir, arch_crt))
-     if cmd.returncode() != 0
-       warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt)))
-@@ -163,6 +167,12 @@
-                '-L', efi_libdir,
-                join_paths(efi_crtdir, arch_crt)]
- 
-+if host_cpu == 'aarch64'
-+# Don't use 64KiB pages
-+  efi_ldflags += ['-z', 'common-page-size=4096']
-+  efi_ldflags += ['-z', 'max-page-size=4096']
-+endif
-+
- if objcopy_manualsymbols
-   # older objcopy for Aarch64 and ARM32 are not EFI capable.
-   # Use 'binary' instead, and add required symbols manually.
-@@ -223,11 +233,16 @@
-   fwupd_so_deps += [o_crt0]
- endif
- 
-+efi_cc_ldflags = []
-+foreach flag : efi_ldflags
-+  efi_cc_ldflags += ['-Wl,' + flag]
-+endforeach
-+
- so = custom_target('fwup.so',
-                    input : [o_file1, o_file2, o_file3, o_file4, o_file5],
-                    output : 'fwup.so',
--                   command : [ld, '-o', '@OUTPUT@'] +
--                             efi_ldflags + ['@INPUT@'] +
-+                   command : [cc.cmd_array(), '-nostdlib', '-o', '@OUTPUT@'] +
-+                             efi_cc_ldflags + ['@INPUT@'] +
-                              ['-lefi', '-lgnuefi', libgcc_file_name],
-                    depends: fwupd_so_deps)
- 
diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
index 2d811f6165f51f..75a40c82847b13 100644
--- a/srcpkgs/fwupd-efi/template
+++ b/srcpkgs/fwupd-efi/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd-efi'
 pkgname=fwupd-efi
-version=1.4
+version=1.7
 revision=1
 archs="x86_64* i686* arm* aarch64*"
 build_style=meson
@@ -8,11 +8,11 @@ build_helper="gir"
 configure_args="-Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
  -Defi-ldsdir=${XBPS_CROSS_BASE}/usr/lib
  -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="efivar python3-pefile"
+hostmakedepends="efivar python3-pefile cmake pkg-config"
 makedepends="libefivar-devel gnu-efi-libs"
 short_desc="EFI Application used by uefi-capsule plugin in fwupd"
-maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 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=b1f5fe72e16d4e2f4c616da416dc93bd79331057336208465da37bafe8f8f83d
+checksum=96d4fc45467159b2664ce86ee7d5030e265fdb4d4a4d774080654d2f5b1561ff

From 92ea4bd69fd1eb4199397ec42e4bf03770debcd4 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 27 Sep 2024 11:36:08 +0200
Subject: [PATCH 3/5] libjcat: update to 0.2.1.

---
 srcpkgs/libjcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libjcat/template b/srcpkgs/libjcat/template
index 4d01dbccd4aab5..f1136f13503129 100644
--- a/srcpkgs/libjcat/template
+++ b/srcpkgs/libjcat/template
@@ -1,6 +1,6 @@
 # Template file for 'libjcat'
 pkgname=libjcat
-version=0.1.14
+version=0.2.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="marmeladema <xademax@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libjcat"
 distfiles="https://github.com/hughsie/libjcat/archive/${version}.tar.gz"
-checksum=e754051419d9955cfa4dcf4503aa86105c45bcbb5e95222a938ba95cc8f0569b
+checksum=f623815ac855471277dc9d1b3b5ada1a9aaad6da67659c751dc3dec899dc2658
 
 jcat-tool_package() {
 	short_desc+=" - tools"

From 68a8384c71abd3db7a75fd408334c86efe0df4bd Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Oct 2024 16:09:55 +0200
Subject: [PATCH 4/5] flashrom: update to 1.4.0, add -devel package.

---
 common/shlibs             |  1 +
 srcpkgs/flashrom-devel    |  1 +
 srcpkgs/flashrom/template | 27 ++++++++++++++++++++-------
 3 files changed, 22 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/flashrom-devel

diff --git a/common/shlibs b/common/shlibs
index 3c9f4eea0659ac..73dc234b5d9e1f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4535,3 +4535,4 @@ libsfdo-desktop.so.0 libsfdo-0.1.3_1
 libsfdo-desktop-file.so.0 libsfdo-0.1.3_1
 libsfdo-icon.so.0 libsfdo-0.1.3_1
 libKMahjongg6.so.6 libkmahjongg-24.08.2_1
+libflashrom.so.1 flashrom-1.4.0_1
diff --git a/srcpkgs/flashrom-devel b/srcpkgs/flashrom-devel
new file mode 120000
index 00000000000000..183c7f43a41c8d
--- /dev/null
+++ b/srcpkgs/flashrom-devel
@@ -0,0 +1 @@
+flashrom
\ No newline at end of file
diff --git a/srcpkgs/flashrom/template b/srcpkgs/flashrom/template
index 849ffa47b6863f..889d883e0f54b0 100644
--- a/srcpkgs/flashrom/template
+++ b/srcpkgs/flashrom/template
@@ -1,17 +1,30 @@
 # Template file for 'flashrom'
 pkgname=flashrom
-version=1.3.0
+version=1.4.0
 revision=1
-build_style=gnu-makefile
-hostmakedepends="pkg-config"
-makedepends="pciutils-devel libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel"
+build_style=meson
+configure_args="-Duse_internal_dmi=false -Ddocumentation=enabled"
+hostmakedepends="pkg-config python3-Sphinx"
+makedepends="pciutils-devel libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel libjaylink-devel"
+depends="dmidecode"
 short_desc="Utility for reading, writing, erasing and verifying flash ROM chips"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.flashrom.org"
 distfiles=https://github.com/flashrom/flashrom/archive/v$version.tar.gz
-checksum=91d3ae239e435682561966350d00890b8bf5ae1a947af1f647198aa391196890
+checksum=b77ce458b3b874387270a71805e899ac63f057d7553dc320da7e4c58e750577c
+make_check=no # can't run without special setup..?
 
-post_patch() {
-	vsed -i 's/sbin/bin/' Makefile
+flashrom-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} pciutils-devel
+	 libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel
+	 libjaylink-devel python3-Sphinx"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+		vmove usr/share/doc
+	}
 }

From 9af495a7b23bfe846e1227585055dc65a7b68d8c Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Oct 2024 16:10:14 +0200
Subject: [PATCH 5/5] fwupd: update to 2.0.0.

---
 ...c35339111d92add461fc3ad2a032e90abc9c.patch | 32 +++++++++++++++++++
 srcpkgs/fwupd/template                        | 13 +++++---
 2 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/fwupd/patches/9637c35339111d92add461fc3ad2a032e90abc9c.patch

diff --git a/srcpkgs/fwupd/patches/9637c35339111d92add461fc3ad2a032e90abc9c.patch b/srcpkgs/fwupd/patches/9637c35339111d92add461fc3ad2a032e90abc9c.patch
new file mode 100644
index 00000000000000..b31fe2804b4d1c
--- /dev/null
+++ b/srcpkgs/fwupd/patches/9637c35339111d92add461fc3ad2a032e90abc9c.patch
@@ -0,0 +1,32 @@
+From 9637c35339111d92add461fc3ad2a032e90abc9c Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Fri, 4 Oct 2024 18:18:29 +0200
+Subject: [PATCH] meson: fix source version outside git
+
+when git is not found the whole conf var is skipped, and that fails to compile
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 08fb1bc141c..20241cef418 100644
+--- a/meson.build
++++ b/meson.build
+@@ -18,6 +18,7 @@ conf.set('MICRO_VERSION', fwupd_micro_version)
+ conf.set_quoted('PACKAGE_VERSION', fwupd_version)
+ 
+ # get source version, falling back to package version
++source_version = fwupd_version
+ git = find_program('git', required: false)
+ tag = false
+ if git.found()
+@@ -26,8 +27,8 @@ if git.found()
+     source_version = fwupd_version
+   endif
+   tag = run_command([git, 'describe', '--exact-match'], check: false).returncode() == 0
+-  conf.set_quoted('SOURCE_VERSION', source_version)
+ endif
++conf.set_quoted('SOURCE_VERSION', source_version)
+ 
+ # libtool versioning - this applies to libfwupd
+ #
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 06af297a89e72d..8b7992c99c3071 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.9.24
+version=2.0.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -12,8 +12,9 @@ hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen vala
  protobuf-c-devel"
 makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel
  gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel
- sqlite-devel gcab-devel pango-devel elogind-devel
- tpm2-tss-devel libjcat-devel libcurl-devel protobuf-c-devel"
+ sqlite-devel gcab-devel pango-devel elogind-devel flashrom-devel
+ tpm2-tss-devel libjcat-devel libcurl-devel protobuf-c-devel pciutils-devel
+ gi-docgen"
 depends="dbus udisks2"
 checkdepends="umockdev"
 conf_files="
@@ -25,7 +26,7 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd"
 changelog="https://github.com/fwupd/fwupd/releases"
 distfiles="https://github.com/fwupd/fwupd/archive/${version}.tar.gz"
-checksum=8a8785be525551ee70fa6e747f2a23ba5873f5f3a9c66f614c1d28b7f994e960
+checksum=6957160bd6fb8f4e126f538d387f3b5fe8a591440fae3ec7a793fee31ffd5e81
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -55,6 +56,10 @@ pre_build() {
 	fi
 }
 
+if [ -n "$CROSS_BUILD" ]; then
+	configure_args+=" -Dvendor_ids_dir=${XBPS_CROSS_BASE}/usr/share/hwdata/"
+fi
+
 post_install() {
 	vcompletion data/bash-completion/fwupdmgr bash fwupdmgr
 	vcompletion data/bash-completion/fwupdtool bash fwupdtool

Re: [PR PATCH] [Updated] fwupd(-efi), libjcat, flashrom, gnu-efi-libs update and compatibility checks.

[dataCobra]

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

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

https://github.com/dataCobra/void-packages fwupd
https://github.com/void-linux/void-packages/pull/52372

fwupd(-efi), libjcat, flashrom, gnu-efi-libs update and compatibility checks.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64 (cross)
  - armv7l (cross)

`fwupd` does need the new version of `libjcat`.

Since `libjcat` is only used for `fwupd` I put both updates into this PR.


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

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

From 3b9cab8977d2cc5a843bda54eabb9ed8accee42a Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 28 Sep 2024 14:25:45 +0200
Subject: [PATCH 1/5] gnu-efi-libs: update to 3.0.18.

---
 srcpkgs/gnu-efi-libs/patches/riscv64.patch | 22 ----------------------
 srcpkgs/gnu-efi-libs/template              |  4 ++--
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/gnu-efi-libs/patches/riscv64.patch

diff --git a/srcpkgs/gnu-efi-libs/patches/riscv64.patch b/srcpkgs/gnu-efi-libs/patches/riscv64.patch
deleted file mode 100644
index eb10d1bb176c66..00000000000000
--- a/srcpkgs/gnu-efi-libs/patches/riscv64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-riscv64: adjust type definitions
-
-CHAR8 needs to be defined while BOOLEAN should be removed
-here to prevent typedef conflicts
-
-Source: https://sourceforge.net/p/gnu-efi/code/ci/1de509497826faa0ad84b82f5e2c3d21ee613459/
----
---- a/inc/riscv64/efibind.h	2023-05-02 13:51:45.000000000 +0200
-+++ -	2024-02-16 17:14:57.455180520 +0100
-@@ -32,11 +32,9 @@
- typedef int16_t                 INT16;
- typedef uint8_t                 UINT8;
- typedef int8_t                  INT8;
-+typedef char                    CHAR8;
- typedef wchar_t                 CHAR16;
- #define WCHAR                   CHAR16
--#ifndef BOOLEAN
--typedef uint8_t                 BOOLEAN;
--#endif
- #undef VOID
- typedef void                    VOID;
- typedef int64_t                 INTN;
diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
index 5c25df7ef5b3d5..c47d33046f2020 100644
--- a/srcpkgs/gnu-efi-libs/template
+++ b/srcpkgs/gnu-efi-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'gnu-efi-libs'
 pkgname=gnu-efi-libs
 reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8
-version=3.0.17
+version=3.0.18
 revision=1
 makedepends="pciutils-devel"
 short_desc="Library for building UEFI Applications using GNU toolchain"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/gnu-efi/"
 distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2"
-checksum=7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4
+checksum=7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c
 nostrip=yes
 
 # If we are cross-building we need to pass the cross-compilation triplet

From 7fe96760dba9f4750377751d1ddaa3ae8366ea5b Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Oct 2024 09:17:28 +0200
Subject: [PATCH 2/5] fwupd-efi: update to 1.7, orphan.

---
 srcpkgs/fwupd-efi/patches/cc-as-ld.patch | 78 ------------------------
 srcpkgs/fwupd-efi/template               |  8 +--
 2 files changed, 4 insertions(+), 82 deletions(-)
 delete mode 100644 srcpkgs/fwupd-efi/patches/cc-as-ld.patch

diff --git a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch b/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
deleted file mode 100644
index 67092dd0fb6792..00000000000000
--- a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -9,7 +9,6 @@
- conf.set_quoted('PACKAGE_VERSION', meson.project_version())
- 
- cc = meson.get_compiler('c')
--ld = cc.get_linker_id()
- objcopy = find_program('objcopy')
- objcopy_version = run_command(objcopy, '--version').stdout().split('\n')[0].split(' ')[-1]
- 
---- a/efi/generate_binary.py
-+++ b/efi/generate_binary.py
-@@ -29,9 +29,9 @@
-         "-j",
-         ".rodata",
-         "-j",
-+        ".areloc",
-+        "-j",
-         ".rel*",
--        "--section-alignment",
--        "512",
-         args.infile,
-         args.outfile,
-     ]
---- a/efi/meson.build
-+++ b/efi/meson.build
-@@ -72,6 +72,11 @@
-         coff_header_in_crt0 = false
- endif
- 
-+# For NX compat, we must ensure we have .note.GNU-stack
-+if run_command('grep', '-q', '.note.GNU-stack', join_paths(efi_crtdir, arch_crt), check: false).returncode() != 0
-+    error('Cannot find NX section in @0@, update to gnu-efi 3.0.15+'.format(join_paths(efi_crtdir, arch_crt)))
-+endif
-+
- # older objcopy for Aarch64 and ARM32 are not EFI capable.
- # Use 'binary' instead, and add required symbols manually.
- if host_cpu == 'arm' or (host_cpu == 'aarch64' and (objcopy_version.version_compare ('< 2.38') or coff_header_in_crt0))
-@@ -95,7 +100,6 @@
- # is the system crt0 for arm and aarch64 new enough to know about SBAT?
- if objcopy_manualsymbols
-   if get_option('efi_sbat_distro_id') != ''
--    arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch)
-     cmd = run_command('grep', '-q', 'sbat', join_paths(efi_crtdir, arch_crt))
-     if cmd.returncode() != 0
-       warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt)))
-@@ -163,6 +167,12 @@
-                '-L', efi_libdir,
-                join_paths(efi_crtdir, arch_crt)]
- 
-+if host_cpu == 'aarch64'
-+# Don't use 64KiB pages
-+  efi_ldflags += ['-z', 'common-page-size=4096']
-+  efi_ldflags += ['-z', 'max-page-size=4096']
-+endif
-+
- if objcopy_manualsymbols
-   # older objcopy for Aarch64 and ARM32 are not EFI capable.
-   # Use 'binary' instead, and add required symbols manually.
-@@ -223,11 +233,16 @@
-   fwupd_so_deps += [o_crt0]
- endif
- 
-+efi_cc_ldflags = []
-+foreach flag : efi_ldflags
-+  efi_cc_ldflags += ['-Wl,' + flag]
-+endforeach
-+
- so = custom_target('fwup.so',
-                    input : [o_file1, o_file2, o_file3, o_file4, o_file5],
-                    output : 'fwup.so',
--                   command : [ld, '-o', '@OUTPUT@'] +
--                             efi_ldflags + ['@INPUT@'] +
-+                   command : [cc.cmd_array(), '-nostdlib', '-o', '@OUTPUT@'] +
-+                             efi_cc_ldflags + ['@INPUT@'] +
-                              ['-lefi', '-lgnuefi', libgcc_file_name],
-                    depends: fwupd_so_deps)
- 
diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
index 2d811f6165f51f..75a40c82847b13 100644
--- a/srcpkgs/fwupd-efi/template
+++ b/srcpkgs/fwupd-efi/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd-efi'
 pkgname=fwupd-efi
-version=1.4
+version=1.7
 revision=1
 archs="x86_64* i686* arm* aarch64*"
 build_style=meson
@@ -8,11 +8,11 @@ build_helper="gir"
 configure_args="-Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
  -Defi-ldsdir=${XBPS_CROSS_BASE}/usr/lib
  -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="efivar python3-pefile"
+hostmakedepends="efivar python3-pefile cmake pkg-config"
 makedepends="libefivar-devel gnu-efi-libs"
 short_desc="EFI Application used by uefi-capsule plugin in fwupd"
-maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 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=b1f5fe72e16d4e2f4c616da416dc93bd79331057336208465da37bafe8f8f83d
+checksum=96d4fc45467159b2664ce86ee7d5030e265fdb4d4a4d774080654d2f5b1561ff

From 28ebfaab7b17fc49497d1aadf76fa74b4bb9897c Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 27 Sep 2024 11:36:08 +0200
Subject: [PATCH 3/5] libjcat: update to 0.2.1.

---
 srcpkgs/libjcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libjcat/template b/srcpkgs/libjcat/template
index 4d01dbccd4aab5..f1136f13503129 100644
--- a/srcpkgs/libjcat/template
+++ b/srcpkgs/libjcat/template
@@ -1,6 +1,6 @@
 # Template file for 'libjcat'
 pkgname=libjcat
-version=0.1.14
+version=0.2.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="marmeladema <xademax@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libjcat"
 distfiles="https://github.com/hughsie/libjcat/archive/${version}.tar.gz"
-checksum=e754051419d9955cfa4dcf4503aa86105c45bcbb5e95222a938ba95cc8f0569b
+checksum=f623815ac855471277dc9d1b3b5ada1a9aaad6da67659c751dc3dec899dc2658
 
 jcat-tool_package() {
 	short_desc+=" - tools"

From 53383ae327db4b873b5ae810a6bfcba8fd05fabf Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Oct 2024 16:09:55 +0200
Subject: [PATCH 4/5] flashrom: update to 1.4.0, add -devel package.

---
 common/shlibs             |  1 +
 srcpkgs/flashrom-devel    |  1 +
 srcpkgs/flashrom/template | 27 ++++++++++++++++++++-------
 3 files changed, 22 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/flashrom-devel

diff --git a/common/shlibs b/common/shlibs
index 41030500290ef9..98d16af384234f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4538,3 +4538,4 @@ libsfdo-desktop.so.0 libsfdo-0.1.3_1
 libsfdo-desktop-file.so.0 libsfdo-0.1.3_1
 libsfdo-icon.so.0 libsfdo-0.1.3_1
 libKMahjongg6.so.6 libkmahjongg-24.08.2_1
+libflashrom.so.1 flashrom-1.4.0_1
diff --git a/srcpkgs/flashrom-devel b/srcpkgs/flashrom-devel
new file mode 120000
index 00000000000000..183c7f43a41c8d
--- /dev/null
+++ b/srcpkgs/flashrom-devel
@@ -0,0 +1 @@
+flashrom
\ No newline at end of file
diff --git a/srcpkgs/flashrom/template b/srcpkgs/flashrom/template
index 849ffa47b6863f..889d883e0f54b0 100644
--- a/srcpkgs/flashrom/template
+++ b/srcpkgs/flashrom/template
@@ -1,17 +1,30 @@
 # Template file for 'flashrom'
 pkgname=flashrom
-version=1.3.0
+version=1.4.0
 revision=1
-build_style=gnu-makefile
-hostmakedepends="pkg-config"
-makedepends="pciutils-devel libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel"
+build_style=meson
+configure_args="-Duse_internal_dmi=false -Ddocumentation=enabled"
+hostmakedepends="pkg-config python3-Sphinx"
+makedepends="pciutils-devel libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel libjaylink-devel"
+depends="dmidecode"
 short_desc="Utility for reading, writing, erasing and verifying flash ROM chips"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.flashrom.org"
 distfiles=https://github.com/flashrom/flashrom/archive/v$version.tar.gz
-checksum=91d3ae239e435682561966350d00890b8bf5ae1a947af1f647198aa391196890
+checksum=b77ce458b3b874387270a71805e899ac63f057d7553dc320da7e4c58e750577c
+make_check=no # can't run without special setup..?
 
-post_patch() {
-	vsed -i 's/sbin/bin/' Makefile
+flashrom-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} pciutils-devel
+	 libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel
+	 libjaylink-devel python3-Sphinx"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+		vmove usr/share/doc
+	}
 }

From 6f716e65167d9a41cb513644af9a4249128628aa Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 18 Oct 2024 10:52:33 +0200
Subject: [PATCH 5/5] fwupd: update to 2.0.1.

---
 srcpkgs/fwupd/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 06af297a89e72d..82cd68d6b55842 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.9.24
+version=2.0.1
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -12,8 +12,9 @@ hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen vala
  protobuf-c-devel"
 makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel
  gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel
- sqlite-devel gcab-devel pango-devel elogind-devel
- tpm2-tss-devel libjcat-devel libcurl-devel protobuf-c-devel"
+ sqlite-devel gcab-devel pango-devel elogind-devel flashrom-devel
+ tpm2-tss-devel libjcat-devel libcurl-devel protobuf-c-devel pciutils-devel
+ gi-docgen"
 depends="dbus udisks2"
 checkdepends="umockdev"
 conf_files="
@@ -25,7 +26,7 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd"
 changelog="https://github.com/fwupd/fwupd/releases"
 distfiles="https://github.com/fwupd/fwupd/archive/${version}.tar.gz"
-checksum=8a8785be525551ee70fa6e747f2a23ba5873f5f3a9c66f614c1d28b7f994e960
+checksum=2266ed0f655e3268221a0f8bd34ab41e1e80b9092978b86fc080e59268b01486
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -55,6 +56,10 @@ pre_build() {
 	fi
 }
 
+if [ -n "$CROSS_BUILD" ]; then
+	configure_args+=" -Dvendor_ids_dir=${XBPS_CROSS_BASE}/usr/share/hwdata/"
+fi
+
 post_install() {
 	vcompletion data/bash-completion/fwupdmgr bash fwupdmgr
 	vcompletion data/bash-completion/fwupdtool bash fwupdtool

Re: [PR REVIEW] fwupd(-efi), libjcat, flashrom, gnu-efi-libs update and compatibility checks.

[leahneukirchen]

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

New review comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/52372#discussion_r1822962749

Comment:
libgusb-devel can be dropped i think

Re: [PR PATCH] [Updated] fwupd(-efi), libjcat, flashrom, gnu-efi-libs update and compatibility checks.

[dataCobra]

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

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

https://github.com/dataCobra/void-packages fwupd
https://github.com/void-linux/void-packages/pull/52372

fwupd(-efi), libjcat, flashrom, gnu-efi-libs update and compatibility checks.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64 (cross)
  - armv7l (cross)

`fwupd` does need the new version of `libjcat`.

Since `libjcat` is only used for `fwupd` I put both updates into this PR.


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

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

From cc4b504d9bfe9237f8c9942a166247c53a732497 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 28 Sep 2024 14:25:45 +0200
Subject: [PATCH 1/5] gnu-efi-libs: update to 3.0.18.

---
 srcpkgs/gnu-efi-libs/patches/riscv64.patch | 22 ----------------------
 srcpkgs/gnu-efi-libs/template              |  4 ++--
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/gnu-efi-libs/patches/riscv64.patch

diff --git a/srcpkgs/gnu-efi-libs/patches/riscv64.patch b/srcpkgs/gnu-efi-libs/patches/riscv64.patch
deleted file mode 100644
index eb10d1bb176c66..00000000000000
--- a/srcpkgs/gnu-efi-libs/patches/riscv64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-riscv64: adjust type definitions
-
-CHAR8 needs to be defined while BOOLEAN should be removed
-here to prevent typedef conflicts
-
-Source: https://sourceforge.net/p/gnu-efi/code/ci/1de509497826faa0ad84b82f5e2c3d21ee613459/
----
---- a/inc/riscv64/efibind.h	2023-05-02 13:51:45.000000000 +0200
-+++ -	2024-02-16 17:14:57.455180520 +0100
-@@ -32,11 +32,9 @@
- typedef int16_t                 INT16;
- typedef uint8_t                 UINT8;
- typedef int8_t                  INT8;
-+typedef char                    CHAR8;
- typedef wchar_t                 CHAR16;
- #define WCHAR                   CHAR16
--#ifndef BOOLEAN
--typedef uint8_t                 BOOLEAN;
--#endif
- #undef VOID
- typedef void                    VOID;
- typedef int64_t                 INTN;
diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
index 5c25df7ef5b3d5..c47d33046f2020 100644
--- a/srcpkgs/gnu-efi-libs/template
+++ b/srcpkgs/gnu-efi-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'gnu-efi-libs'
 pkgname=gnu-efi-libs
 reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8
-version=3.0.17
+version=3.0.18
 revision=1
 makedepends="pciutils-devel"
 short_desc="Library for building UEFI Applications using GNU toolchain"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/gnu-efi/"
 distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2"
-checksum=7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4
+checksum=7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c
 nostrip=yes
 
 # If we are cross-building we need to pass the cross-compilation triplet

From ea16815b198d35fed44e221b563a38fb5c9e1918 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Oct 2024 09:17:28 +0200
Subject: [PATCH 2/5] fwupd-efi: update to 1.7, orphan.

---
 srcpkgs/fwupd-efi/patches/cc-as-ld.patch | 78 ------------------------
 srcpkgs/fwupd-efi/template               |  8 +--
 2 files changed, 4 insertions(+), 82 deletions(-)
 delete mode 100644 srcpkgs/fwupd-efi/patches/cc-as-ld.patch

diff --git a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch b/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
deleted file mode 100644
index 67092dd0fb6792..00000000000000
--- a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -9,7 +9,6 @@
- conf.set_quoted('PACKAGE_VERSION', meson.project_version())
- 
- cc = meson.get_compiler('c')
--ld = cc.get_linker_id()
- objcopy = find_program('objcopy')
- objcopy_version = run_command(objcopy, '--version').stdout().split('\n')[0].split(' ')[-1]
- 
---- a/efi/generate_binary.py
-+++ b/efi/generate_binary.py
-@@ -29,9 +29,9 @@
-         "-j",
-         ".rodata",
-         "-j",
-+        ".areloc",
-+        "-j",
-         ".rel*",
--        "--section-alignment",
--        "512",
-         args.infile,
-         args.outfile,
-     ]
---- a/efi/meson.build
-+++ b/efi/meson.build
-@@ -72,6 +72,11 @@
-         coff_header_in_crt0 = false
- endif
- 
-+# For NX compat, we must ensure we have .note.GNU-stack
-+if run_command('grep', '-q', '.note.GNU-stack', join_paths(efi_crtdir, arch_crt), check: false).returncode() != 0
-+    error('Cannot find NX section in @0@, update to gnu-efi 3.0.15+'.format(join_paths(efi_crtdir, arch_crt)))
-+endif
-+
- # older objcopy for Aarch64 and ARM32 are not EFI capable.
- # Use 'binary' instead, and add required symbols manually.
- if host_cpu == 'arm' or (host_cpu == 'aarch64' and (objcopy_version.version_compare ('< 2.38') or coff_header_in_crt0))
-@@ -95,7 +100,6 @@
- # is the system crt0 for arm and aarch64 new enough to know about SBAT?
- if objcopy_manualsymbols
-   if get_option('efi_sbat_distro_id') != ''
--    arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch)
-     cmd = run_command('grep', '-q', 'sbat', join_paths(efi_crtdir, arch_crt))
-     if cmd.returncode() != 0
-       warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt)))
-@@ -163,6 +167,12 @@
-                '-L', efi_libdir,
-                join_paths(efi_crtdir, arch_crt)]
- 
-+if host_cpu == 'aarch64'
-+# Don't use 64KiB pages
-+  efi_ldflags += ['-z', 'common-page-size=4096']
-+  efi_ldflags += ['-z', 'max-page-size=4096']
-+endif
-+
- if objcopy_manualsymbols
-   # older objcopy for Aarch64 and ARM32 are not EFI capable.
-   # Use 'binary' instead, and add required symbols manually.
-@@ -223,11 +233,16 @@
-   fwupd_so_deps += [o_crt0]
- endif
- 
-+efi_cc_ldflags = []
-+foreach flag : efi_ldflags
-+  efi_cc_ldflags += ['-Wl,' + flag]
-+endforeach
-+
- so = custom_target('fwup.so',
-                    input : [o_file1, o_file2, o_file3, o_file4, o_file5],
-                    output : 'fwup.so',
--                   command : [ld, '-o', '@OUTPUT@'] +
--                             efi_ldflags + ['@INPUT@'] +
-+                   command : [cc.cmd_array(), '-nostdlib', '-o', '@OUTPUT@'] +
-+                             efi_cc_ldflags + ['@INPUT@'] +
-                              ['-lefi', '-lgnuefi', libgcc_file_name],
-                    depends: fwupd_so_deps)
- 
diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
index 2d811f6165f51f..75a40c82847b13 100644
--- a/srcpkgs/fwupd-efi/template
+++ b/srcpkgs/fwupd-efi/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd-efi'
 pkgname=fwupd-efi
-version=1.4
+version=1.7
 revision=1
 archs="x86_64* i686* arm* aarch64*"
 build_style=meson
@@ -8,11 +8,11 @@ build_helper="gir"
 configure_args="-Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
  -Defi-ldsdir=${XBPS_CROSS_BASE}/usr/lib
  -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="efivar python3-pefile"
+hostmakedepends="efivar python3-pefile cmake pkg-config"
 makedepends="libefivar-devel gnu-efi-libs"
 short_desc="EFI Application used by uefi-capsule plugin in fwupd"
-maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 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=b1f5fe72e16d4e2f4c616da416dc93bd79331057336208465da37bafe8f8f83d
+checksum=96d4fc45467159b2664ce86ee7d5030e265fdb4d4a4d774080654d2f5b1561ff

From f23809e421f0b5ed2d84146e99a07cc47f0d944c Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 27 Sep 2024 11:36:08 +0200
Subject: [PATCH 3/5] libjcat: update to 0.2.1.

---
 srcpkgs/libjcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libjcat/template b/srcpkgs/libjcat/template
index 4d01dbccd4aab5..f1136f13503129 100644
--- a/srcpkgs/libjcat/template
+++ b/srcpkgs/libjcat/template
@@ -1,6 +1,6 @@
 # Template file for 'libjcat'
 pkgname=libjcat
-version=0.1.14
+version=0.2.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="marmeladema <xademax@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libjcat"
 distfiles="https://github.com/hughsie/libjcat/archive/${version}.tar.gz"
-checksum=e754051419d9955cfa4dcf4503aa86105c45bcbb5e95222a938ba95cc8f0569b
+checksum=f623815ac855471277dc9d1b3b5ada1a9aaad6da67659c751dc3dec899dc2658
 
 jcat-tool_package() {
 	short_desc+=" - tools"

From c247aa52a149ff93bbad3337fd20d010f1907949 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Oct 2024 16:09:55 +0200
Subject: [PATCH 4/5] flashrom: update to 1.4.0, add -devel package.

---
 common/shlibs             |  1 +
 srcpkgs/flashrom-devel    |  1 +
 srcpkgs/flashrom/template | 27 ++++++++++++++++++++-------
 3 files changed, 22 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/flashrom-devel

diff --git a/common/shlibs b/common/shlibs
index ff62b084bb969a..338c0eb0b3709e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4536,3 +4536,4 @@ libsfdo-desktop.so.0 libsfdo-0.1.3_1
 libsfdo-desktop-file.so.0 libsfdo-0.1.3_1
 libsfdo-icon.so.0 libsfdo-0.1.3_1
 libKMahjongg6.so.6 libkmahjongg-24.08.2_1
+libflashrom.so.1 flashrom-1.4.0_1
diff --git a/srcpkgs/flashrom-devel b/srcpkgs/flashrom-devel
new file mode 120000
index 00000000000000..183c7f43a41c8d
--- /dev/null
+++ b/srcpkgs/flashrom-devel
@@ -0,0 +1 @@
+flashrom
\ No newline at end of file
diff --git a/srcpkgs/flashrom/template b/srcpkgs/flashrom/template
index 849ffa47b6863f..889d883e0f54b0 100644
--- a/srcpkgs/flashrom/template
+++ b/srcpkgs/flashrom/template
@@ -1,17 +1,30 @@
 # Template file for 'flashrom'
 pkgname=flashrom
-version=1.3.0
+version=1.4.0
 revision=1
-build_style=gnu-makefile
-hostmakedepends="pkg-config"
-makedepends="pciutils-devel libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel"
+build_style=meson
+configure_args="-Duse_internal_dmi=false -Ddocumentation=enabled"
+hostmakedepends="pkg-config python3-Sphinx"
+makedepends="pciutils-devel libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel libjaylink-devel"
+depends="dmidecode"
 short_desc="Utility for reading, writing, erasing and verifying flash ROM chips"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.flashrom.org"
 distfiles=https://github.com/flashrom/flashrom/archive/v$version.tar.gz
-checksum=91d3ae239e435682561966350d00890b8bf5ae1a947af1f647198aa391196890
+checksum=b77ce458b3b874387270a71805e899ac63f057d7553dc320da7e4c58e750577c
+make_check=no # can't run without special setup..?
 
-post_patch() {
-	vsed -i 's/sbin/bin/' Makefile
+flashrom-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} pciutils-devel
+	 libusb-compat-devel libftdi1-devel eudev-libudev-devel zlib-devel
+	 libjaylink-devel python3-Sphinx"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+		vmove usr/share/doc
+	}
 }

From 7ac5203ef550b23c9d06c5fb77949d8667e2affc Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 30 Oct 2024 17:28:25 +0100
Subject: [PATCH 5/5] fwupd: update to 2.0.1.

---
 srcpkgs/fwupd/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 06af297a89e72d..c4036e3d2051df 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.9.24
+version=2.0.1
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -11,9 +11,9 @@ hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen vala
  glib-devel polkit gettext pango python3-gobject python3-Pillow
  protobuf-c-devel"
 makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel
- gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel
- sqlite-devel gcab-devel pango-devel elogind-devel
- tpm2-tss-devel libjcat-devel libcurl-devel protobuf-c-devel"
+ gnutls-devel gpgme-devel json-glib-devel polkit-devel sqlite-devel gcab-devel
+ pango-devel elogind-devel flashrom-devel tpm2-tss-devel libjcat-devel
+ libcurl-devel protobuf-c-devel pciutils-devel gi-docgen"
 depends="dbus udisks2"
 checkdepends="umockdev"
 conf_files="
@@ -25,7 +25,7 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd"
 changelog="https://github.com/fwupd/fwupd/releases"
 distfiles="https://github.com/fwupd/fwupd/archive/${version}.tar.gz"
-checksum=8a8785be525551ee70fa6e747f2a23ba5873f5f3a9c66f614c1d28b7f994e960
+checksum=2266ed0f655e3268221a0f8bd34ab41e1e80b9092978b86fc080e59268b01486
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -55,6 +55,10 @@ pre_build() {
 	fi
 }
 
+if [ -n "$CROSS_BUILD" ]; then
+	configure_args+=" -Dvendor_ids_dir=${XBPS_CROSS_BASE}/usr/share/hwdata/"
+fi
+
 post_install() {
 	vcompletion data/bash-completion/fwupdmgr bash fwupdmgr
 	vcompletion data/bash-completion/fwupdtool bash fwupdtool

Re: [PR REVIEW] fwupd(-efi), libjcat, flashrom, gnu-efi-libs update and compatibility checks.

[dataCobra]

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

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52372#discussion_r1822994438

Comment:
Packaging worked indeed fine without the `libgusb-devel` makedepends.

Re: [PR PATCH] [Merged]: fwupd(-efi), libjcat, flashrom, gnu-efi-libs update and compatibility checks.

[leahneukirchen]

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

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

fwupd(-efi), libjcat, flashrom, gnu-efi-libs update and compatibility checks.
https://github.com/void-linux/void-packages/pull/52372

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64 (cross)
  - armv7l (cross)

`fwupd` does need the new version of `libjcat`.

Since `libjcat` is only used for `fwupd` I put both updates into this PR.