[packages/meson] - updated to 1.10.0

qboosh qboosh at pld-linux.org
Wed Jan 14 19:33:31 CET 2026


commit 2f47cb081f6ca546a3ca007f1ce63bd59426708f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jan 14 19:33:30 2026 +0100

    - updated to 1.10.0

 allow-arm-on-arm64.patch | 17 ++++++-----------
 meson.spec               |  8 ++++----
 rpm-macros-pld.patch     |  8 ++++----
 3 files changed, 14 insertions(+), 19 deletions(-)
---
diff --git a/meson.spec b/meson.spec
index f0383e8..4676949 100644
--- a/meson.spec
+++ b/meson.spec
@@ -1,13 +1,13 @@
 Summary:	High productivity build system
 Summary(pl.UTF-8):	System budowania o dużej produktywności
 Name:		meson
-Version:	1.8.1
-Release:	2
+Version:	1.10.0
+Release:	1
 License:	Apache v2.0
 Group:		Development/Tools
 #Source0Download: https://github.com/mesonbuild/meson/releases/
 Source0:	https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	5cfd7e2b2246d874746d68ffd43a0774
+# Source0-md5:	fe7736c2b6dc4bae42a564f9a5d85f4b
 Patch0:		%{name}-gtkdocdir.patch
 Patch1:		rust-proc-macro-filter-out-target.patch
 Patch2:		allow-arm-on-arm64.patch
@@ -58,7 +58,7 @@ Mesona.
 %setup -q
 %patch -P0 -p1
 %patch -P1 -p1
-%patch -P2 -p1 -R
+%patch -P2 -p1
 %patch -P3 -p1
 %patch -P4 -p1
 
diff --git a/allow-arm-on-arm64.patch b/allow-arm-on-arm64.patch
index 011de41..205d3d6 100644
--- a/allow-arm-on-arm64.patch
+++ b/allow-arm-on-arm64.patch
@@ -13,17 +13,12 @@ unnecessarily fail due to attempting to run a sanity check executable.
  mesonbuild/environment.py | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index be40dbcfd4be..f71bf219cf64 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -512,8 +512,7 @@ def machine_info_can_run(machine_info: MachineInfo):
+--- meson-1.10.0/mesonbuild/envconfig.py.orig	2025-12-08 17:48:52.000000000 +0100
++++ meson-1.10.0/mesonbuild/envconfig.py	2026-01-13 18:58:48.160305328 +0100
+@@ -750,4 +750,5 @@ def machine_info_can_run(machine_info: M
      return \
          (machine_info.cpu_family == true_build_cpu_family) or \
          ((true_build_cpu_family == 'x86_64') and (machine_info.cpu_family == 'x86')) or \
--        ((true_build_cpu_family == 'mips64') and (machine_info.cpu_family == 'mips')) or \
--        ((true_build_cpu_family == 'aarch64') and (machine_info.cpu_family == 'arm'))
-+        ((true_build_cpu_family == 'mips64') and (machine_info.cpu_family == 'mips'))
- 
- class Environment:
-     private_dir = 'meson-private'
+-        ((true_build_cpu_family == 'mips64') and (machine_info.cpu_family == 'mips'))
++        ((true_build_cpu_family == 'mips64') and (machine_info.cpu_family == 'mips')) or \
++        ((true_build_cpu_family == 'aarch64') and (machine_info.cpu_family == 'arm'))
diff --git a/rpm-macros-pld.patch b/rpm-macros-pld.patch
index e1c43ad..63a8258 100644
--- a/rpm-macros-pld.patch
+++ b/rpm-macros-pld.patch
@@ -1,5 +1,5 @@
---- meson-1.8.1/data/macros.meson.orig	2025-05-23 23:51:05.000000000 +0200
-+++ meson-1.8.1/data/macros.meson	2025-05-25 18:34:27.941441519 +0200
+--- meson-1.10.0/data/macros.meson.orig	2025-12-08 17:48:52.000000000 +0100
++++ meson-1.10.0/data/macros.meson	2026-01-14 19:25:31.156885507 +0100
 @@ -1,6 +1,6 @@
  %__meson %{_bindir}/meson
  %__meson_wrap_mode nodownload
@@ -20,8 +20,8 @@
      %{shrink:%{__meson} compile \
          -C %{_vpath_builddir} \
 -        -j %{_smp_build_ncpus} \
-+        %{?_smp_mflags}
-         %{?__meson_verbose:--verbose} \
++        %{?_smp_mflags} \
+         %[ 0%{?__meson_verbose} ? "--verbose" : "" ] \
          %{nil}}
  
 @@ -42,7 +43,7 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/meson.git/commitdiff/2f47cb081f6ca546a3ca007f1ce63bd59426708f



More information about the pld-cvs-commit mailing list