From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
Date: Fri, 6 Mar 2020 15:23:04 +0000 (UTC) [thread overview]
Message-ID: <1583508178.a64ae1d3b6f3af052521ec5a14ba07267c88bcc5.polynomial-c@gentoo> (raw)
commit: a64ae1d3b6f3af052521ec5a14ba07267c88bcc5
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 6 15:22:26 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 6 15:22:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64ae1d3
sys-apps/fwupd: Fixed build with USE="-agent man"
Thanks-to: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com>
Closes: https://bugs.gentoo.org/711682
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../fwupd-1.3.9-optional_agent_man_page.patch | 57 ++++++++++++++++++++++
sys-apps/fwupd/fwupd-1.3.9.ebuild | 1 +
2 files changed, 58 insertions(+)
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch b/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch
new file mode 100644
index 00000000000..6c9898557ff
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch
@@ -0,0 +1,57 @@
+From bacd3a44fe6f06ddd8bb65a3a56eb1738a65ed8c Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 6 Mar 2020 16:00:23 +0100
+Subject: [PATCH] Don't build/install fwupdagent man page if agent build is not
+ requested
+
+Otherwise build fails with:
+
+ src/meson.build:196:2: ERROR: Unknown variable "fwupdagent".
+
+Gentoo-bug: https://bugs.gentoo.org/711682
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/meson.build | 30 ++++++++++++++++--------------
+ 1 file changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 46a9c4ded..e9aac607e 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -193,20 +193,22 @@ if build_daemon and get_option('man')
+ install : true,
+ install_dir : join_paths(mandir, 'man1'),
+ )
+- custom_target('fwupdagent-man',
+- input : fwupdagent,
+- output : 'fwupdagent.1',
+- command : [
+- help2man, '@INPUT@',
+- '--no-info',
+- '--output', '@OUTPUT@',
+- '--name', 'Firmware updating agent',
+- '--manual', 'User Commands',
+- '--version-string', fwupd_version,
+- ],
+- install : true,
+- install_dir : join_paths(mandir, 'man1'),
+- )
++ if get_option('agent')
++ custom_target('fwupdagent-man',
++ input : fwupdagent,
++ output : 'fwupdagent.1',
++ command : [
++ help2man, '@INPUT@',
++ '--no-info',
++ '--output', '@OUTPUT@',
++ '--name', 'Firmware updating agent',
++ '--manual', 'User Commands',
++ '--version-string', fwupd_version,
++ ],
++ install : true,
++ install_dir : join_paths(mandir, 'man1'),
++ )
++ endif
+ endif
+ if get_option('man')
+ custom_target('fwupdtool-man',
diff --git a/sys-apps/fwupd/fwupd-1.3.9.ebuild b/sys-apps/fwupd/fwupd-1.3.9.ebuild
index a10af44195e..03fab547386 100644
--- a/sys-apps/fwupd/fwupd-1.3.9.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.9.ebuild
@@ -93,6 +93,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+ "${FILESDIR}/${P}-optional_agent_man_page.patch"
)
pkg_setup() {
next reply other threads:[~2020-03-06 15:23 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-06 15:23 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-22 11:03 [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/ Marek Szuba
2023-09-28 8:25 Marek Szuba
2023-08-25 10:48 Marek Szuba
2023-05-19 8:37 Marek Szuba
2023-03-30 9:47 Marek Szuba
2023-03-06 22:06 Marek Szuba
2022-08-31 13:24 Marek Szuba
2022-02-28 9:46 Lars Wendler
2021-10-15 14:33 Thomas Deutschmann
2021-06-15 23:04 Thomas Deutschmann
2021-06-15 23:04 Thomas Deutschmann
2021-05-20 9:11 Lars Wendler
2021-05-20 9:10 Lars Wendler
2021-05-20 9:10 Lars Wendler
2021-02-23 15:43 Lars Wendler
2021-02-16 16:22 Lars Wendler
2020-06-18 16:35 Lars Wendler
2020-06-15 11:38 Lars Wendler
2020-03-06 15:26 Lars Wendler
2020-03-06 12:36 Lars Wendler
2020-02-17 9:11 Lars Wendler
2019-04-15 12:18 Lars Wendler
2019-03-31 18:40 Lars Wendler
2019-03-28 11:50 Lars Wendler
2018-07-18 9:50 Lars Wendler
2017-07-05 6:29 Lars Wendler
2017-05-24 12:55 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1583508178.a64ae1d3b6f3af052521ec5a14ba07267c88bcc5.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox