commit: f105cddfadecc651eef8c45ee1576d5ee80c4385 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun Mar 20 22:37:23 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Mar 20 22:37:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f105cddf
sys-power/upower: Fix build with USE=-doc Closes: https://bugs.gentoo.org/835696 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> ...eson-Don-t-search-for-gtk-doc-if-disabled.patch | 60 ++++++++++++++++++++++ sys-power/upower/upower-0.99.17.ebuild | 4 ++ 2 files changed, 64 insertions(+) diff --git a/sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch b/sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch new file mode 100644 index 000000000000..ead41d2e64c8 --- /dev/null +++ b/sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch @@ -0,0 +1,60 @@ +https://gitlab.freedesktop.org/upower/upower/-/merge_requests/123 + +From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001 +From: Matt Turner <matts...@gmail.com> +Date: Sun, 20 Mar 2022 15:32:55 -0700 +Subject: [PATCH] meson: Don't search for gtk-doc if disabled + +--- + doc/meson.build | 38 ++++++++++++++++++++------------------ + 1 file changed, 20 insertions(+), 18 deletions(-) + +diff --git a/doc/meson.build b/doc/meson.build +index dc93a16..5fc253c 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -27,21 +27,23 @@ version_xml = configure_file( + input: 'version.xml.in', + configuration: cdata) + +-gnome.gtkdoc('UPower', +- main_xml: 'upower-docs.xml', +- src_dir: meson.source_root() / 'libupower-glib', +- dependencies: [ libupower_glib_dep ], +- scan_args: ['--rebuild-types', '--rebuild-sections'], +- content_files: [ +- version_xml, +- ifaces_refs, +- 'man/UPower.xml', +- 'man/upowerd.xml', +- 'man/upower.xml', +- '../COPYING', +- ], +- ignore_headers: [ +- 'config.h', +- ], +- install: get_option('gtk-doc') +-) ++if get_option('gtk-doc') ++ gnome.gtkdoc('UPower', ++ main_xml: 'upower-docs.xml', ++ src_dir: meson.source_root() / 'libupower-glib', ++ dependencies: [ libupower_glib_dep ], ++ scan_args: ['--rebuild-types', '--rebuild-sections'], ++ content_files: [ ++ version_xml, ++ ifaces_refs, ++ 'man/UPower.xml', ++ 'man/upowerd.xml', ++ 'man/upower.xml', ++ '../COPYING', ++ ], ++ ignore_headers: [ ++ 'config.h', ++ ], ++ install: true ++ ) ++endif +-- +2.34.1 + diff --git a/sys-power/upower/upower-0.99.17.ebuild b/sys-power/upower/upower-0.99.17.ebuild index 6a7dbc6a0d03..6dba8fb1854a 100644 --- a/sys-power/upower/upower-0.99.17.ebuild +++ b/sys-power/upower/upower-0.99.17.ebuild @@ -44,6 +44,10 @@ S="${WORKDIR}/${PN}-v${PV}" QA_MULTILIB_PATHS="usr/lib/${PN}/.*" +PATCHES=( + "${FILESDIR}"/${P}-meson-Don-t-search-for-gtk-doc-if-disabled.patch +) + src_prepare() { default xdg_environment_reset
