Accepting request 998800 from GNOME:Next

- Update to version 0.63.1:
  + add_project_dependencies() function.
  + Coverage targets now respect tool config files.
  + D compiler checks.
  + Deprecate an option and replace it with a new one.
  + Running Windows executables with Wine in meson devenv.
  + Diff files for wraps.
  + Added preserve_path arg to install_headers.
  + Support for mold linker added.
  + Added debug function.
  + Compiler options can be set per subproject.
  + Per-subproject languages.
  + Installed pkgconfig files can now be relocatable.
  + New prefer_static built-in option.
  + Python extension modules now depend on the python library by
    default.
  + Python extension modules now build with hidden visibility.
  + Added support for multiline fstrings.
- Drop 0001-gnome-Use-doc-install_tag-for-gnome.yelp.patch: fixed
  upstream.

OBS-URL: https://build.opensuse.org/request/show/998800
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=231

0001-gnome-Use-doc-install_tag-for-gnome.yelp.patch

@@ -1,84 +0,0 @@
-From 92741a72e1e8f6af2674a695c5f3752161626d74 Mon Sep 17 00:00:00 2001
-From: Ferdinand Thiessen <rpm@fthiessen.de>
-Date: Sat, 23 Apr 2022 13:28:07 +0200
-Subject: gnome: Use 'doc' install_tag for gnome.yelp
-
-diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index 8c6364740..ed07aa849 100644
---- a/mesonbuild/modules/gnome.py
-+++ b/mesonbuild/modules/gnome.py
-@@ -1281,7 +1281,7 @@ class GnomeModule(ExtensionModule):
-         install_dir = os.path.join(state.environment.get_datadir(), 'help')
-         c_install_dir = os.path.join(install_dir, 'C', project_id)
-         c_data = build.Data(sources_files, c_install_dir, c_install_dir,
--                            mesonlib.FileMode(), state.subproject)
-+                            mesonlib.FileMode(), state.subproject, install_tag='doc')
-         targets.append(c_data)
- 
-         media_files: T.List[mesonlib.File] = []
-@@ -1291,7 +1291,7 @@ class GnomeModule(ExtensionModule):
-             media_files.append(f)
-             m_install_dir = os.path.join(c_install_dir, os.path.dirname(m))
-             m_data = build.Data([f], m_install_dir, m_install_dir,
--                                mesonlib.FileMode(), state.subproject)
-+                                mesonlib.FileMode(), state.subproject, install_tag='doc')
-             targets.append(m_data)
- 
-         pot_file = os.path.join('@SOURCE_ROOT@', state.subdir, 'C', project_id + '.pot')
-@@ -1314,14 +1314,14 @@ class GnomeModule(ExtensionModule):
-                 if symlinks:
-                     link_target = os.path.join(os.path.relpath(c_install_dir, start=m_install_dir), m)
-                     l_data = build.SymlinkData(link_target, os.path.basename(m),
--                                               m_install_dir, state.subproject)
-+                                               m_install_dir, state.subproject, install_tag='doc')
-                 else:
-                     try:
-                         m_file = mesonlib.File.from_source_file(state.environment.source_dir, l_subdir, m)
-                     except MesonException:
-                         m_file = media_files[i]
-                     l_data = build.Data([m_file], m_install_dir, m_install_dir,
--                                        mesonlib.FileMode(), state.subproject)
-+                                        mesonlib.FileMode(), state.subproject, install_tag='doc')
-                 targets.append(l_data)
- 
-             po_file = l + '.po'
-@@ -1344,6 +1344,7 @@ class GnomeModule(ExtensionModule):
-                 [msgfmt, '@INPUT@', '-o', '@OUTPUT@'],
-                 [po_file],
-                 [gmo_file],
-+                install_tag=['doc'],
-             )
-             targets.append(gmotarget)
- 
-@@ -1358,6 +1359,7 @@ class GnomeModule(ExtensionModule):
-                 extra_depends=[gmotarget],
-                 install=True,
-                 install_dir=[l_install_dir],
-+                install_tag=['doc'],
-             )
-             targets.append(mergetarget)
- 
-diff --git a/mesonbuild/build.py b/mesonbuild/build.py
-index 22927f9f2..c223dc88d 100644
---- a/mesonbuild/build.py
-+++ b/mesonbuild/build.py
-@@ -2450,13 +2450,9 @@ class CustomTarget(Target, CommandBase):
-         self.install = install
-         self.install_dir = list(install_dir or [])
-         self.install_mode = install_mode
--        _install_tag: T.List[T.Optional[str]]
--        if not install_tag:
--            _install_tag = [None] * len(self.outputs)
--        elif len(install_tag) == 1:
--            _install_tag = list(install_tag) * len(self.outputs)
--        else:
--            _install_tag = list(install_tag)
-+        _install_tag = [None] if not install_tag else stringlistify(install_tag)
-+        if len(_install_tag) == 1:
-+            _install_tag = list(_install_tag) * len(self.outputs)
-         self.install_tag = _install_tag
-         self.name = name if name else self.outputs[0]
- 
--- 
-2.36.0
-

meson-0.62.2.tar.gz

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

