commit: bb500bebf84b032a2409c94f94881097f2386457 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Sun Jul 13 02:22:53 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jul 13 06:48:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb500beb
net-libs/libmbim: fix gtkdoc without tests on >=meson-1.7.0 Closes: https://bugs.gentoo.org/950976 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> ...m-1.28.4-gtkdoc-without-tests-meson-1.7.0.patch | 32 ++++++++++++++++++++++ net-libs/libmbim/libmbim-1.28.4-r1.ebuild | 6 +++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/net-libs/libmbim/files/libmbim-1.28.4-gtkdoc-without-tests-meson-1.7.0.patch b/net-libs/libmbim/files/libmbim-1.28.4-gtkdoc-without-tests-meson-1.7.0.patch new file mode 100644 index 000000000000..0c64569dc597 --- /dev/null +++ b/net-libs/libmbim/files/libmbim-1.28.4-gtkdoc-without-tests-meson-1.7.0.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/950976 +https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/124 +https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/merge_requests/228 +https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/c78b215f058e6fe6e6cc90943a50fd1e84a878b0 + +From c78b215f058e6fe6e6cc90943a50fd1e84a878b0 Mon Sep 17 00:00:00 2001 +From: Dan Williams <[email protected]> +Date: Mon, 7 Apr 2025 21:43:56 -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. + +See also: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/124 + +Found by, and fix proposed by, Marcin Serwin + +Signed-off-by: Dan Williams <[email protected]> +--- a/docs/reference/libmbim-glib/meson.build ++++ b/docs/reference/libmbim-glib/meson.build +@@ -48,6 +48,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/libmbim/libmbim-1.28.4-r1.ebuild b/net-libs/libmbim/libmbim-1.28.4-r1.ebuild index 44db18217b95..ad61ac807328 100644 --- a/net-libs/libmbim/libmbim-1.28.4-r1.ebuild +++ b/net-libs/libmbim/libmbim-1.28.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 @@ -27,6 +27,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/libmbim-1.28.4-gtkdoc-without-tests-meson-1.7.0.patch +) + src_configure() { local emesonargs=( -Dman=true
