meson: update to 0.60.2

patch required to fix:
- https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/170

packages/python/devel/meson/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="meson"
-PKG_VERSION="0.59.2"
-PKG_SHA256="13dee549a7ba758b7e33ce7719f28d1d337a98d10d378a4779ccc996f5a2fc49"
+PKG_VERSION="0.60.2"
+PKG_SHA256="64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921"
 PKG_LICENSE="Apache"
 PKG_SITE="http://mesonbuild.com"
 PKG_URL="https://github.com/mesonbuild/meson/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"

packages/python/devel/meson/patches/meson-0.60.x-revert-9445.patch

@@ -0,0 +1,39 @@
+[REVERT] [PATCH] i18n: merge_file() deprecate positional arguments
+
+[REVERT] reenable hard failure
+
+They always have been ignored but it became an hard error with no
+deprecation period in 0.60.0. Since it breaks some GNOME projects,
+deprecate for now and keep it removed for 0.61.0.
+
+diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py
+index 7c6f0f4dab6..975fbf63b0b 100644
+--- a/mesonbuild/modules/i18n.py
++++ b/mesonbuild/modules/i18n.py
+@@ -22,7 +22,7 @@
+ from .. import mlog
+ from ..interpreter.type_checking import CT_BUILD_BY_DEFAULT, CT_INPUT_KW, CT_INSTALL_DIR_KW, CT_INSTALL_TAG_KW, CT_OUTPUT_KW, INSTALL_KW, NoneType, in_set_validator
+ from ..interpreterbase import FeatureNew
+-from ..interpreterbase.decorators import ContainerTypeInfo, KwargInfo, typed_kwargs, typed_pos_args
++from ..interpreterbase.decorators import ContainerTypeInfo, KwargInfo, noPosargs, typed_kwargs, typed_pos_args
+ from ..scripts.gettext import read_linguas
+ 
+ if T.TYPE_CHECKING:
+@@ -128,6 +128,7 @@
+         return [path.join(src_dir, d) for d in dirs]
+ 
+     @FeatureNew('i18n.merge_file', '0.37.0')
++    @noPosargs
+     @typed_kwargs(
+         'i18n.merge_file',
+         CT_BUILD_BY_DEFAULT,
+@@ -142,9 +143,6 @@
+         KwargInfo('type', str, default='xml', validator=in_set_validator({'xml', 'desktop'})),
+     )
+     def merge_file(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: 'MergeFile') -> ModuleReturnValue:
+-        if args:
+-            mlog.deprecation('i18n.merge_file does not take any positional arguments. '
+-                             'This will become a hard error in the next Meson release.')
+         if not shutil.which('xgettext'):
+             self.nogettext_warning()
+             return ModuleReturnValue(None, [])