rpms/libqmi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix build with meson >= 1.7 (RHEL-133035)

Browse Source 
Resolves: https://issues.redhat.com/browse/RHEL-133035
This commit is contained in:
Beniamino Galvani 2025-12-15 14:36:02 +01:00
parent add17d3417
commit 748b45ffda
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0010-build-build-doc-target-by-default-for-meson-1.7.0.patch Normal file
View File

@ -0,0 +1,33 @@
From 261f560f2ce83474a0e7eae81b38144d4def7b8d Mon Sep 17 00:00:00 2001
From: Dan Williams <dan@ioncontrol.co>
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
(cherry picked from commit 48481f3eeb3fc7e4edfdafce53330018982aaeaf)
---
docs/reference/libqmi-glib/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/docs/reference/libqmi-glib/meson.build b/docs/reference/libqmi-glib/meson.build
index 2f5cfc37..14e1aea6 100644
--- 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(
--
2.52.0

6
libqmi.spec
View File

@ -1,6 +1,6 @@
Name: libqmi
Version: 1.34.0
Release: 8%{?dist}
Release: 9%{?dist}
Summary: Support library to use the Qualcomm MSM Interface (QMI) protocol
License: LGPL-2.1-or-later
URL: http://freedesktop.org/software/libqmi
@ -19,6 +19,7 @@ Patch6: 0006-qmicli-dms-do-not-leak-result-on-error.patch
Patch7: 0007-qmicli-nas-avoid-leaking-mnc.patch
Patch8: 0008-qmicli-pdc-avoid-leaking-file_contents.patch
Patch9: 0009-qmicli-ims-fix-a-silly-argument-mixup.patch
Patch10: 0010-build-build-doc-target-by-default-for-meson-1.7.0.patch
BuildRequires: meson >= 0.53
BuildRequires: gcc
@ -109,6 +110,9 @@ cp -a src/qmicli/qmicli %{buildroot}%{_datadir}/bash-completion/completions/
%changelog
* Mon Dec 15 2025 Beniamino Galvani <bgalvani@redhat.com> - 1.34.0-9
- Fix build with meson >= 1.7 (RHEL-133035)
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.34.0-8
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018