[PR PATCH] meson: update to 0.52.0.

[PR PATCH] meson: update to 0.52.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

There is a new pull request by daniel-eys against master on the void-packages repository

https://github.com/daniel-eys/void-packages meson
https://github.com/void-linux/void-packages/pull/15439

meson: update to 0.52.0.
* vala patch not needed anymore (included upstream with this release)
* tested by building several `build_style=meson` packages

A patch file from https://github.com/void-linux/void-packages/pull/15439.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-15439.patch --]
[-- Type: text/x-diff, Size: 3505 bytes --]

From 2f5506aa7c72de5bd7dbe2abc372ebf90dde8762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 11 Oct 2019 20:06:13 +0200
Subject: [PATCH] meson: update to 0.52.0.

---
 srcpkgs/meson/patches/fix-cross-vala.patch | 47 ----------------------
 srcpkgs/meson/template                     |  4 +-
 2 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/meson/patches/fix-cross-vala.patch

diff --git a/srcpkgs/meson/patches/fix-cross-vala.patch b/srcpkgs/meson/patches/fix-cross-vala.patch
deleted file mode 100644
index a2ac5367417..00000000000
--- a/srcpkgs/meson/patches/fix-cross-vala.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d Mon Sep 17 00:00:00 2001
-From: James Westman <flyingpimonster@flyingpimonster.net>
-Date: Mon, 24 Jun 2019 12:04:12 -0500
-Subject: [PATCH] Fix two errors when cross-compiling with Vala
-
-- AttributeError: 'ValaCompiler' object has no attribute 'get_program_dirs'
-
-  Fixed by adding a `get_program_dirs()` function to the base Compiler
-  class, to match `get_library_dirs()`
-
-- KeyError: 'vala_COMPILER'
-
-  Fixed by creating the Vala compile rules for all machines, not just
-  the build machine.
----
- mesonbuild/backend/ninjabackend.py | 3 +--
- mesonbuild/compilers/compilers.py  | 3 +++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
-index a454e6ab5f..b830e377e4 100644
---- mesonbuild/backend/ninjabackend.py
-+++ mesonbuild/backend/ninjabackend.py
-@@ -1653,8 +1653,7 @@ def generate_compile_rule_for(self, langname, compiler):
-                 self.generate_cs_compile_rule(compiler)
-             return
-         if langname == 'vala':
--            if self.environment.machines.matches_build_machine(compiler.for_machine):
--                self.generate_vala_compile_rules(compiler)
-+            self.generate_vala_compile_rules(compiler)
-             return
-         if langname == 'rust':
-             self.generate_rust_compile_rules(compiler)
-diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
-index 5855de71c8..86c1e33407 100644
---- mesonbuild/compilers/compilers.py
-+++ mesonbuild/compilers/compilers.py
-@@ -1117,6 +1117,9 @@ def find_library(self, *args, **kwargs):
-     def get_library_dirs(self, *args, **kwargs):
-         return ()
- 
-+    def get_program_dirs(self, *args, **kwargs):
-+        return ()
-+
-     def has_multi_arguments(self, args, env) -> Tuple[bool, bool]:
-         raise EnvironmentException(
-             'Language {} does not support has_multi_arguments.'.format(
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 9b28d5e9d45..19b8fe2e063 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.51.2
+version=0.52.0
 revision=1
 archs=noarch
 build_style=python3-module
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.?}.0.md"
 distfiles="https://github.com/mesonbuild/meson/archive/${version}.tar.gz"
-checksum=96871cf62c9cf2b212e2f38aa3e543323403b1314fd3835e14120ef837c00f01
+checksum=0f426ed1362c38bcc5b9027ec6aec3445d6db88e8d7249ed992e9af88a42d0e0
 
 do_check() {
 	# meson depends on trillion of things to perform actual tests

Re: [PR PATCH] [Merged]: meson: update to 0.52.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]

There's a merged pull request on the void-packages repository

meson: update to 0.52.0.
https://github.com/void-linux/void-packages/pull/15439

Description:
* vala patch not needed anymore (included upstream with this release)
* tested by building several `build_style=meson` packages