commit: 1bf53a853a74a7019fe2333c9c74ad6017f473f9 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon May 20 14:13:37 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon May 20 14:13:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf53a85
sys-apps/fwupd: Bump to version 1.2.9 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-apps/fwupd/Manifest | 1 + .../fwupd-1.2.9-without_systemd_build_fix.patch | 77 +++++++++++ sys-apps/fwupd/fwupd-1.2.9.ebuild | 143 +++++++++++++++++++++ 3 files changed, 221 insertions(+) diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 94f9f9ce90f..fe7e9442883 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1 +1,2 @@ DIST fwupd-1.2.8.tar.gz 1911999 BLAKE2B 61a24ce24f778b96f7ad23496890f7a1d20c09e6bbd707f29d154992668d5c0a25cfd31b5d0d11519740e086c098cbdfd440fe9f5cab4dde0ac43fe6b438e911 SHA512 d603f9f4e5a4c0fc6abb0b75f7d884eff47fb8a16285aa545f7140fe98ce781d127ff3769f9c206bb3bfd084bbc5bf6abf9424f70e727ff79162416fe7881154 +DIST fwupd-1.2.9.tar.gz 1938008 BLAKE2B 6a16c8e3a2c94dfbe9485d3ed57f3908fa2d7bcd95ac122d4b08e9a869706c01483132015f06cfa3076c861fec903740bed83b7ef763ac9b20147673a25a54a1 SHA512 942c6bad822dc65846d1984850798bec677b6a312100c6f5971fc9d5906c182267182ef29e0834bbd2b83fe72b11c3b6e50855d90388d2bf85e8a3b95d0a5a68 diff --git a/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch b/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch new file mode 100644 index 00000000000..37be190d8aa --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch @@ -0,0 +1,77 @@ +From d92cccaf1396d93f97480f32694372b8256f9b11 Mon Sep 17 00:00:00 2001 +From: Richard Hughes <[email protected]> +Date: Mon, 20 May 2019 11:28:31 +0100 +Subject: [PATCH] trivial: Fix non-systemd build + +--- + src/fu-tool.c | 2 ++ + src/fu-util-common.c | 5 ++++- + src/fu-util.c | 6 +++++- + 3 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/src/fu-tool.c b/src/fu-tool.c +index 353a52e88..eac7a8cc4 100644 +--- a/src/fu-tool.c ++++ b/src/fu-tool.c +@@ -113,8 +113,10 @@ fu_util_start_engine (FuUtilPrivate *priv, FuEngineLoadFlags flags, GError **err + { + g_autoptr(GError) error_local = NULL; + ++#ifdef HAVE_SYSTEMD + if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), &error_local)) + g_debug ("Failed top stop daemon: %s", error_local->message); ++#endif + if (!fu_engine_load (priv->engine, flags, error)) + return FALSE; + if (fu_engine_get_tainted (priv->engine)) { +diff --git a/src/fu-util-common.c b/src/fu-util-common.c +index 219752b1e..51e16f671 100644 +--- a/src/fu-util-common.c ++++ b/src/fu-util-common.c +@@ -28,6 +28,7 @@ fu_util_get_systemd_unit (void) + return SYSTEMD_FWUPD_UNIT; + } + ++#ifdef HAVE_SYSTEMD + static const gchar * + fu_util_get_expected_command (const gchar *target) + { +@@ -35,10 +36,12 @@ fu_util_get_expected_command (const gchar *target) + return "fwupd.fwupdmgr"; + return "fwupdmgr"; + } ++#endif + + gboolean + fu_util_using_correct_daemon (GError **error) + { ++#ifdef HAVE_SYSTEMD + g_autofree gchar *default_target = NULL; + g_autoptr(GError) error_local = NULL; + const gchar *target = fu_util_get_systemd_unit (); +@@ -58,7 +61,7 @@ fu_util_using_correct_daemon (GError **error) + fu_util_get_expected_command (target)); + return FALSE; + } +- ++#endif + return TRUE; + } + +diff --git a/src/fu-util.c b/src/fu-util.c +index c8528e71e..dec96e741 100644 +--- a/src/fu-util.c ++++ b/src/fu-util.c +@@ -2122,7 +2122,11 @@ fu_util_modify_config (FuUtilPrivate *priv, gchar **values, GError **error) + if (!fu_util_prompt_for_boolean (FALSE)) + return TRUE; + } +- return fu_systemd_unit_stop (fu_util_get_systemd_unit (), error); ++#ifdef HAVE_SYSTEMD ++ if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), error)) ++ return FALSE; ++#endif ++ return TRUE; + } + + static void diff --git a/sys-apps/fwupd/fwupd-1.2.9.ebuild b/sys-apps/fwupd/fwupd-1.2.9.ebuild new file mode 100644 index 00000000000..ab05058f3b6 --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.2.9.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7} ) + +inherit meson python-single-r1 vala xdg-utils + +DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" +HOMEPAGE="https://fwupd.org"; +SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ^^ ( consolekit elogind systemd ) + dell? ( uefi ) +" + +RDEPEND="${PYTHON_DEPS} + app-arch/gcab + app-arch/libarchive:= + dev-db/sqlite + >=dev-libs/glib-2.45.8:2 + dev-libs/json-glib + dev-libs/libgpg-error + dev-libs/libgudev:= + >=dev-libs/libgusb-0.2.9[introspection] + >=dev-libs/libxmlb-0.1.7 + 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] + >=sys-auth/polkit-0.103 + virtual/libelf:0= + colorhug? ( >=x11-misc/colord-1.2.12:0= ) + consolekit? ( >=sys-auth/consolekit-1.0.0 ) + dell? ( + sys-libs/efivar + >=sys-libs/libsmbios-2.4.0 + ) + elogind? ( sys-auth/elogind ) + gpg? ( + app-crypt/gpgme + dev-libs/libgpg-error + ) + nvme? ( sys-libs/efivar ) + pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) + redfish? ( sys-libs/efivar ) + systemd? ( >=sys-apps/systemd-211 ) + thunderbolt? ( sys-apps/thunderbolt-software-user-space ) + uefi? ( + media-libs/fontconfig + media-libs/freetype + sys-boot/gnu-efi + >=sys-libs/efivar-33 + x11-libs/cairo + ) +" +DEPEND="${RDEPEND} + $(vala_depend) + x11-libs/pango[introspection] + nvme? ( >=sys-kernel/linux-headers-4.4 ) + test? ( net-libs/gnutls[tools] ) +" +BDEPEND=" + >=dev-util/meson-0.47.0 + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) + man? ( + app-text/docbook-sgml-utils + sys-apps/help2man + ) +" + +# required for fwupd daemon to run. +# NOT a build time dependency. The build system does not check for dbus. +PDEPEND="sys-apps/dbus" + +PATCHES=( + "${FILESDIR}/${P}-without_systemd_build_fix.patch" +) + +src_prepare() { + default + sed -e "s/'--create'/'--absolute-name', '--create'/" \ + -i data/tests/builder/meson.build || die + sed -e "/'-Werror',/d" \ + -i plugins/uefi/efi/meson.build || die + vala_src_prepare +} + +src_configure() { + xdg_environment_reset + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dagent="$(usex agent true false)" + -Dconsolekit="$(usex consolekit true false)" + -Dgtkdoc="$(usex doc true false)" + -Delogind="$(usex elogind true false)" + -Dgpg="$(usex gpg true false)" + -Dman="$(usex man true false)" + -Dpkcs7="$(usex pkcs7 true false)" + -Dplugin_dell="$(usex dell true false)" + # Dependencies are not available (yet?) + -Dplugin_modem_manager="false" + -Dplugin_nvme="$(usex nvme true false)" + -Dplugin_redfish="$(usex redfish true false)" + -Dplugin_synaptics="$(usex dell true false)" + -Dplugin_thunderbolt="$(usex thunderbolt true false)" + -Dplugin_uefi="$(usex uefi true false)" + -Dsystemd="$(usex systemd true false)" + -Dtests="$(usex test true false)" + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ + "${FILESDIR}"/${PN}-r1 \ + > "${T}"/${PN} || die + doinitd "${T}"/${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 +} + +pkg_postinst() { + elog "In case you are using openrc as init system" + elog "and you're upgrading from <fwupd-1.1.0, you" + elog "need to start the fwupd daemon via the openrc" + elog "init script that comes with this package." +}
