Accepting request 625988 from GNOME:Next

New stable bugfix rel.

Note that there is even a 0.47 stable branch, but that will req rebase of patches, and I could not be asked to do that atm.

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

meson-0.46.0.tar.gz

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

meson-0.46.0.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlrdLJYACgkQO/RpO/7r
-lCgkAhAAhwghFqGK9CveQzzoFKkjTAwAk76sYGbABzIQtA0AHiU+Mo4vzcSlSY/Q
-GSX235VWs0JIeIKduqsBuOnzfoI6wAZ6z9Bw8NfCiPz4x6jRZpUPs51JKt1DTsaO
-+1lBdczVPb2K+PJFUudd2tg1NUe6UJ0oDfCeTsITQPyovU5YU7e3/9lUhT9eb1iM
-l0hFLvP355WryOfHC1F1wS44h7HboeKYShA6Ft0IRAHQR9H+W9VFmZuQ3xVwGDcx
-lPZB9i0aHZCDZBcjlbyQpIraXahlURkS3kkZIMUnmsC/51mCzxOKwj7B+bkbmo0G
-JYC9ogXfi27cYbZCAnSZVKuFMcZpegCPUuMDbozCThvj3E1Jq9yt9FAS21i0To+l
-qlH3eLlP7SY3UaHi2ZOXF2TK4bm07f3K0QJnE4Wq9wUzYwp2CU93BM9xc/ygTk3D
-SYPlw48CLtnt0LlhtPk0DuHTA+skJX8f5wWRyeVnnUulOhwEHJ5CZglPM5AFrWqv
-KKjBc8r8dBrgsWu+SOdNtKOwU+dixxbnOO1fcjovGRSppUkm0JtMlbHxd4IDqYS4
-GZSnpNVqJa3m6/qROlfDTYz9IGGY86YMEhIEqVAQcNjq67XLsud5au7LK9/LxfD4
-rSADCtgQvF0VDlpYy63yLk65GrjKRZaFBzpTpoBwWPQXbYNqXCA=
-=UZwn
------END PGP SIGNATURE-----

meson-0.46.1.tar.gz

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

meson-0.46.1.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlr8Yg0ACgkQO/RpO/7r
+lCj/mQ/8DBUXSDE58jyEYZXJr25kTxdX6WM5txK1Qp2CwGZD8tcL1+1yzQMIGQB4
+R8BWXdRhCEH5OQ7dq2925lP/UYwq5MwMUPIhVIl5OdOo3B9qGM88wvMiFuoffk8M
+dPrA8Btmd2iSToSAHHP6VxWvtWlJz1/F28nxM4v02e8JtMGT7w4NpKwzB3FCGO1s
+19emJAwgeMtRGFWyu/oGvmUoq8vHxd0xhQGRKBH2TbxY+9eFdr1acYf9gYIHl2wr
+SpDcz63eDJ80kEDa2TihykW3yrxQ7BaHARLp2eyBVelKTk2A5eA2SRGuFbVp88uu
+t3DmsJyNcfrrBBNwZWLORMLZZofMa4kuBnrASkeX9fhxSxBpKU4gFmVmyImw/NUl
+iXUGDH3lDFgg2Sy2nN7gdYRNH8eFuUZH/R4cCUDlbxo8cmkQIqoJI+BYrFQgk6d2
+cZmNQbr0qAZsDhIqVxvYRwtxxAAYzM1+t6T1XB9hFwPqYaD0+CiBhyVS5hkJXPws
+VFeb+bbVx8Byh2W3pmuIxbKP4S1pfttU6A+Cmq/TaSmQvRFDBL30LsHLHsNU4gyR
+VOd5kUJBdD7bWpw7veoTvm5io1snPhxuigVdEq3mAvdNBq8Rsc6np9YO7BDy72Ah
+qi4aC5OQdKtAn+xOij8MRc+esmHMtu04xNOYETaRmA7ev2mY6DY=
+=gmQp
+-----END PGP SIGNATURE-----