meson-0.62.2.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmKY7gQACgkQwk5jG6ux
-/nBJ0w/5AR27RJYMIhBbszivh7891RiDub+bIpvwnu9iN0NlltmceEzLHGig+5MN
-KY5MEFh7o8zX7uEWmZIPL83llCIQ3Y6ShvSXPb+6yr7C2X7Cr1nYRE+hJhiufMZ+
-KRAS7BwgbFVguzhQn4IUstCbhr0UjkagwuxyK1V3wD3JJtolVmtMKOKC78+xJMCy
-o8LxyfMTXzP7mvPoo9XtsbaCxlKYvVNdFZ5HOEuGxb2QfnaKG/VMafS8H+oLZDpf
-xfbHGppm7gcvYxa2BmO9RAUp2auvYi3vUPAu0gNoMqPiXes7xEieh1djr5TVRr1I
-4mRO7qLC4HDcvewP1nyNcZqrnrakGB29w7m/wBAGsP3V9Sn1uSh0vdHX3pAq0sRn
-TMoB2FacAnEC1xoUy33+zCHQLEGJlVjHxXfb3uwomWdoDRTdRASj5pADnwz1twnq
-fv5mOlvkObCStZa9ieOpxSvYcDePnOexUhezdXPLkBVrlrznAXrEYxoufq1l0Kub
-8BXm61v8UDzWmAzG03Q5867WQzGVbitCzzz8aBPggFiRJxBiCL+8SzGKvtCGEUTC
-38+DMT2tm/98XpL/Dtrs8SH/b3gtMtE4hRwFx3PdwK8Zq8Oclh7XLG2Nzz3Ljp7x
-yUe1Uj0qi809NHVVMBZ18mQfit8fvlHrUP9ffrHRJ5WD3pOh3tY=
-=h5Cd
------END PGP SIGNATURE-----

meson-0.63.1.tar.gz

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

meson-0.63.1.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmL3cMQACgkQwk5jG6ux
+/nBh0w/8DpQI+o1HR9B9padC0B2nCmgRztfHgjqVR7M1d4B2a/7YFVGXv6WIXMYR
+Lq5NLUYY1ICb4AESLhmXUpS3iH8/lECSUhAm69OIc4dDiQf3z/Jq3c0hrWr5sRU1
+7WJoa8Tq+CjHNBPGbJl1Kw9jPtOXpmKN/chz9L9zQ3XlQnJdQvLrLp0H7dYilzL5
+xsMfSGWnPhTStPurwMCp7weG3IX2PnooEJ7SwuiwDsVP/mWFAbTKPnvj4Fpsnk8U
+8SHjz/i25s3AzuX6pb5RBtOTxefPPL67pY51QL7g3aXKbH8K34w7A0+gBb8PYduG
+uUkHDdwlgBjCqcK0v+c2pJ8VfXmN7pPTfKfdqeHTPJMMKghd+3XmSg9FxduAuRnd
+fY5tQCFtPA2W4q4XD6oURIF2eedkukqbOmVeuNFjHlxYqBrwmoUPxQTwUOXRcxaD
+HD5pyrhCjD7qZjpgVZS+A1zVPfLWf1S/fN46CRayOEsLuPPgNr4SPpsN7XRM+WBS
+vUHHvYCdU8O/IKERDAkg+u9jhS8yKZP/Xh9fet+R4l/TRBXYDmjN9Tz/aETI4Hux
+EwK7WDkCfSyJoqnWQFYDX2wwhvNUxwzzkvLidZ2D5ItRd5QLgL371Lv6sM02ZoW1
+3wZ5tu968UXQGGc/cWnpIM6Mq7XLsHEH68jzX0Ft9OeX5UArmVU=
+=zXIm
+-----END PGP SIGNATURE-----

meson.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Mon Aug 22 14:16:48 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 0.63.1:
+  + add_project_dependencies() function.
+  + Coverage targets now respect tool config files.
+  + D compiler checks.
+  + Deprecate an option and replace it with a new one.
+  + Running Windows executables with Wine in meson devenv.
+  + Diff files for wraps.
+  + Added preserve_path arg to install_headers.
+  + Support for mold linker added.
+  + Added debug function.
+  + Compiler options can be set per subproject.
+  + Per-subproject languages.
+  + Installed pkgconfig files can now be relocatable.
+  + New prefer_static built-in option.
+  + Python extension modules now depend on the python library by
+    default.
+  + Python extension modules now build with hidden visibility.
+  + Added support for multiline fstrings.
+- Drop 0001-gnome-Use-doc-install_tag-for-gnome.yelp.patch: fixed
+  upstream.
+
 -------------------------------------------------------------------
 Wed Aug 10 10:52:48 UTC 2022 - Dirk Müller <dmueller@suse.com>
 

meson.spec

@@ -30,7 +30,7 @@
 %define _name   mesonbuild
 %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
 Name:           meson%{name_ext}
-Version:        0.62.2
+Version:        0.63.1
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -41,8 +41,6 @@ Source1:        https://github.com/%{_name}/meson/releases/download/%{version}/m
 Source2:        meson.keyring
 # PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package.
 Patch0:         meson-test-installed-bin.patch
-# PATCH-FEATURE-UPSTREAM 0001-gnome-Use-doc-install_tag-for-gnome.yelp.patch -- https://github.com/mesonbuild/meson/pull/10304
-Patch1:         0001-gnome-Use-doc-install_tag-for-gnome.yelp.patch
 # PATCH-FIX-OPENSUSE meson-distutils.patch -- meson is ring0 and therefor setuptools is not available
 Patch2:         meson-distutils.patch
 BuildRequires:  fdupes
@@ -152,7 +150,6 @@ This package provides support for meson.build files in Vim.
 %prep
 %setup -q -n meson-%{version}
 %patch0 -p1
-%patch1 -p1
 %if !%{with setuptools}
 %patch2 -p1
 %endif