From 7e5ba4ab8ca7f6e596df595aaaeedb2894f0c5a2 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 11 Jul 2024 07:03:57 +0000
Subject: [PATCH] Update to meson-1.5.0.

---
 devel/meson/Makefile                           |  2 +-
 devel/meson/distinfo                           |  4 ++--
 devel/meson/meson.port.mk                      |  2 +-
 devel/meson/patches/patch-mesonbuild_build_py  |  4 ++--
 .../patch-mesonbuild_dependencies_boost_py     | 13 -------------
 devel/meson/pkg/PLIST                          | 18 +++++++++++++++---
 6 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 devel/meson/patches/patch-mesonbuild_dependencies_boost_py

diff --git a/devel/meson/Makefile b/devel/meson/Makefile
index c4386d90902..561e87f70fb 100644
--- a/devel/meson/Makefile
+++ b/devel/meson/Makefile
@@ -3,7 +3,7 @@ COMMENT=		next-generation build system
 MODPY_EGG_VERSION=	${GH_TAGNAME}
 GH_ACCOUNT=		mesonbuild
 GH_PROJECT=		meson
-GH_TAGNAME=		1.4.1
+GH_TAGNAME=		1.5.0
 EPOCH=			0
 
 CATEGORIES=		devel
diff --git a/devel/meson/distinfo b/devel/meson/distinfo
index 5d16facf1b4..d4e352f5b15 100644
--- a/devel/meson/distinfo
+++ b/devel/meson/distinfo
@@ -1,2 +1,2 @@
-SHA256 (meson-1.4.1.tar.gz) = p+/HLsuHPFpiAxreGSGnF3tnz9yy6UEKerAj+egZL0s=
-SIZE (meson-1.4.1.tar.gz) = 4760421
+SHA256 (meson-1.5.0.tar.gz) = eBkTgm+29HjrfXfhlCqz3zlETkyQ6aNSNzfiFRcdtGk=
+SIZE (meson-1.5.0.tar.gz) = 4798142
diff --git a/devel/meson/meson.port.mk b/devel/meson/meson.port.mk
index 2f00c6c6149..f9b25b865ac 100644
--- a/devel/meson/meson.port.mk
+++ b/devel/meson/meson.port.mk
@@ -4,7 +4,7 @@
 # finding foo.cmake and junking it if cmake is found & used)
 DPB_PROPERTIES +=	noconfigurejunk
 
-BUILD_DEPENDS +=	devel/meson>=1.4.1v0
+BUILD_DEPENDS +=	devel/meson>=1.5.0v0
 SEPARATE_BUILD ?=	Yes
 
 .if empty(CONFIGURE_STYLE)
diff --git a/devel/meson/patches/patch-mesonbuild_build_py b/devel/meson/patches/patch-mesonbuild_build_py
index af081799377..f4cd87140c9 100644
--- a/devel/meson/patches/patch-mesonbuild_build_py
+++ b/devel/meson/patches/patch-mesonbuild_build_py
@@ -10,7 +10,7 @@ Index: mesonbuild/build.py
      MesonBugException, EnvironmentVariables, pickle_load,
  )
  from .compilers import (
-@@ -2357,6 +2357,26 @@ class SharedLibrary(BuildTarget):
+@@ -2354,6 +2354,26 @@ class SharedLibrary(BuildTarget):
              if self.darwin_versions is None and self.soversion is not None:
                  # If unspecified, pick the soversion
                  self.darwin_versions = (self.soversion, self.soversion)
@@ -37,7 +37,7 @@ Index: mesonbuild/build.py
  
          # Visual Studio module-definitions file
          self.process_vs_module_defs_kw(kwargs)
-@@ -2411,6 +2431,8 @@ class SharedLibrary(BuildTarget):
+@@ -2408,6 +2428,8 @@ class SharedLibrary(BuildTarget):
          # filename. If ltversion != soversion we create an soversion alias:
          # libfoo.so.0 -> libfoo.so.0.100.0
          # Where libfoo.so.0.100.0 is the actual library
diff --git a/devel/meson/patches/patch-mesonbuild_dependencies_boost_py b/devel/meson/patches/patch-mesonbuild_dependencies_boost_py
deleted file mode 100644
index 1492798e2fd..00000000000
--- a/devel/meson/patches/patch-mesonbuild_dependencies_boost_py
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mesonbuild/dependencies/boost.py
---- mesonbuild/dependencies/boost.py.orig
-+++ mesonbuild/dependencies/boost.py
-@@ -594,7 +594,8 @@ class BoostDependency(SystemDependency):
-         # mlog.debug('    - vscrt: {}'.format(vscrt))
-         libs = [x for x in libs if x.static == self.static or not self.explicit_static]
-         libs = [x for x in libs if x.mt == self.multithreading]
--        libs = [x for x in libs if x.version_matches(lib_vers)]
-+        if not mesonlib.is_openbsd():
-+            libs = [x for x in libs if x.version_matches(lib_vers)]
-         libs = [x for x in libs if x.arch_matches(self.arch)]
-         libs = [x for x in libs if x.vscrt_matches(vscrt)]
-         libs = [x for x in libs if x.nvsuffix != 'dll']  # Only link to import libraries
diff --git a/devel/meson/pkg/PLIST b/devel/meson/pkg/PLIST
index 2da0f11b58d..f9ca45ca27b 100644
--- a/devel/meson/pkg/PLIST
+++ b/devel/meson/pkg/PLIST
@@ -27,6 +27,8 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}envconfig.${
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}envconfig.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}machinefile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}machinefile.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mcompile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mcompile.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mconf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -41,6 +43,8 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mesonlib.${M
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mesonlib.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mesonmain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mesonmain.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mformat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mformat.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}minit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}minit.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}minstall.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -61,6 +65,8 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}munstable_co
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}munstable_coredata.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}optinterpreter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}optinterpreter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}programs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}programs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}rewriter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -238,6 +244,8 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}apple.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}apple.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}arm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}arm.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}ccrx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -268,6 +276,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYC
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}visualstudio.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}xc16.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}xc16.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/apple.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/arm.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/ccrx.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/clang.py
@@ -457,6 +466,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/linkers/${MODPY_PYCACHE}link
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/linkers/base.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/linkers/detect.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/linkers/linkers.py
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/machinefile.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/mcompile.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/mconf.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/mdevenv.py
@@ -464,6 +474,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/mdist.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/mesondata.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/mesonlib.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/mesonmain.py
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/mformat.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/minit.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/minstall.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/mintro.py
@@ -473,6 +484,8 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}_qt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}_qt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}cmake.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}cmake.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}cuda.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -503,8 +516,6 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}pyth
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}python3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}python3.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}qt4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}qt4.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}qt5.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -521,6 +532,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}wayl
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}wayland.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/_qt.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/cmake.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/cuda.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/dlang.py
@@ -536,7 +548,6 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/modtest.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/pkgconfig.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/python.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/python3.py
-lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/qt.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/qt4.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/qt5.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/qt6.py
@@ -551,6 +562,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/msubprojects.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/mtest.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/munstable_coredata.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/optinterpreter.py
+lib/python${MODPY_VERSION}/site-packages/mesonbuild/options.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/programs.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/rewriter.py
 lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/