meson-keep-spaces-in-pc-files.patch

@@ -1,84 +0,0 @@
-From cbc2f2d1df769123caa2e4562dbe1809cca1304d Mon Sep 17 00:00:00 2001
-From: Jussi Pakkanen <jpakkane@gmail.com>
-Date: Sun, 29 Apr 2018 21:43:24 +0300
-Subject: [PATCH] Keep separator spaces in pkg-config declarations. Closes
- #3479.
-
----
- mesonbuild/modules/pkgconfig.py                 |  6 ++++--
- run_unittests.py                                | 11 +++++++++++
- test cases/unit/31 pkgconfig format/meson.build | 12 ++++++++++++
- test cases/unit/31 pkgconfig format/somelib.c   |  5 +++++
- 4 files changed, 32 insertions(+), 2 deletions(-)
- create mode 100644 test cases/unit/31 pkgconfig format/meson.build
- create mode 100644 test cases/unit/31 pkgconfig format/somelib.c
-
-diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
-index a3ba973f3..419a14c77 100644
---- a/mesonbuild/modules/pkgconfig.py
-+++ b/mesonbuild/modules/pkgconfig.py
-@@ -139,8 +139,10 @@ def add_version_reqs(self, name, version_reqs):
-         if version_reqs:
-             if name not in self.version_reqs:
-                 self.version_reqs[name] = set()
--            # We could have '>=1.0' or '>= 1.0', remove spaces to normalize
--            new_vreqs = [s.replace(' ', '') for s in mesonlib.stringlistify(version_reqs)]
-+            # Note that pkg-config is picky about whitespace.
-+            # 'foo > 1.2' is ok but 'foo>1.2' is not.
-+            # foo, bar' is ok, but 'foo,bar' is not.
-+            new_vreqs = [s for s in mesonlib.stringlistify(version_reqs)]
-             self.version_reqs[name].update(new_vreqs)
- 
-     def split_version_req(self, s):
-diff --git a/run_unittests.py b/run_unittests.py
-index f06c9a0ea..ce5fe14dd 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -3056,6 +3056,17 @@ def test_pkgconfig_internal_libraries(self):
-             self.init(os.path.join(testdirbase, 'app'))
-             self.build()
- 
-+    @unittest.skipIf(shutil.which('pkg-config') is None, 'Pkg-config not found.')
-+    def test_pkgconfig_formatting(self):
-+        testdir = os.path.join(self.unit_test_dir, '31 pkgconfig format')
-+        self.init(testdir)
-+        myenv = os.environ.copy()
-+        myenv['PKG_CONFIG_PATH'] = self.privatedir
-+        ro = subprocess.run(['pkg-config', '--libs', 'libsomething'], stdout=subprocess.PIPE,
-+                            env=myenv)
-+        self.assertEqual(ro.returncode, 0)
-+        self.assertIn(b'-lgobject-2.0', ro.stdout)
-+        self.assertIn(b'-lgio-2.0', ro.stdout)
- 
- class LinuxArmCrossCompileTests(BasePlatformTests):
-     '''
-diff --git a/test cases/unit/31 pkgconfig format/meson.build b/test cases/unit/31 pkgconfig format/meson.build
-new file mode 100644
-index 000000000..bb702401f
---- /dev/null
-+++ b/test cases/unit/31 pkgconfig format/meson.build	
-@@ -0,0 +1,12 @@
-+project('pkgformat', 'c',
-+  version : '1.0')
-+
-+pkgg = import('pkgconfig')
-+
-+l = shared_library('something', 'somelib.c')
-+
-+pkgg.generate(libraries: l,
-+              version: '1.0',
-+              name: 'libsomething',
-+              description: 'A library that does something',
-+              requires: 'gobject-2.0 >= 2.54, gio-2.0 >= 2.54')
-diff --git a/test cases/unit/31 pkgconfig format/somelib.c b/test cases/unit/31 pkgconfig format/somelib.c
-new file mode 100644
-index 000000000..6d876c8f2
---- /dev/null
-+++ b/test cases/unit/31 pkgconfig format/somelib.c	
-@@ -0,0 +1,5 @@
-+#include<stdio.h>
-+
-+int some_func() {
-+    return 0;
-+}
-

meson-testsuite.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Jul 28 21:08:48 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 0.46.1:
+  * See https://github.com/mesonbuild/meson/milestone/26?closed=1
+- Drop meson-keep-spaces-in-pc-files.patch: Fixed upstream.
+
+-------------------------------------------------------------------
+Fri Jul 13 06:00:48 UTC 2018 - jslaby@suse.com
+
+- Add Don-t-raise-StopIteration-in-generators-no-longer-al.patch
+
 -------------------------------------------------------------------
 Sun May 20 14:20:31 UTC 2018 - dimstar@opensuse.org
 

meson-testsuite.spec

@@ -24,7 +24,7 @@
 %endif
 %define _name   mesonbuild
 Name:           meson%{name_ext}
-Version:        0.46.0
+Version:        0.46.1
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -37,14 +37,14 @@ Source2:        meson.keyring
 Patch0:         meson-suse-ify-macros.patch
 # 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.
 Patch1:         meson-test-installed-bin.patch
-# PATCH-FIX-UPSTREAM meson-keep-spaces-in-pc-files.patch gh#mesonbuild/meson#3479 dimstar@opensuse.org -- Keep spaces in generated .pc files
-Patch2:         meson-keep-spaces-in-pc-files.patch
 # PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests.
 Patch3:         meson-suse-fix-llvm-3.8.patch
 # PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009).
 Patch4:         meson-restore-python3.4.patch
 # PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x.
 Patch5:         meson-fix-gcc48.patch
+# PATCH-FIX-UPSTREAM Don-t-raise-StopIteration-in-generators-no-longer-al.patch -- Don't raise StopIteration in generators, no longer allowed with Python 3.7. Fixes #3622
+Patch6:         Don-t-raise-StopIteration-in-generators-no-longer-al.patch
 BuildRequires:  python3-base
 BuildArch:      noarch
 %if %{testsuite}
@@ -131,12 +131,12 @@ This package provides support for meson.build files in Vim.
 %setup -q -n meson-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %if 0%{?suse_version} < 1500
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %endif
+%patch6 -p1
 
 # Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname)
 sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build

meson.changes

@@ -1,7 +1,14 @@
+-------------------------------------------------------------------
+Sat Jul 28 21:08:48 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 0.46.1:
+  * See https://github.com/mesonbuild/meson/milestone/26?closed=1
+- Drop meson-keep-spaces-in-pc-files.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Fri Jul 13 06:00:48 UTC 2018 - jslaby@suse.com
 
-- add Don-t-raise-StopIteration-in-generators-no-longer-al.patch
+- Add Don-t-raise-StopIteration-in-generators-no-longer-al.patch
 
 -------------------------------------------------------------------
 Sun May 20 14:20:31 UTC 2018 - dimstar@opensuse.org

meson.spec

@@ -24,7 +24,7 @@
 %endif
 %define _name   mesonbuild
 Name:           meson%{name_ext}
-Version:        0.46.0
+Version:        0.46.1
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -37,8 +37,6 @@ Source2:        meson.keyring
 Patch0:         meson-suse-ify-macros.patch
 # 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.
 Patch1:         meson-test-installed-bin.patch
-# PATCH-FIX-UPSTREAM meson-keep-spaces-in-pc-files.patch gh#mesonbuild/meson#3479 dimstar@opensuse.org -- Keep spaces in generated .pc files
-Patch2:         meson-keep-spaces-in-pc-files.patch
 # PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests.
 Patch3:         meson-suse-fix-llvm-3.8.patch
 # PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009).
@@ -133,7 +131,6 @@ This package provides support for meson.build files in Vim.
 %setup -q -n meson-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %if 0%{?suse_version} < 1500
 %patch3 -p1
 %patch4 -p1