| 1 |
commit: a64ae1d3b6f3af052521ec5a14ba07267c88bcc5 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 6 15:22:26 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 6 15:22:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64ae1d3 |
| 7 |
|
| 8 |
sys-apps/fwupd: Fixed build with USE="-agent man" |
| 9 |
|
| 10 |
Thanks-to: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com> |
| 11 |
Closes: https://bugs.gentoo.org/711682 |
| 12 |
Package-Manager: Portage-2.3.92, Repoman-2.3.20 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
.../fwupd-1.3.9-optional_agent_man_page.patch | 57 ++++++++++++++++++++++ |
| 16 |
sys-apps/fwupd/fwupd-1.3.9.ebuild | 1 + |
| 17 |
2 files changed, 58 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..6c9898557ff |
| 22 |
--- /dev/null |
| 23 |
+++ b/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch |
| 24 |
@@ -0,0 +1,57 @@ |
| 25 |
+From bacd3a44fe6f06ddd8bb65a3a56eb1738a65ed8c Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Lars Wendler <polynomial-c@g.o> |
| 27 |
+Date: Fri, 6 Mar 2020 16:00:23 +0100 |
| 28 |
+Subject: [PATCH] Don't build/install fwupdagent man page if agent build is not |
| 29 |
+ requested |
| 30 |
+ |
| 31 |
+Otherwise build fails with: |
| 32 |
+ |
| 33 |
+ src/meson.build:196:2: ERROR: Unknown variable "fwupdagent". |
| 34 |
+ |
| 35 |
+Gentoo-bug: https://bugs.gentoo.org/711682 |
| 36 |
+Signed-off-by: Lars Wendler <polynomial-c@g.o> |
| 37 |
+--- |
| 38 |
+ src/meson.build | 30 ++++++++++++++++-------------- |
| 39 |
+ 1 file changed, 16 insertions(+), 14 deletions(-) |
| 40 |
+ |
| 41 |
+diff --git a/src/meson.build b/src/meson.build |
| 42 |
+index 46a9c4ded..e9aac607e 100644 |
| 43 |
+--- a/src/meson.build |
| 44 |
++++ b/src/meson.build |
| 45 |
+@@ -193,20 +193,22 @@ if build_daemon and get_option('man') |
| 46 |
+ install : true, |
| 47 |
+ install_dir : join_paths(mandir, 'man1'), |
| 48 |
+ ) |
| 49 |
+- custom_target('fwupdagent-man', |
| 50 |
+- input : fwupdagent, |
| 51 |
+- output : 'fwupdagent.1', |
| 52 |
+- command : [ |
| 53 |
+- help2man, '@INPUT@', |
| 54 |
+- '--no-info', |
| 55 |
+- '--output', '@OUTPUT@', |
| 56 |
+- '--name', 'Firmware updating agent', |
| 57 |
+- '--manual', 'User Commands', |
| 58 |
+- '--version-string', fwupd_version, |
| 59 |
+- ], |
| 60 |
+- install : true, |
| 61 |
+- install_dir : join_paths(mandir, 'man1'), |
| 62 |
+- ) |
| 63 |
++ if get_option('agent') |
| 64 |
++ custom_target('fwupdagent-man', |
| 65 |
++ input : fwupdagent, |
| 66 |
++ output : 'fwupdagent.1', |
| 67 |
++ command : [ |
| 68 |
++ help2man, '@INPUT@', |
| 69 |
++ '--no-info', |
| 70 |
++ '--output', '@OUTPUT@', |
| 71 |
++ '--name', 'Firmware updating agent', |
| 72 |
++ '--manual', 'User Commands', |
| 73 |
++ '--version-string', fwupd_version, |
| 74 |
++ ], |
| 75 |
++ install : true, |
| 76 |
++ install_dir : join_paths(mandir, 'man1'), |
| 77 |
++ ) |
| 78 |
++ endif |
| 79 |
+ endif |
| 80 |
+ if get_option('man') |
| 81 |
+ custom_target('fwupdtool-man', |
| 82 |
|
| 83 |
diff --git a/sys-apps/fwupd/fwupd-1.3.9.ebuild b/sys-apps/fwupd/fwupd-1.3.9.ebuild |
| 84 |
index a10af44195e..03fab547386 100644 |
| 85 |
--- a/sys-apps/fwupd/fwupd-1.3.9.ebuild |
| 86 |
+++ b/sys-apps/fwupd/fwupd-1.3.9.ebuild |
| 87 |
@@ -93,6 +93,7 @@ RDEPEND=" |
| 88 |
|
| 89 |
PATCHES=( |
| 90 |
"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch" |
| 91 |
+ "${FILESDIR}/${P}-optional_agent_man_page.patch" |
| 92 |
) |
| 93 |
|
| 94 |
pkg_setup() { |
Archives