commit: 4c902d70145fe8f5fc7c0a709c5fd984b56adcb3 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Sun Jul 13 02:52:39 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jul 13 06:48:11 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c902d70
net-libs/libqmi: fix gtkdoc without tests on >=meson-1.7.0 Closes: https://bugs.gentoo.org/951878 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42981 Signed-off-by: Sam James <sam <AT> gentoo.org> ...i-1.32.4-gtkdoc-without-tests-meson-1.7.0.patch | 30 ++++++++++++++++++++++ net-libs/libqmi/libqmi-1.32.4-r1.ebuild | 6 ++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/net-libs/libqmi/files/libqmi-1.32.4-gtkdoc-without-tests-meson-1.7.0.patch b/net-libs/libqmi/files/libqmi-1.32.4-gtkdoc-without-tests-meson-1.7.0.patch new file mode 100644 index 000000000000..b45f8e9b0b12 --- /dev/null +++ b/net-libs/libqmi/files/libqmi-1.32.4-gtkdoc-without-tests-meson-1.7.0.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/951878 +https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/124 +https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/merge_requests/408 +https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/48481f3eeb3fc7e4edfdafce53330018982aaeaf + +From 48481f3eeb3fc7e4edfdafce53330018982aaeaf Mon Sep 17 00:00:00 2001 +From: Dan Williams <[email protected]> +Date: Mon, 7 Apr 2025 17:44:23 -0500 +Subject: [PATCH] build: build doc target by default for meson >= 1.7.0 + +Meson 1.7.0 no longer builds test targets by default, and gtkdoc doesn't +expose enough dependency info (yet) for meson to know what sub-targets +to build when docs are enabled for install. Work around that for now. + +Fixes: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/124 + +Found by, and fix proposed by, Marcin Serwin +--- a/docs/reference/libqmi-glib/meson.build ++++ b/docs/reference/libqmi-glib/meson.build +@@ -57,6 +57,7 @@ sections_txt = custom_target( + capture: true, + command: [find_program('cat'), '@INPUT@'] + gen_sections, + depends: gen_sections_deps, ++ build_by_default: true, + ) + + version_xml = configure_file( +-- +GitLab + diff --git a/net-libs/libqmi/libqmi-1.32.4-r1.ebuild b/net-libs/libqmi/libqmi-1.32.4-r1.ebuild index d2b7f46a4d21..52555b5a58bb 100644 --- a/net-libs/libqmi/libqmi-1.32.4-r1.ebuild +++ b/net-libs/libqmi/libqmi-1.32.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -34,6 +34,10 @@ BDEPEND=" gtk-doc? ( dev-util/gtk-doc ) " +PATCHES=( + "${FILESDIR}"/libqmi-1.32.4-gtkdoc-without-tests-meson-1.7.0.patch +) + src_configure() { local emesonargs=( $(meson_use mbim mbim_qmux)
