commit: d7ffd27395fad8d3e17d5fde3cf6a90f3734290b Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Wed Aug 4 02:03:18 2021 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Wed Aug 4 14:20:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7ffd273
sys-apps/fwupd: bump to v1.6.2 Package-Manager: Portage-3.0.21, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> profiles/arch/powerpc/package.use.mask | 4 + sys-apps/fwupd/Manifest | 1 + ...-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch | 27 ++++ .../fwupd-1.6.2-dell-dock-requires-gusb.patch | 24 +++ sys-apps/fwupd/fwupd-1.6.2.ebuild | 176 +++++++++++++++++++++ sys-apps/fwupd/metadata.xml | 1 + 6 files changed, 233 insertions(+) diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask index 6f0fc6cdc7a..27501552b45 100644 --- a/profiles/arch/powerpc/package.use.mask +++ b/profiles/arch/powerpc/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Thomas Deutschmann <[email protected]> (2021-08-04) +# Requires net-misc/modemmanager[qmi], mask until keyworded +sys-apps/fwupd modemmanager + # Miroslav Šulc <[email protected]> (2021-03-13) # virtual/jdk isn't keyworded here media-libs/rubberband jni diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 655646df514..e7642874b28 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,2 +1,3 @@ DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78 DIST fwupd-1.6.1.tar.gz 3786336 BLAKE2B 429e41cad3acdcd9b245532a38126a8e3d366081aba16b9f3e04a2029980b8d6e3f4ac3f8c6d6cd1332c344526a7901c976d6fa0bc1c4011e54d5dc96a427d2d SHA512 6d795e9898de6097d0f1185fbc3a6864566f90fc504e5d9cf192e5dca50c659d39f43f1922c7506151bd1538a23db507e95893436de733b1335bd69dc56f3b1c +DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0 diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch b/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch new file mode 100644 index 00000000000..99434fe226f --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch @@ -0,0 +1,27 @@ +From 196cc6d9b445ee4246c7ff18d98d616aef286550 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann <[email protected]> +Date: Wed, 4 Aug 2021 15:38:59 +0200 +Subject: [PATCH] plugin modem-manager: XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY is + only available in >=libxmlb-0.2.2 + +Closes: https://github.com/fwupd/fwupd/issues/3600 +--- + plugins/modem-manager/fu-firehose-updater.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/plugins/modem-manager/fu-firehose-updater.c b/plugins/modem-manager/fu-firehose-updater.c +index 00fcdf607..076aa79cc 100644 +--- a/plugins/modem-manager/fu-firehose-updater.c ++++ b/plugins/modem-manager/fu-firehose-updater.c +@@ -630,7 +630,11 @@ fu_firehose_updater_run_action (FuFirehoseUpdater *self, XbNode *node, guint max + + action = xb_node_get_element (node); + ++#if LIBXMLB_CHECK_VERSION(0,2,2) + cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY, error); ++#else ++ cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_NONE, error); ++#endif + if (cmd_str == NULL) + return FALSE; + cmd_bytearray = g_byte_array_new_take ((guint8 *)cmd_str, strlen (cmd_str)); diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch new file mode 100644 index 00000000000..162cc194a2a --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch @@ -0,0 +1,24 @@ +From 4f5961a389698844117e70601ccf4c9e3ae1cb86 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann <[email protected]> +Date: Wed, 4 Aug 2021 15:11:26 +0200 +Subject: [PATCH] dell-dock plugin requires gusb + +Closes: https://github.com/fwupd/fwupd/issues/3598 +--- + plugins/dell-dock/meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/plugins/dell-dock/meson.build b/plugins/dell-dock/meson.build +index 829771de1..ae8f67f33 100644 +--- a/plugins/dell-dock/meson.build ++++ b/plugins/dell-dock/meson.build +@@ -1,3 +1,4 @@ ++if get_option('gusb') + cargs = ['-DG_LOG_DOMAIN="FuPluginDellDock"'] + + install_data(['dell-dock.quirk'], +@@ -34,3 +35,4 @@ shared_module('fu_plugin_dell_dock', + gudev, + ], + ) ++endif diff --git a/sys-apps/fwupd/fwupd-1.6.2.ebuild b/sys-apps/fwupd/fwupd-1.6.2.ebuild new file mode 100644 index 00000000000..aa776823c5e --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.6.2.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit linux-info meson python-single-r1 vala xdg toolchain-funcs + +DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" +HOMEPAGE="https://fwupd.org"; +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ^^ ( elogind minimal systemd ) + dell? ( uefi ) + minimal? ( !introspection ) + spi? ( lzma ) + synaptics? ( gnutls ) + uefi? ( gnutls ) +" +RESTRICT="!test? ( test )" + +BDEPEND="$(vala_depend) + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + introspection? ( dev-libs/gobject-introspection ) + man? ( + app-text/docbook-sgml-utils + sys-apps/help2man + ) + test? ( + thunderbolt? ( dev-util/umockdev ) + net-libs/gnutls[tools] + ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-arch/gcab-1.0 + dev-db/sqlite + >=dev-libs/glib-2.45.8:2 + dev-libs/json-glib + dev-libs/libgpg-error + dev-libs/libgudev:= + >=dev-libs/libjcat-0.1.0[gpg,pkcs7] + >=dev-libs/libxmlb-0.1.13:= + $(python_gen_cond_dep ' + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + ') + >=net-libs/libsoup-2.51.92:2.4[introspection?] + net-misc/curl + virtual/libelf:0= + virtual/udev + archive? ( app-arch/libarchive:= ) + dell? ( >=sys-libs/libsmbios-2.4.0 ) + elogind? ( >=sys-auth/elogind-211 ) + flashrom? ( >=sys-apps/flashrom-1.2-r3 ) + gnutls? ( net-libs/gnutls ) + gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) + lzma? ( app-arch/xz-utils ) + modemmanager? ( net-misc/modemmanager[qmi] ) + policykit? ( >=sys-auth/polkit-0.103 ) + systemd? ( >=sys-apps/systemd-211 ) + tpm? ( app-crypt/tpm2-tss ) + uefi? ( + sys-apps/fwupd-efi + sys-boot/efibootmgr + sys-fs/udisks + sys-libs/efivar + ) +" +# Block sci-chemistry/chemical-mime-data for bug #701900 +RDEPEND=" + !<sci-chemistry/chemical-mime-data-0.1.94-r4 + ${COMMON_DEPEND} + sys-apps/dbus +" + +DEPEND=" + ${COMMON_DEPEND} + x11-libs/pango[introspection] +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch + "${FILESDIR}"/${P}-dell-dock-requires-gusb.patch + "${FILESDIR}"/${P}-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + if use nvme ; then + kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" + fi +} + +src_prepare() { + default + # c.f. https://github.com/fwupd/fwupd/issues/1414 + sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ + -i plugins/thunderbolt/meson.build || die + + sed -e '/platform-integrity/d' \ + -i plugins/meson.build || die #753521 + + sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \ + -i data/builder/meson.build || die + + vala_src_prepare +} + +src_configure() { + local plugins=( + $(meson_use amt plugin_amt) + $(meson_use dell plugin_dell) + $(meson_use flashrom plugin_flashrom) + $(meson_use gusb plugin_altos) + $(meson_use modemmanager plugin_modem_manager) + $(meson_use nvme plugin_nvme) + $(meson_use spi plugin_intel_spi) + $(meson_use synaptics plugin_synaptics_mst) + $(meson_use synaptics plugin_synaptics_rmi) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm plugin_tpm) + $(meson_use uefi plugin_uefi_capsule) + $(meson_use uefi plugin_uefi_capsule_splash) + $(meson_use uefi plugin_uefi_pk) + ) + use ppc64 && plugins+=( -Dplugin_msr="false" ) + + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + -Dconsolekit="false" + -Dcurl="true" + -Ddocs="$(usex gtk-doc gtkdoc none)" + -Defi_binary="false" + -Dsupported_build="true" + $(meson_use agent) + $(meson_use archive libarchive) + $(meson_use bluetooth bluez) + $(meson_use elogind) + $(meson_use gnutls) + $(meson_use gusb) + $(meson_use lzma) + $(meson_use man) + $(meson_use introspection) + $(meson_use policykit polkit) + $(meson_use systemd) + $(meson_use test tests) + + ${plugins[@]} + ) + use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) + export CACHE_DIRECTORY="${T}" + meson_src_configure +} + +src_install() { + meson_src_install + + if ! use minimal ; then + newinitd "${FILESDIR}"/${PN}-r2 ${PN} + + if ! use systemd ; then + # Don't timeout when fwupd is running (#673140) + sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ + -i "${ED}"/etc/${PN}/daemon.conf || die + fi + fi +} diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml index f746f911695..57762c975d6 100644 --- a/sys-apps/fwupd/metadata.xml +++ b/sys-apps/fwupd/metadata.xml @@ -17,6 +17,7 @@ <flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag> <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag> <flag name="nvme">Build and install NVMe plugin</flag> + <flag name="modemmanager">Build and install Modem Manager plugin</flag> <flag name="spi">Install Intel-SPI plugin</flag> <flag name="synaptics">Install synaptics plugin</flag> <flag name="thunderbolt">Install Thunderbolt plugin</flag>
