From e76f63129d21b88c3afe0bcc60ee83c190c4e9468068a4e5f9dd25d93604212a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 29 Sep 2021 12:25:59 +0000 Subject: [PATCH] Accepting request 922179 from home:dimstar:Factory - Update to version 0.59.2: + No upstream changes provided. OBS-URL: https://build.opensuse.org/request/show/922179 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=211 --- meson-0.59.1.tar.gz | 3 --- meson-0.59.1.tar.gz.asc | 16 ---------------- meson-0.59.2.tar.gz | 3 +++ meson-0.59.2.tar.gz.asc | 16 ++++++++++++++++ meson-rust-1.55.patch | 12 ++++++++++++ meson.changes | 11 +++++++++++ meson.spec | 7 ++++++- 7 files changed, 48 insertions(+), 20 deletions(-) delete mode 100644 meson-0.59.1.tar.gz delete mode 100644 meson-0.59.1.tar.gz.asc create mode 100644 meson-0.59.2.tar.gz create mode 100644 meson-0.59.2.tar.gz.asc create mode 100644 meson-rust-1.55.patch diff --git a/meson-0.59.1.tar.gz b/meson-0.59.1.tar.gz deleted file mode 100644 index dccd3b7..0000000 --- a/meson-0.59.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db586a451650d46bbe10984a87b79d9bcdc1caebf38d8e189f8848f8d502356d -size 1944678 diff --git a/meson-0.59.1.tar.gz.asc b/meson-0.59.1.tar.gz.asc deleted file mode 100644 index 10ae87e..0000000 --- a/meson-0.59.1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmEdMskACgkQwk5jG6ux -/nBipg//enlyM6WCWhwHUiWeJD0wrJraUijxqW4npb6K9nMTwraE1oaQiJ+LxNV/ -N1ETe3cLN9TQa4MV0xqDzfER8OGNekLeqMtWikRSXgMfzRaK0B47Gb3GSd9d/i5W -dAQSsjj9HV7RUmJEiuxNYyGI1fJEO/lXyshoJSVwhdxEpaao3c2J/2Ky5Rh1OiMC -86vuIYwmohlpCApjG6Fq89PwAtwPXaLk1Lfz57lzLKywNU1WibejtiXrFMzbxvVt -/vijnrv74EifyuF/TunvtTv9Y2JS3xTu3r6N5jVU75gEWtEnANIBc/e363yf0vSa -ypsPjMJwW73rLpPxaKj8jXXbMr4HY8nFf5O4PRK1dXAcHlotUc5qDCA6iuC6iGNP -BDWdwETyohpwkPsJkCdsX5RBbuKmU1d2eWI6K3nAt+gWj7aNmC7y1+xz6ax9/oxF -+roDkhWZL6RtxR1KeDS6qSPqBBxuONoZWoUQamNLwnVnm7U2CHP8Cc7OlL8lYntE -dzFfq1O2S+F58nGxE+3lAhtyUUslOrMdfdFWQYXnBjNyktaF5ZzJhQ/2O+rLJQjX -xIZwnN/wqP6Din7WTLeMc8rxVwrr/cjuc7WIIOOOycBOI5JIVF1/ravc/+Cc/TQ2 -alpyNQHx4xbwDzgMIYxAiU+DJHL94H7Xy+Qf4CXbQuWHJEXVp0A= -=9OV4 ------END PGP SIGNATURE----- diff --git a/meson-0.59.2.tar.gz b/meson-0.59.2.tar.gz new file mode 100644 index 0000000..27a7645 --- /dev/null +++ b/meson-0.59.2.tar.gz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..fa95916 --- /dev/null +++ b/meson-0.59.2.tar.gz.asc @@ -0,0 +1,16 @@ +-----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-rust-1.55.patch b/meson-rust-1.55.patch new file mode 100644 index 0000000..c1151d7 --- /dev/null +++ b/meson-rust-1.55.patch @@ -0,0 +1,12 @@ +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 8767eb0..01b2e74 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Sep 29 12:23:31 UTC 2021 - Dominique Leuenberger + +- Add meson-rust-1.55.patch: Fix test suite run with rust 1.55. + +------------------------------------------------------------------- +Wed Sep 29 06:27:10 UTC 2021 - Dominique Leuenberger + +- Update to version 0.59.2: + + No upstream changes provided. + ------------------------------------------------------------------- Thu Aug 19 15:56:22 UTC 2021 - Bjørn Lie diff --git a/meson.spec b/meson.spec index 48a61fd..5d3dc20 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.1 +Version: 0.59.2 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -41,6 +41,8 @@ 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 @@ -163,6 +165,9 @@ 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" \