Accepting request 669785 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/669785
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=40

meson-0.49.0.tar.gz

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

meson-0.49.0.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlwNdRwACgkQO/RpO/7r
-lCi6AhAAhHYSnNDjXrLecIuVdN8VvaliDzFDM8MKf6kEgat1bN8SpofGXujUmmzO
-YQa7E0tGyAMc1/MZgnEppXWXdfVhNjnEwIetmUNnxviPVxcliQ9Ygty2MvT5H1ng
-1oIWnZRAOecf1Yvm4uYCuq7JRMobT9qx54nevsmEKqUgqZQWg8w53HgjhDrXSqN2
-ymfLSIAyOvGjcISHz9aJTuxhvjIqeH2zwVsSAvD6xeTxWqnLOhZ7tWI3vqRT7Y7S
-0p0hshNZXN8R0+ixSvOjv9za/GjzB1/TFU7wrwxFkT9/jccUnEDcKcxN8L7yx/TN
-BlkJMS/4ruqarLyerIQWGaxmIaBsaJQSg4A1zupOxHQI1NkLn840HJBYOyo3jZUV
-z7/hdAexjiHPHTYpOibLvzDT9XJCdV3268s5DRx0kDULuSC7sqsnO0u5Fl2WZWp5
-0tHiR/Z3EvacRRUzDZ/FEmc7IQoZzHnJDvL2i3sDnwJBT3pYqDfoBx9lj3IBMpfb
-3MJw8CDe8SJmZ5kt9z/iC8DfZ0ZuIufNnCJJN39nnMb/FMUZsnaPB37VYV66NCr1
-KrAlXY57BhCPMsbx8lT2sWe3DBTnu/dQRaU5qk5oAkGNM83CaHeS4AOQH3EUb0N5
-a/S1aJHk3xq4Vedkkilcq7IMHeLDcui3LD5kCOs54ZQeNJO9ICI=
-=+Y3s
------END PGP SIGNATURE-----

meson-0.49.1.tar.gz

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

meson-0.49.1.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlxIoK4ACgkQO/RpO/7r
+lCgaYQ//RAUA8OUTzmsZhAg6Tg16P4lSFiQlaOXxRhmBGX4LCh3dg5ll810jciUX
+c2U3q2rb5FSrgnseEVKM4eyZSvt2wnA5G+eQQIOQ8q1agOAnxKVRAka5rTaVRrEM
+sbdqYVFejxQauCfDGdYZYqeQtUtPc9yudi1RuUWeZHti+EG0Ae0HfzBSFcBOawza
+OvrolvqLwdB+/vGhMquJyVaSz5ZiEKavsLqH2mFB8mPYTCNWjh3wAFWtam9RFE3L
+/BqNk38YCjSkDyabhtujjPXZkGv+MWMVjH+SimRH5btkudnl+TrvPj6Jn7grEy2h
+d8PspqquML8RDlfY3TGwiw3XqiJwcDyCx/H1NupuBc1tVnloOHvogu/oCvtfMiuQ
+F7LVor1+mpJU8RGHGAD+hVqBNstLZZy61LV9EexYuAFuMX3NpdU6ivGp2iVbk1Xr
+SO1itjhVjr1Ku37qq1nNaCcfo+O9qcL0OfZDV1eIvXs6DM2+o0MCvtqB7ZDLecXd
+XoeOymPCFakY3878UzE5gdWFsMhCzKTJ6F1jTvP3coUAKvx1s0KqgAPHWFhIIOYq
+u24ytlUSsGWP584vXeb60qOi8iRj0J1nOexv8+KoC+Vc6F8qWSSqS48mnMCRVSj4
+hoTyIIQBBVriPGVWGOIU3M4kpulGK8gEvj+fU5ykSKYn6ew8jFM=
+=A70k
+-----END PGP SIGNATURE-----

meson-no-lrelease.patch

@@ -1,26 +0,0 @@
-From 391878e83aef4c2ba43e69c4850bbc84f409783e Mon Sep 17 00:00:00 2001
-From: Dylan Baker <dylan@pnwbakers.com>
-Date: Tue, 18 Dec 2018 14:13:05 -0800
-Subject: [PATCH] dependencies/ui: Don't require lrelease for qt
-
-We previously didn't require it so we shouldn't silently start doing so.
-
-Fixes #4654
----
- mesonbuild/dependencies/ui.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
-index e8fba91a23..1f65c3b86f 100644
---- a/mesonbuild/dependencies/ui.py
-+++ b/mesonbuild/dependencies/ui.py
-@@ -243,7 +243,7 @@ def gen_bins():
-                 if self.bindir:
-                     yield os.path.join(self.bindir, b), b, False
-                 yield '{}-{}'.format(b, self.name), b, False
--                yield b, b, self.required
-+                yield b, b, self.required if b != 'lrelease' else False
- 
-         for b, name, required in gen_bins():
-             if found[name].found():
-

meson.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jan 28 14:41:28 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 0.49.1:
+  + dependencies/ui: Don't require lrelease for qt.
+  + Better Python exe detector (gh#mesonbuild/meson#4614).
+- Drop meson-no-lrelease.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Thu Jan 17 11:57:17 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 

meson.spec

@@ -28,7 +28,7 @@
 %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
 %bcond_with setuptools
 Name:           meson%{name_ext}
-Version:        0.49.0
+Version:        0.49.1
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -49,8 +49,6 @@ Patch3:         meson-suse-fix-llvm-3.8.patch
 Patch4:         meson-fix-gcc48.patch
 # PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal@suse.com -- build and install using distutils instead of full setuptools
 Patch5:         meson-distutils.patch
-# PATCH-FIX-UPSTREAM meson-no-lrelease.patch dimstar@opensuse.org -- Don't require lrelease for qt
-Patch6:         meson-no-lrelease.patch
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-base
@@ -162,7 +160,6 @@ This package provides support for meson.build files in Vim.
 %if !%{with setuptools}
 %patch5 -p1
 %endif
-%patch6 -p1
 
 # Remove static boost tests from "test cases/frameworks/1 boost/".
 sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build