File 14001.patch of Package meson.20260224220929
From 8679ea9525672d74030303be062d9545c92b5840 Mon Sep 17 00:00:00 2001
From: solomoncyj <solomoncyj@gmail.com>
Date: Sun, 15 Dec 2024 21:00:42 +0800
Subject: [PATCH 1/2] feat: set up dependencies generation for fedora
---
data/macros.meson | 5 +++++
data/mesongenbuildreq.py | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 data/mesongenbuildreq.py
Index: meson-1.10.1/data/macros.meson
===================================================================
--- meson-1.10.1.orig/data/macros.meson
+++ meson-1.10.1/data/macros.meson
@@ -47,6 +47,11 @@
%{?qemu_user_space_build: -t 10} \
%{nil}}
+%meson_buildrequires \
+ %{shrink: python3 %{_rpmconfigdir}/mesongenbuildreq %{__meson} \
+ %{nil}}
+
+
# Declarative buildsystem, requires RPM 4.20+ to work
# https://rpm-software-management.github.io/rpm/manual/buildsystem.html
%buildsystem_meson_conf() %meson %*
Index: meson-1.10.1/data/mesongenbuildreq.py
===================================================================
--- /dev/null
+++ meson-1.10.1/data/mesongenbuildreq.py
@@ -0,0 +1,61 @@
+import subprocess
+import json
+import sys
+import os
+
+# Configuration from ENV
+ignore_deps = set(os.environ.get("BUILDREQ_IGNORE_DEP", "").split())
+only_required = os.environ.get("BUILDREQ_ONLY_REQUIRED", "false").lower() == "true"
+
+# Run introspection
+try:
+ result = subprocess.run([sys.argv[1], "introspect", "--dependencies", "meson.build"],
+ capture_output=True, text=True, check=True)
+ deps_json = json.loads(result.stdout)
+except Exception as e:
+ print(f"Error: {e}", file=sys.stderr)
+ sys.exit(1)
+
+deps = {}
+for entry in deps_json:
+ name = entry['name']
+ if name in ignore_deps:
+ continue
+ if only_required and not entry.get('required', True):
+ continue
+ deps[name] = entry['version']
+
+for lib, versions in deps.items():
+ formatted_versions = []
+ for v in versions:
+ # Step 1: Remove all spaces to get a "clean" string like ">=2.72.0"
+ v = v.replace(" ", "")
+
+ # Step 2: Separate the operator from the version
+ # We find where the first digit or letter starts
+ pivot = 0
+ for i, char in enumerate(v):
+ if char.isalnum():
+ pivot = i
+ break
+
+ # Step 3: Reconstruct with exactly one space: ">= 2.72.0"
+ if pivot > 0:
+ v = f"{v[:pivot]} {v[pivot:]}"
+ formatted_versions.append(v)
+
+ # Step 4: Ensure a space exists before the version block starts
+ # This ensures "pkgconfig(lib) >= 1.0" instead of "pkgconfig(lib)>= 1.0"
+ version_str = f" {' '.join(formatted_versions)}" if formatted_versions else ""
+
+ line = []
+ for prefix in ["cmake", "pkgconfig", "qmake"]:
+ buildreq = f"{prefix}({lib}){version_str}"
+
+ # Cleanup: remove trailing operators if version was empty
+ if buildreq.endswith(('=', '<', '>')):
+ buildreq = buildreq.rstrip('=<>')
+
+ line.append(buildreq)
+
+ print(f"({' or '.join(line)})")