Merge pull request 'Factory' (#1) from factory into main

meson-1.10.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c42296f12db316a4515b9375a5df330f2e751ccdd4f608430d41d7d6210e4317
-size 2413969

meson-1.10.1.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmls4wkACgkQwk5jG6ux
-/nA61g/8C1LwJ2MINYonX9aeE13nMaZPYm+k82PK6hK1o43Lu3BqTa/V4Ud8SM1F
-Lm4W02Eph1KI0iwhRqgp6X+FYjvVRaPK4c9K3BWC8xNfLWGkEmPza2Yk6MceRUDQ
-CWjHkhNzfAbM55yAw9o8yGANYxpy+mJfo8wjDsb7OfhkXEuaRHIpi9XxvtmswQvZ
-yAq69PuM5ngQeL1ZVLWSPLUf/nWQ/+Jf3lXTIvcaCNv4Br/vre65qNZt1aM3TnvY
-zpBHmQkx+AHOE0skAnC+rV+br2xeRHD3/chyu90gTuDyoFXVY0HSzAiXw/wLCoWJ
-Nq7uTo/RdR1gE6ZMk4MIUaqObxIv3ahR8Uzac1QMT4uXdUB3hoWSWjpCDFqcxKCY
-2S+oq4xEuMUMP2AQ0N/Gi3+ZVmIbDA8/vqJA4WzVlfV202tkpTVdmbK587O21dUo
-DJRN4Vjj9xOMLSS/TruNxNmg/jt69SB8uWeaMgTjo3x/RHR/rzTBuR3y8QmMBQPu
-cHO0gz0AwaVOXuC8tcLotVLfvYYM9DKNzn28NFrGtzXho1DB0CiVYFkkT9rNm1Di
-keC5nJbR0i3+vMsgqxdBLIIm8UGaMHEMEq4wbHbu2CoV8vqfWV7XBuYhyN0HOh7D
-mXONbA577k/zvsZk9iOpEj9iy8VZIiQ6Iwj961bjP4n9ohUjxtE=
-=/RV8
------END PGP SIGNATURE-----

meson-1.9.1.tar.gz.asc

@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQKpBAABCgCUFiEEYEETBMCdNmKDQO7/zrFn77VyK9YFAmjRjONfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDYw
+NDExMzA0QzA5RDM2NjI4MzQwRUVGRkNFQjE2N0VGQjU3MjJCRDYWHGVzY2h3YXJ0
+ejkzQGdtYWlsLmNvbQAKCRDOsWfvtXIr1ibHD/Yo4tCdjeTG36hyJhrIS/mxwaZY
+8P6b3NHD3VHL7fwqwQrkLqT07qV3Kug6IC09sveD5fF1YRB78jKDjmV7+ialNBnY
+pxVJ3DS5bjJaRVizvZcmHOJuG4ENAiRliEZbCoPJoEiOix2cKO28RrtgecKhZKyF
+ph4CwexyheAw2eZmpI4/BkH4165twcW/GK0L8n1fB+FNO9eEdAen0EzOmPTGKLRs
+DzKbdhEikFxKtASfjh2r0KOuG4LeO0a25wuwJQxTsMPfo5lPbAIWw+BXK1Ll2O60
+jWIbbKqzGthCg6dIiyVjAVdzquqiE0mwcD/Fz+4DLDpztihYmzq5fTV5CniYek+f
+ZhRF7M3qV1Q/bLRasWUKJcPFs7AJ6IzBJ/8XRefP4pw6znRy45s6r4obRvXHATL7
+qnp0dqwBLFHX0TU/HD7DuoN7afqBGKtitycqJkGg+JEtdtxPte1HwcwIbQuW07/F
+gOBVT7FTDTwQ95xTqUkW2B5/GtvZDbv6o0LAYKtVoZ5oqk7UAGgpP+Q7+vS7OUhj
+B6WYHTTO7DWw/QNEk+h/tHWErqpVfK6e641ULyoBHoWa6eKSDDumpo3Y192sAy2M
+N67JiIUf7WJTRoOhjmi+9pD2ye2uO3jSOsqHMrxVsIviz/KNUO17X6qsQJ57NPOy
+ReTA/bd6QzF528A9
+=Kfdd
+-----END PGP SIGNATURE-----

meson-issue-15992.patch

@@ -0,0 +1,21 @@
+Index: meson-1.9.0/data/macros.meson
+===================================================================
+--- meson-1.9.0.orig/data/macros.meson
++++ meson-1.9.0/data/macros.meson
+@@ -29,14 +29,14 @@
+     %{shrink:%{__meson} compile \
+         -C %{_vpath_builddir} \
+         %{_smp_mflags} \
+-        %{?__meson_verbose:--verbose} \
++        %[ 0%{?__meson_verbose} ? "--verbose" : "" ] \
+         %{nil}}
+ 
+ %meson_install \
+     %{shrink:DESTDIR=%{buildroot} %{__meson} install \
+         -C %{_vpath_builddir} \
+         --no-rebuild \
+-        %{!?__meson_verbose:--quiet} \
++        %[ ! 0%{?__meson_verbose} ? "--quiet" : "" ] \
+         %{nil}}
+ 
+ %meson_test \

meson.changes

@@ -1,70 +1,3 @@
--------------------------------------------------------------------
-Mon Jan 19 07:23:47 UTC 2026 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Update to version 1.10.1:
-  + rust: use the linker exe for the linker and not the rustc command list
-  + compilers/detect: Update the build machine information for ASM
-  + gnome: look up g-ir-scanner as a host tool
-  + compilers: add link always args if CompileCheckMode.LINK
-  + compilers: clike: Deduplicate compile and link args from actually used arg list
-  + compilers: Error out on unknown files in compiler checks for MSVC
-  + options: canonicalize to host options anything that is not per-machine
-  + coredata: lookup options for the correct machine
-  + interpreter: listify the values when a dict is passed for the env kwarg
-  + cmake: Fix version kwarg being added to static_library targets
-
--------------------------------------------------------------------
-Tue Dec 30 09:49:55 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Update to version 1.10.0:
-  + Support for the counted_by attribute
-  + Added a values() method for dictionaries
-  + Add cmd_array method to ExternalProgram
-  + Microchip XC32 compiler support
-  + Added OS/2 support
-  + Android cross file generator
-  + Array .slice() method
-  + -Db_vscrt on clang
-  + Added build_subdir arg to various targets
-  + Support for Cargo workspaces
-  + Experimental Codegen module
-  + Methods from compiler object now accept strings for
-    include_directories
-  + meson format has a new --check-diff option
-  + -Db_thinlto_cache now supported for GCC
-  + Using meson.get_compiler() to get a language from another
-    project is marked broken
-  + Experimental C++ import std support
-  + Common Cargo.lock for all Cargo subprojects
-  + Add a configure log in meson-logs
-  + Added new namingscheme option
-  + Rewriter improvements
-  + Passing -C default-linker-libraries to rustc
-  + rustc will receive -C embed-bitcode=no and -C lto command line
-    options
-  + New method to handle GNU and Windows symbol visibility for
-    C/C++/ObjC/ObjC++
-  + Vala BuildTarget dependency enhancements
-  + i18n.xgettext now accepts CustomTarget and CustomTargetIndex as
-    sources
-
--------------------------------------------------------------------
-Wed Nov 26 08:52:33 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Update to version 1.10.0rc2 (pre-release)
-- Rebase reproducible.patch
-- Drop meson-issue-15992.patch and
-  ensure-pending-subproject-options-are-validated.patch: fixed
-  upstream.
-
--------------------------------------------------------------------
-Mon Oct  6 09:35:45 UTC 2025 - Mia Herkt <mia@0x0.st>
-
-- Add ensure-pending-subproject-options-are-validated.patch
-  Fixes unhandled exceptions when boolean options originating from
-  key=value strings are passed to subprojects.
-  gh#mesonbuild/meson#15062
-
 -------------------------------------------------------------------
 Tue Sep 23 07:50:04 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
 

meson.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package meson
 #
-# Copyright (c) 2026 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC and contributors
 # Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -35,7 +35,7 @@
 %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
 %bcond_without  mono
 Name:           meson%{name_ext}
-Version:        1.10.1
+Version:        1.9.1
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -52,6 +52,8 @@ Patch1:         extend-test-timeout-on-qemu-builds.patch
 Patch2:         14001.patch
 # PATCH-FIX-UPSTREAM https://github.com/mesonbuild/meson/pull/14580
 Patch3:         reproducible.patch
+# PATCH-FIX-UPSTREAM -- rpm macros do not allow to override verbosity
+Patch4:         meson-issue-15992.patch
 BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes

reproducible.patch

@@ -11,17 +11,17 @@ Date:   Fri May 9 11:36:03 2025 +0200
     
     This patch was done while working on reproducible builds for openSUSE.
 
-Index: meson-1.10.0rc1/data/macros.meson
+Index: meson-1.8.0/data/macros.meson
 ===================================================================
---- meson-1.10.0rc1.orig/data/macros.meson
-+++ meson-1.10.0rc1/data/macros.meson
+--- meson-1.8.0.orig/data/macros.meson
++++ meson-1.8.0/data/macros.meson
 @@ -28,7 +28,7 @@
  %meson_build \
      %{shrink:%{__meson} compile \
          -C %{_vpath_builddir} \
 -        -j %{_smp_build_ncpus} \
 +        %{_smp_mflags} \
-         %[ 0%{?__meson_verbose} ? "--verbose" : "" ] \
+         %{?__meson_verbose:--verbose} \
          %{nil}}
  
 @@ -42,7 +42,7 @@