From a58c0c2be7871fef9a159219ba53876a97e3a88ca6b1577eb5811bfbda3de4c1 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 26 Oct 2021 09:54:58 +0000
Subject: [PATCH] Accepting request 927446 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/927446
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=212
---
 meson-0.59.2.tar.gz     |  3 ---
 meson-0.59.2.tar.gz.asc | 16 ----------------
 meson-0.59.3.tar.gz     |  3 +++
 meson-0.59.3.tar.gz.asc | 16 ++++++++++++++++
 meson-rust-1.55.patch   | 12 ------------
 meson.changes           |  7 +++++++
 meson.spec              |  7 +------
 7 files changed, 27 insertions(+), 37 deletions(-)
 delete mode 100644 meson-0.59.2.tar.gz
 delete mode 100644 meson-0.59.2.tar.gz.asc
 create mode 100644 meson-0.59.3.tar.gz
 create mode 100644 meson-0.59.3.tar.gz.asc
 delete mode 100644 meson-rust-1.55.patch

diff --git a/meson-0.59.2.tar.gz b/meson-0.59.2.tar.gz
deleted file mode 100644
index 27a7645..0000000
--- a/meson-0.59.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:13dee549a7ba758b7e33ce7719f28d1d337a98d10d378a4779ccc996f5a2fc49
-size 1952115
diff --git a/meson-0.59.2.tar.gz.asc b/meson-0.59.2.tar.gz.asc
deleted file mode 100644
index fa95916..0000000
--- a/meson-0.59.2.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmFTUgUACgkQwk5jG6ux
-/nDC/A//XB4ojkEvPD61VPpwdTu86yfDEdmmnlw5t446gG/zVGpZHYuIBFZpXOIk
-F6dT4PgM2VTUMawaMNC7r0snZktuWxRMP3hFFED0CU6vBW1lBvNbEZ7CjydJRoVr
-0gNTPo1Vp4R3RCxxxdxKbbxlk0W2Gjn5wHJO/6YcBc5bWpfKno5u/z6DPz40wH0T
-kCnlGcc3ZOZsm5Cig4epnNKzc52I1Ul83Q4zkhYSEgpNVxAIfXwkJNrEde/GQh7U
-l/fLO8CCkQrkUr+PIsi5IB149AaKPaWsk9fFpI9b2XL+GFisMP01BduZ4zC7MwD/
-pCV8XlT5/MIwpV/B3smtE1lojPs35MrhIva3uq5r3ohhBM8qm89waarXpzEiZgVk
-zyjFR/6qSFXYIyBNACiw3AsnLzBsGRLbNlw4QC2aG+hJXZHHAp4hU2sY1b+5dg3d
-qfiLAz2rPpOJ0fmXnuSBwsKrn8pPNNj+wsYqPnRJ5zhCQOLVtdfpv+bRZlUaEGIW
-r2x8Mj96vpVPNZbj59zA1JBJ6pujDOo497coSHRkd0e88cnxwFdHPu1rkzu5P9c4
-vXWTVch3gIv09By1/YMv2KW3NlupXI7AJYztlqAE3a6+TfWYo777Fcp9qwkmvVXM
-+eGfrYHtUPj2w3xWmjHlWoIPzyiQNG87l0maUMB4C8L0F0KcuyM=
-=mwcJ
------END PGP SIGNATURE-----
diff --git a/meson-0.59.3.tar.gz b/meson-0.59.3.tar.gz
new file mode 100644
index 0000000..bacb607
--- /dev/null
+++ b/meson-0.59.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a35cfd4cb779a6a415ad3ccbf2d4143334e96139125585ce49915bec494da02
+size 1953620
diff --git a/meson-0.59.3.tar.gz.asc b/meson-0.59.3.tar.gz.asc
new file mode 100644
index 0000000..f6f0370
--- /dev/null
+++ b/meson-0.59.3.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmF0QcwACgkQwk5jG6ux
+/nCozw/+Lj4YNgKLmsqaJROq6hptzXDrcYtO0P8PHrxuenMW47fYz9Rx2JgiOolA
+5jn+2geAWaX4FEQPGoPRA6awO5nnaNVo8jUHVMRNFg9BSR5OICYpnVdVhaHGoBiT
+4dIoiaX6fiz8UQErKKcY6bHt3vU+vJRnvYrD155XMhysReWaG8AEdbY5u2a2cQas
+Zxnyl6LBxVw6BNXqDpXNisiHc4Ib2i8193xlvXPaD19LvMBHXaa0CgLlSXys6uJs
+eelZ/DGyvTApQofQU5AHNKybBb/78wRkjCH/uaE/93Oa/dcwEh6bV9akthxIhYr5
+q3+l/0Y2LGbgE9nij3viNop9+nKMFLDPOeOOBaJyaM7LOS3LgYb3mJmms2gX1bC0
+hQ9pmJ/mDhB6jHjUtIARegKos4XGrkrU8d/KpV91VGObp8GOpfNmgK+HxrTdr+Xw
+Lwu4lOThxGWL5fIOeLJL8CjJVKvSLDeo3YHGGfH2RbNnFyjxbl0yy8OBP18lqd+v
+ihYd46RKPgGH5JjW2L9Lp0190p+nahnWo/WQX9W72JrMIarlmkt/3yAVpM684/z2
+DrOX9n6GLhhU5ldY5uuNnzyxfDteURW1+w8qLmS3K3haaJVMQbOeRBndeBZVl95K
+OstT4GygtYpwLR36ZvjxG8YkeOC6J9GyW0IdFWpbZCvNx/FTHQ4=
+=9lTS
+-----END PGP SIGNATURE-----
diff --git a/meson-rust-1.55.patch b/meson-rust-1.55.patch
deleted file mode 100644
index c1151d7..0000000
--- a/meson-rust-1.55.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: meson-0.59.2/test cases/rust/5 polyglot static/meson.build
-===================================================================
---- meson-0.59.2.orig/test cases/rust/5 polyglot static/meson.build
-+++ meson-0.59.2/test cases/rust/5 polyglot static/meson.build
-@@ -2,6 +2,7 @@ project('static rust and c polyglot exec
- 
- deps = [
-   meson.get_compiler('c').find_library('dl', required: false),
-+  meson.get_compiler('c').find_library('m', required: false),
-   dependency('threads'),
- ]
- 
diff --git a/meson.changes b/meson.changes
index 01b2e74..419bf15 100644
--- a/meson.changes
+++ b/meson.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 25 08:32:35 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 0.59.3:
+  + No upstream changes provided.
+- Drop meson-rust-1.55.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Wed Sep 29 12:23:31 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/meson.spec b/meson.spec
index 5d3dc20..7064580 100644
--- a/meson.spec
+++ b/meson.spec
@@ -28,7 +28,7 @@
 %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
 %bcond_with     setuptools
 Name:           meson%{name_ext}
-Version:        0.59.2
+Version:        0.59.3
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -41,8 +41,6 @@ Source2:        meson.keyring
 Patch1:         meson-test-installed-bin.patch
 # PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal@suse.com -- build and install using distutils instead of full setuptools
 Patch2:         meson-distutils.patch
-# PATCH-FIX-UPSTREAM meson-rust-1.55.patch gh#mesonbuikd/meson#9310 dimstar@opensuse.org -- Fix test suite with rust 1.55
-Patch3:         meson-rust-1.55.patch
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-base
@@ -165,9 +163,6 @@ This package provides support for meson.build files in Vim.
 %if !%{with setuptools}
 %patch2 -p1
 %endif
-pushd "test cases/rust/5 polyglot static"
-%patch3 -p4
-popd
 
 # We do not have gmock available at this moment - can't run the test suite for it
 rm -r "test cases/frameworks/3 gmock" \