meson.recipe: Bump to 1.2.3

Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1285>

2 files changed, 2 insertions, 55 deletions

diff --git a/recipes/build-tools/meson.recipe b/recipes/build-tools/meson.recipe
index 7b2a96aa..21297adb 100644
--- a/recipes/build-tools/meson.recipe
+++ b/recipes/build-tools/meson.recipe
@@ -6,7 +6,7 @@ from pathlib import PurePath, Path
 
 class Recipe(recipe.Recipe):
     name = 'meson'
-    version = '1.1.1'
+    version = '1.2.3'
     licenses = [License.Apachev2]
     btype = BuildType.CUSTOM
 
@@ -18,16 +18,11 @@ class Recipe(recipe.Recipe):
     else:
         stype = SourceType.TARBALL
         url = 'https://github.com/mesonbuild/meson/releases/download/%(version)s/meson-%(version)s.tar.gz'
-        tarball_checksum = 'd04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c'
+        tarball_checksum = '4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1'
 
     files_bin = ['bin/meson']
     files_python = []
 
-    patches = [
-        # https://github.com/mesonbuild/meson/pull/11101
-        'meson/0001-dependencies-qt-add-support-for-Qt-frameworks-refere.patch',
-    ]
-
     async def install(self):
         # setup.py barfs if using posix paths on Windows
         if self.config.platform == Platform.WINDOWS:
diff --git a/recipes/build-tools/meson/0001-dependencies-qt-add-support-for-Qt-frameworks-refere.patch b/recipes/build-tools/meson/0001-dependencies-qt-add-support-for-Qt-frameworks-refere.patch
deleted file mode 100644
index 7f414e22..00000000
--- a/recipes/build-tools/meson/0001-dependencies-qt-add-support-for-Qt-frameworks-refere.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From dcbd46813b57289e5d115b2011bf1399312c7e8c Mon Sep 17 00:00:00 2001
-From: Matthew Waters <matthew@centricular.com>
-Date: Tue, 22 Nov 2022 13:08:06 +1100
-Subject: [PATCH] dependencies/qt: add support for Qt frameworks referencing
- includes in include directory
-
-e.g. QtQml with Qt 6.4.0 referencing QtQmlIntegration is one such example
----
- mesonbuild/dependencies/qt.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/dependencies/qt.py b/mesonbuild/dependencies/qt.py
-index e1e9e07..09731e5 100644
---- a/mesonbuild/dependencies/qt.py
-+++ b/mesonbuild/dependencies/qt.py
-@@ -103,9 +103,10 @@ def _get_modules_lib_suffix(version: str, info: 'MachineInfo', is_debug: bool) -
- 
- 
- class QtExtraFrameworkDependency(ExtraFrameworkDependency):
--    def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any], language: T.Optional[str] = None):
-+    def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any], qvars: T.Dict[str, str], language: T.Optional[str] = None):
-         super().__init__(name, env, kwargs, language=language)
-         self.mod_name = name[2:]
-+        self.qt_extra_include_directory = qvars['QT_INSTALL_HEADERS']
- 
-     def get_compile_args(self, with_private_headers: bool = False, qt_version: str = "0") -> T.List[str]:
-         if self.found():
-@@ -113,6 +114,8 @@ class QtExtraFrameworkDependency(ExtraFrameworkDependency):
-             args = ['-I' + mod_inc_dir]
-             if with_private_headers:
-                 args += ['-I' + dirname for dirname in _qt_get_private_includes(mod_inc_dir, self.mod_name, qt_version)]
-+            if self.qt_extra_include_directory:
-+                args += ['-I' + self.qt_extra_include_directory]
-             return args
-         return []
- 
-@@ -359,7 +362,7 @@ class QmakeQtDependency(_QtBase, ConfigToolDependency, metaclass=abc.ABCMeta):
-         for m in modules:
-             fname = 'Qt' + m
-             mlog.debug('Looking for qt framework ' + fname)
--            fwdep = QtExtraFrameworkDependency(fname, self.env, fw_kwargs, language=self.language)
-+            fwdep = QtExtraFrameworkDependency(fname, self.env, fw_kwargs, qvars, language=self.language)
-             if fwdep.found():
-                 self.compile_args.append('-F' + libdir)
-                 self.compile_args += fwdep.get_compile_args(with_private_headers=self.private_headers,
--- 
-2.37.0 (Apple Git-136)
-