From 4270449b7bfaaa209b99c475dde578011f799e26 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 11 Oct 2025 11:25:35 +0200 Subject: [PATCH] meson, bump to 1.9.1 (#13050) --- ...{meson-1.8.2.recipe => meson-1.9.1.recipe} | 4 +-- ...on-1.8.2.patchset => meson-1.9.1.patchset} | 34 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) rename dev-build/meson/{meson-1.8.2.recipe => meson-1.9.1.recipe} (93%) rename dev-build/meson/patches/{meson-1.8.2.patchset => meson-1.9.1.patchset} (87%) diff --git a/dev-build/meson/meson-1.8.2.recipe b/dev-build/meson/meson-1.9.1.recipe similarity index 93% rename from dev-build/meson/meson-1.8.2.recipe rename to dev-build/meson/meson-1.9.1.recipe index 318983557..0052de30f 100644 --- a/dev-build/meson/meson-1.8.2.recipe +++ b/dev-build/meson/meson-1.9.1.recipe @@ -2,11 +2,11 @@ SUMMARY="A High productivity build system" DESCRIPTION="Meson® is a project to create the best possible next-generation \ build system." HOMEPAGE="https://mesonbuild.com/" -COPYRIGHT="2013-2024 The Meson development team" +COPYRIGHT="2013-2025 The Meson development team" LICENSE="Apache v2" REVISION="1" SOURCE_URI="https://github.com/mesonbuild/meson/releases/download/$portVersion/meson-$portVersion.tar.gz" -CHECKSUM_SHA256="c105816d8158c76b72adcb9ff60297719096da7d07f6b1f000fd8c013cd387af" +CHECKSUM_SHA256="4e076606f2afff7881d195574bddcd8d89286f35a17b4977a216f535dc0c74ac" PATCHES="meson-$portVersion.patchset" PYTHON_VERSION="3.10" diff --git a/dev-build/meson/patches/meson-1.8.2.patchset b/dev-build/meson/patches/meson-1.9.1.patchset similarity index 87% rename from dev-build/meson/patches/meson-1.8.2.patchset rename to dev-build/meson/patches/meson-1.9.1.patchset index c0f4ffcc0..9a1776fd9 100644 --- a/dev-build/meson/patches/meson-1.8.2.patchset +++ b/dev-build/meson/patches/meson-1.9.1.patchset @@ -1,14 +1,14 @@ -From 29bd208538d1aed328efc149acb20cd112ad5d61 Mon Sep 17 00:00:00 2001 +From cd80688dfb321acbc7e9be7564246e4fcace77c8 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 3 Aug 2020 11:56:45 +0200 Subject: Fix include path for boost diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py -index 662f985..7d38b22 100644 +index fdb35d4..eaa3688 100644 --- a/mesonbuild/dependencies/boost.py +++ b/mesonbuild/dependencies/boost.py -@@ -516,10 +516,11 @@ class BoostDependency(SystemDependency): +@@ -539,10 +539,11 @@ class BoostDependency(SystemDependency): def detect_inc_dirs(self, root: Path) -> T.List[BoostIncludeDir]: candidates: T.List[Path] = [] @@ -22,17 +22,17 @@ index 662f985..7d38b22 100644 for i in inc_root.iterdir(): if not i.is_dir() or not i.name.startswith('boost-'): -- -2.48.1 +2.51.0 -From 41a18bfa8c8062baa54981d2e08773c43b65c9bb Mon Sep 17 00:00:00 2001 +From df95b4db10d2ac95052da33aeaeea6a0d2ba7a01 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 26 Nov 2021 11:39:48 +0100 Subject: add support for gcc 2.95.3 diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py -index 53bdd85..1c1319d 100644 +index f57957f..db3162c 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -336,7 +336,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin @@ -45,7 +45,7 @@ index 53bdd85..1c1319d 100644 if 'e2k' in out and 'lcc' in out: guess_gcc_or_lcc = 'lcc' diff --git a/mesonbuild/compilers/mixins/gnu.py b/mesonbuild/compilers/mixins/gnu.py -index 9ea591e..b4c1ee2 100644 +index ddcd14a..d78e575 100644 --- a/mesonbuild/compilers/mixins/gnu.py +++ b/mesonbuild/compilers/mixins/gnu.py @@ -488,7 +488,7 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta): @@ -57,7 +57,7 @@ index 9ea591e..b4c1ee2 100644 return [] def get_lto_compile_args(self, *, threads: int = 0, mode: str = 'default') -> T.List[str]: -@@ -632,6 +632,16 @@ class GnuCompiler(GnuLikeCompiler): +@@ -634,6 +634,16 @@ class GnuCompiler(GnuLikeCompiler): def get_profile_use_args(self) -> T.List[str]: return super().get_profile_use_args() + ['-fprofile-correction'] @@ -75,20 +75,20 @@ index 9ea591e..b4c1ee2 100644 class GnuCStds(Compiler): -- -2.48.1 +2.51.0 -From 7bc22d2bad69b19204e1f37978a6dd3147e3fbc7 Mon Sep 17 00:00:00 2001 +From 2930cafe09d76ccaa3c802367ff33a506cb76884 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 12 Apr 2023 17:58:48 +0200 Subject: Revert b1384b9c9f64ff909d5431176503a7dcdadd426c diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py -index cc0450a..30397c1 100644 +index 8eb382b..c639e8e 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py -@@ -705,9 +705,6 @@ class PkgConfigModule(NewExtensionModule): +@@ -723,9 +723,6 @@ class PkgConfigModule(NewExtensionModule): if m.is_freebsd(): pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('prefix'))), 'libdata', 'pkgconfig') pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig') @@ -99,10 +99,10 @@ index cc0450a..30397c1 100644 pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('libdir'))), 'pkgconfig') pkgroot_name = os.path.join('{libdir}', 'pkgconfig') -- -2.48.1 +2.51.0 -From d237e1745b20bb231a8545dadf03390d130a2224 Mon Sep 17 00:00:00 2001 +From 79897326c7096dd27f9851a644f7c0d3e8c60d40 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 12 Aug 2023 09:56:44 +0100 Subject: python module: Respect PATH when python is not given in machine file @@ -113,10 +113,10 @@ if `python3` is not found in the PATH. https://github.com/mesonbuild/meson/pull/12116 diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py -index 2a7e685..237f498 100644 +index 3c07960..c4a353b 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py -@@ -442,7 +442,9 @@ class PythonModule(ExtensionModule): +@@ -440,7 +440,9 @@ class PythonModule(ExtensionModule): def _find_installation_impl(self, state: 'ModuleState', display_name: str, name_or_path: str, required: bool) -> MaybePythonProg: if not name_or_path: @@ -128,5 +128,5 @@ index 2a7e685..237f498 100644 tmp_python = ExternalProgram.from_entry(display_name, name_or_path) python = PythonExternalProgram(display_name, ext_prog=tmp_python) -- -2.48.1 +2.51.0