From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EF8B715808B for ; Sun, 20 Mar 2022 22:38:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB63BE07F0; Sun, 20 Mar 2022 22:38:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB957E07F0 for ; Sun, 20 Mar 2022 22:38:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D0C66342C0A for ; Sun, 20 Mar 2022 22:38:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37A2A2FB for ; Sun, 20 Mar 2022 22:38:32 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1647815877.f105cddfadecc651eef8c45ee1576d5ee80c4385.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/upower/files/, sys-power/upower/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch sys-power/upower/upower-0.99.17.ebuild X-VCS-Directories: sys-power/upower/files/ sys-power/upower/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: f105cddfadecc651eef8c45ee1576d5ee80c4385 X-VCS-Branch: master Date: Sun, 20 Mar 2022 22:38:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 390e97a5-d642-448e-9b2c-b5005731a2ea X-Archives-Hash: e6ad3595f6bfbf9e07a1164fbbc40a0e commit: f105cddfadecc651eef8c45ee1576d5ee80c4385 Author: Matt Turner gentoo org> AuthorDate: Sun Mar 20 22:37:23 2022 +0000 Commit: Matt Turner gentoo 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 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 +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