commit: 073e6851f00dd889baa8c2cf77d86b4ec6cc3e58 Author: John M. Harris Jr. <johnmh <AT> johnmh <DOT> me> AuthorDate: Sat Sep 6 02:22:25 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 01:44:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073e6851
sys-apps/fwupd: add 2.0.14, drop 2.0.13 Signed-off-by: John M. Harris Jr. <johnmh <AT> johnmh.me> Part-of: https://github.com/gentoo/gentoo/pull/42926 Closes: https://github.com/gentoo/gentoo/pull/42926 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/fwupd/Manifest | 2 +- sys-apps/fwupd/files/fwupd-2.0.14-elogind.patch | 70 ++++++++++++++++++++++ .../{fwupd-2.0.13.ebuild => fwupd-2.0.14.ebuild} | 10 +++- 3 files changed, 79 insertions(+), 3 deletions(-) diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 67a4b5f3fe1d..97022a8ca6ca 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,4 +1,4 @@ DIST fwupd-1.9.24.tar.xz 4305048 BLAKE2B 5ac7bbc5cdcee13a39fe25cd5b83dfbb9615e6349cd39e8b25cc654c0318870de603c1f6ce550da6662d3f9cd7d275cf6254058f6b71dcb9f7916329147ab771 SHA512 2f9935bbfc3ffc49bf0939a75dd52861eea9108d8f7026dbcdf4c07ad234f70f0b1cb6740eefe555dc2a49aba1ea4d65a78427aad7a0ba9de1fe318734255bfe DIST fwupd-2.0.1.tar.xz 4971220 BLAKE2B 44d95bae51cb299ab4130805f1a57ebfb0fd5ba8872b6679f5fdde46150cb245f25fdd888f47e57eb35842b6e34f105feefca2f90bb84950ad93748f9f294820 SHA512 bf4e1bdd9ebfc593490a0d5d6fd6e31718e89aff5bb0feda9babf235676e26bff0e6e751a5df96e884a9f86db11b40ad00b63c7a5385c3fa9ab89f7f154b945f -DIST fwupd-2.0.13.tar.xz 4957064 BLAKE2B 491cf67cbac276831bfdb4cf488ab4c3548a82e122700ba7cc543637a9481a37e34ebf74ed8bf0700744fa8b0ed3b4dbfb849aee6a065e25a942f86465f41c13 SHA512 40146e97d54cce444404b78ec918df4a9e2c2c0185aea46cc25e09b7896fc703572fb8e858c54adc71b5e4c2916b765a15f6670061779fa45fa804005583819f +DIST fwupd-2.0.14.tar.xz 4980572 BLAKE2B f3dfe427e9c01629e1dd3a860d305d3b60d094387b507b01de6f082041f7a13fd673eda650c7ddac7e353aaa41fdd476a67654a298632bc13895f7a5ab6d86bf SHA512 627ecf8f4951c22b6e497032de2a00d27af8d9348bf6f6ae49e8c89565eb0ee5a0b8ffc142717908955483090d6671de2e34297880138a31e87e11317fc5dbaf DIST fwupd-2.0.3.tar.xz 5085932 BLAKE2B 82e5170c8f3771685f3c3bed9f02c934104f9953d6dc4eb00290f3a283305a30ae9cebab165c88725a016e86f5610d9699c5f86cc5acf7a32cc4454d82df7c84 SHA512 68321ecf655f12352fd12182e000d9295c3421015ae13012c37bd5e711a0e240a331a6ae5d17a42c2608be79f005e121470c77c28b5fae61fe3383c7579e2bfd diff --git a/sys-apps/fwupd/files/fwupd-2.0.14-elogind.patch b/sys-apps/fwupd/files/fwupd-2.0.14-elogind.patch new file mode 100644 index 000000000000..9d453a52627e --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-2.0.14-elogind.patch @@ -0,0 +1,70 @@ +From 6b34109666bae2916bc20d43f291e95b1d285b3d Mon Sep 17 00:00:00 2001 +From: "John M. Harris Jr." <[email protected]> +Date: Sat, 6 Sep 2025 09:10:08 -0700 +Subject: [PATCH] Revert "Remove support for elogind" + +This reverts commit bbda9dec06674757da55ce6a241953c37553aaf9. +--- + meson.build | 6 ++++++ + meson_options.txt | 4 ++++ + plugins/logind/meson.build | 4 +++- + 3 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index dfdfb7f5e..4ff6f0df8 100644 +--- a/meson.build ++++ b/meson.build +@@ -528,6 +528,11 @@ if libsystemd.found() + endif + endif + ++elogind = dependency('systemd', 'libelogind', required: get_option('elogind')) ++if elogind.found() ++ conf.set('HAVE_LOGIND' , '1') ++endif ++ + supported_build = get_option('supported_build').disable_auto_if(not tag).allowed() + if supported_build + conf.set('SUPPORTED_BUILD', '1') +@@ -718,6 +723,7 @@ summary({ + 'dbus_socket_address': get_option('dbus_socket_address'), + 'vendor_ids_dir': vendor_ids_dir, + 'docs': build_docs, ++ 'elogind': elogind, + 'gnutls': gnutls, + 'introspection': introspection.allowed(), + 'libblkid': libblkid, +diff --git a/meson_options.txt b/meson_options.txt +index 40103c03e..bf8e96433 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -39,6 +39,10 @@ option('efi_os_dir', + type: 'string', + description: 'the hardcoded name of OS directory in ESP, e.g. fedora', + ) ++option('elogind', ++ type: 'feature', ++ description: 'elogind support', ++) + option('firmware-packager', + type: 'boolean', + value: true, +diff --git a/plugins/logind/meson.build b/plugins/logind/meson.build +index bd66fabbc..30b60738a 100644 +--- a/plugins/logind/meson.build ++++ b/plugins/logind/meson.build +@@ -1,4 +1,4 @@ +-libsystemd.found() or subdir_done() ++if libsystemd.found() or elogind.found() + + cargs = ['-DG_LOG_DOMAIN="FuPluginLogind"'] + plugins += {meson.current_source_dir().split('/')[-1]: true} +@@ -12,3 +12,5 @@ plugin_builtins += static_library('fu_plugin_logind', + c_args: cargs, + dependencies: plugin_deps, + ) ++ ++endif +-- +2.49.1 + diff --git a/sys-apps/fwupd/fwupd-2.0.13.ebuild b/sys-apps/fwupd/fwupd-2.0.14.ebuild similarity index 91% rename from sys-apps/fwupd/fwupd-2.0.13.ebuild rename to sys-apps/fwupd/fwupd-2.0.14.ebuild index e7ae7d5c8394..daa3e2e892a8 100644 --- a/sys-apps/fwupd/fwupd-2.0.13.ebuild +++ b/sys-apps/fwupd/fwupd-2.0.14.ebuild @@ -14,9 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"; LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="amdgpu +archive bash-completion bluetooth cbor flashrom gnutls gtk-doc introspection lzma minimal modemmanager nvme policykit protobuf seccomp spi synaptics systemd test tpm uefi" +IUSE="amdgpu +archive bash-completion bluetooth cbor elogind flashrom gnutls gtk-doc introspection lzma minimal modemmanager nvme policykit protobuf seccomp spi synaptics systemd test tpm uefi" REQUIRED_USE="${PYTHON_REQUIRED_USE} - ^^ ( minimal systemd ) + ^^ ( elogind minimal systemd ) minimal? ( !introspection ) spi? ( lzma ) seccomp? ( systemd ) @@ -63,6 +63,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=net-misc/curl-7.62.0 archive? ( app-arch/libarchive:= ) cbor? ( >=dev-libs/libcbor-0.7.0:= ) + elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( >=net-libs/gnutls-3.6.0 ) virtual/libusb:1 @@ -94,6 +95,10 @@ DEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-2.0.14-elogind.patch +) + src_prepare() { default @@ -125,6 +130,7 @@ src_configure() { $(meson_use bash-completion bash_completion) $(meson_feature bluetooth bluez) $(meson_feature cbor) + $(meson_feature elogind) $(meson_feature gnutls) $(meson_feature gtk-doc docs) $(meson_feature introspection)
