From 7a31ba27e63d23b9b6d60bd225ebb5adf6fa2b2a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 25 Sep 2022 17:02:06 +0200
Subject: [PATCH] meson: bump version

---
 ...eson-0.61.2.recipe => meson-0.63.2.recipe} |  4 +--
 ...-0.61.2.patchset => meson-0.63.2.patchset} | 25 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)
 rename dev-util/meson/{meson-0.61.2.recipe => meson-0.63.2.recipe} (93%)
 rename dev-util/meson/patches/{meson-0.61.2.patchset => meson-0.63.2.patchset} (79%)

diff --git a/dev-util/meson/meson-0.61.2.recipe b/dev-util/meson/meson-0.63.2.recipe
similarity index 93%
rename from dev-util/meson/meson-0.61.2.recipe
rename to dev-util/meson/meson-0.63.2.recipe
index f07fd9608..14114357c 100644
--- a/dev-util/meson/meson-0.61.2.recipe
+++ b/dev-util/meson/meson-0.63.2.recipe
@@ -4,9 +4,9 @@ build system."
 HOMEPAGE="https://mesonbuild.com/"
 COPYRIGHT="2013-2020 The Meson development team"
 LICENSE="Apache v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/mesonbuild/meson/releases/download/$portVersion/meson-$portVersion.tar.gz"
-CHECKSUM_SHA256="0233a7f8d959079318f6052b0939c27f68a5de86ba601f25c9ee6869fb5f5889"
+CHECKSUM_SHA256="16222f17ef76be0542c91c07994f9676ae879f46fc21c0c786a21ef2cb518bbf"
 PATCHES="meson-$portVersion.patchset"
 PYTHON_VERSION="3.7"
 
diff --git a/dev-util/meson/patches/meson-0.61.2.patchset b/dev-util/meson/patches/meson-0.63.2.patchset
similarity index 79%
rename from dev-util/meson/patches/meson-0.61.2.patchset
rename to dev-util/meson/patches/meson-0.63.2.patchset
index 58cbe53e5..c577fbdd8 100644
--- a/dev-util/meson/patches/meson-0.61.2.patchset
+++ b/dev-util/meson/patches/meson-0.63.2.patchset
@@ -1,14 +1,14 @@
-From be94747ea36d7ec0a2747744d3006d8fe0d42a60 Mon Sep 17 00:00:00 2001
+From 1c85cc5b4a5c3bf2f1857ff44a7eb0332d7969d0 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 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 aadf3f8..f2bf548 100644
+index cb432a3..ace605a 100644
 --- a/mesonbuild/dependencies/boost.py
 +++ b/mesonbuild/dependencies/boost.py
-@@ -518,10 +518,11 @@ class BoostDependency(SystemDependency):
+@@ -523,10 +523,11 @@ class BoostDependency(SystemDependency):
  
      def detect_inc_dirs(self, root: Path) -> T.List[BoostIncludeDir]:
          candidates = []  # type: T.List[Path]
@@ -25,17 +25,17 @@ index aadf3f8..f2bf548 100644
 2.30.2
 
 
-From 6081acef2fe915a8b05b7d9f30f05554bba0861f Mon Sep 17 00:00:00 2001
+From f11c4d8f38cbce8d0cc0ac78552e063caefc7f50 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 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 03c5226..f39c919 100644
+index f4afa77..084b544 100644
 --- a/mesonbuild/compilers/detect.py
 +++ b/mesonbuild/compilers/detect.py
-@@ -415,7 +415,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin
+@@ -435,7 +435,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin
          version = search_version(out)
  
          guess_gcc_or_lcc: T.Optional[str] = None
@@ -45,10 +45,10 @@ index 03c5226..f39c919 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 bc40af4..923a8ef 100644
+index 1b1e8a1..73d4753 100644
 --- a/mesonbuild/compilers/mixins/gnu.py
 +++ b/mesonbuild/compilers/mixins/gnu.py
-@@ -280,7 +280,7 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta):
+@@ -275,7 +275,7 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta):
          stdo = self._get_search_dirs(env)
          for line in stdo.split('\n'):
              if line.startswith(name + ':'):
@@ -57,10 +57,10 @@ index bc40af4..923a8ef 100644
          return []
  
      def get_lto_compile_args(self, *, threads: int = 0, mode: str = 'default') -> T.List[str]:
-@@ -396,3 +396,13 @@ class GnuCompiler(GnuLikeCompiler):
-         elif threads > 0:
-             return [f'-flto={threads}']
-         return super().get_lto_compile_args(threads=threads)
+@@ -397,3 +397,13 @@ class GnuCompiler(GnuLikeCompiler):
+         if linker == 'mold' and mesonlib.version_compare(version, '>=12.0.1'):
+             return ['-fuse-ld=mold']
+         return super().use_linker_args(linker, version)
 +
 +    def gnu_symbol_visibility_args(self, vistype: str) -> T.List[str]:
 +        if mesonlib.version_compare(self.version, '< 4'):
@@ -74,4 +74,3 @@ index bc40af4..923a8ef 100644
 -- 
 2.30.2
 
-