From 09460fff3638e1c2b863908828dc47177ae992ae0a4f9eaf17f8c4d814fbdbba Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 4 Mar 2017 16:03:41 +0000 Subject: [PATCH 1/7] Accepting request 476924 from GNOME:Next - Update to version 0.38.1: + New Uninstall target. + Support for arbitrary test setups. + Intel C/C++ compiler support. + Get values from configuration data objects. + Python 3 module support simplified. + Default options to subprojects. + Set targets to be built (or not) by default. + Add option to mesonconf to wipe cached data. + Can specify file permissions and owner when installing data. + has_header() checks are now faster. + Array indexing now supports fallback values. + Silent mode for Mesontest. - Rebase meson-suse-ify-macros.patch. tests in many different ways. OBS-URL: https://build.opensuse.org/request/show/476924 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=30 --- meson-0.37.1.tar.gz | 3 --- meson-0.37.1.tar.gz.asc | 16 ---------------- meson-0.38.1.tar.gz | 3 +++ meson-0.38.1.tar.gz.asc | 16 ++++++++++++++++ meson-suse-ify-macros.patch | 9 +++++---- meson.changes | 20 +++++++++++++++++++- meson.spec | 3 ++- 7 files changed, 45 insertions(+), 25 deletions(-) delete mode 100644 meson-0.37.1.tar.gz delete mode 100644 meson-0.37.1.tar.gz.asc create mode 100644 meson-0.38.1.tar.gz create mode 100644 meson-0.38.1.tar.gz.asc diff --git a/meson-0.37.1.tar.gz b/meson-0.37.1.tar.gz deleted file mode 100644 index 7bf3a59..0000000 --- a/meson-0.37.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72516e25eaf9efd67fe8262ccba05e1e84731cc139101fcda7794aed9f68f55a -size 487164 diff --git a/meson-0.37.1.tar.gz.asc b/meson-0.37.1.tar.gz.asc deleted file mode 100644 index e832623..0000000 --- a/meson-0.37.1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlhZkXMACgkQO/RpO/7r -lCicuRAAh8okcpoIshMZCRBhInFhfaq4qStHoRPJ/nMI2/pHIk+AF42V5kKgVjcl -OU8jaQgkh0oW8pwxnKAEnFxwwEYE52umuuMF7bNmQhUmTJFSlKlm8XnL7bFgNmC+ -9ND9JLL3G33o78AO7L1/RLKNeJcvAhP6Hj2yVwX1cXZx0+gOA1e1Km37Gp/3d51p -Xlck4+GzKKwD9gDPZsDANyiSuGWQYkvsh9JhRbxZZRfvt8JAtnMRmnIf3m7DE0YA -Cm8zxSPiczh6pYzhzl6CPtXVsuN8/+BPXW8mm51oSxaAVQK+HWqUIsCQjYlBYcXx -nhVj5zNst1d3sAX9SbiIegP9hMBcZL6N+1N8jlLh2KYbfYM+OhftrcXoxs8yGOTY -VV6Rkuy/0GYrBqZYQRNF9jlWCjEO4HBom4rDNY1eQ1FaooB8IvcNb8o1wbPXtE+r -YQ0IiwlEjC/KQYDctkvvHoXhe6TjyhyJqGRU5zhpavE2Cfyt8P9fhp7yEJiMBigw -ScseothrpUDspBD9r+6lV+13ABShRIHdFVxHhcBIqRibWLIQRRGPKl8Fw8JvTEJI -fJ9S445bk67itCewbiG9vxJ7S2xQ/tX59MIf3cTskYpc739HP88zVGVunftiyMTk -zYImm9C9eP5NZPqkojTGK41Xqim4YxokZQ/+7XVpn1pL0eDMqCA= -=MXZw ------END PGP SIGNATURE----- diff --git a/meson-0.38.1.tar.gz b/meson-0.38.1.tar.gz new file mode 100644 index 0000000..ae21555 --- /dev/null +++ b/meson-0.38.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcb05349b32427924fa2a258a5e23e40e09c1bf9dd09919198c3a2ae1c38ba53 +size 515249 diff --git a/meson-0.38.1.tar.gz.asc b/meson-0.38.1.tar.gz.asc new file mode 100644 index 0000000..4ebac42 --- /dev/null +++ b/meson-0.38.1.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAliaLWoACgkQO/RpO/7r +lCg/nQ/9HWCMOJc9xXr5aVVGf7Oe5aBJi1xhxM31qKczt5oXtN7YelXT6a5qNLKU +/3jFqO1m2Nzp+Z9hhTJLGRWT7sjeF5WtEzJpUaBlxDzss4BlBOt/ssF0mjFwZuIA +UzzFF8RzlEYpt2tkwddR+A3pH/vC5AbWk7kP+F1MNzl6Q5TjvV+lpDAR39f/MyZI +OlK9HdrvBXQfwo/WJKBcm6O3FHGy0BR697UB8pqcrOGTmNsxZh7m0n7yDOv6hBwM +qbHnqdJYNoAxYGd/dsv/56Zz3I1eV5ZRRrekV8bv1fE/yWDb0iaLG9wX9dgJ8pIQ +dX3k/Vx9Rmr/7+KOMQehOnT817v6JdMMyC5QUCqhJAxplBb3EKAzvPx58lqJddQ+ +fxcAE+971WdNxr0zJbbn/gqRMhg+FEK7Ulx0WzgQKVb7Sk16Xd7y70jZC5bhVaW8 +yuR8C03fpe/EZLyTH9C9Z+DsQi3oVqWQCGv2Q5Cx1u6er+oD1eYzvXS6BX8pEUDg +ri/kwCLpeu0I8hgopRS1JdUTsYP6HonwvjQXYcxMgXMmNU5T6hfZqer2rB9stKwU +jXQ0O0YhoRyH2FH/Mc1YQV694sIll0lZjHgBrIrUW/uImBuAVv/0OeI4/dNgoIl4 +0xhjkR5rSvfBu/kIK2EDOjlQ4rM4XRThnWVxcRHNWdFmYvC9ZDM= +=QQ2n +-----END PGP SIGNATURE----- diff --git a/meson-suse-ify-macros.patch b/meson-suse-ify-macros.patch index e5d9bf8..2cbeaeb 100644 --- a/meson-suse-ify-macros.patch +++ b/meson-suse-ify-macros.patch @@ -1,8 +1,8 @@ -Index: meson-0.37.1/data/macros.meson +Index: meson-0.38.1/data/macros.meson =================================================================== ---- meson-0.37.1.orig/data/macros.meson -+++ meson-0.37.1/data/macros.meson -@@ -1,11 +1,12 @@ +--- meson-0.38.1.orig/data/macros.meson ++++ meson-0.38.1/data/macros.meson +@@ -1,11 +1,13 @@ %__meson %{_bindir}/meson +%_vpath_srcdir . +%_vpath_builddir build @@ -13,6 +13,7 @@ Index: meson-0.37.1/data/macros.meson - export FFLAGS="${FFLAGS:-%__global_fflags}" \ - export FCFLAGS="${FCFLAGS:-%__global_fcflags}" \ - export LDFLAGS="${LDFLAGS:-%__global_ldflags}" \ ++ export LANG=C.UTF-8 \ + export CFLAGS="${CFLAGS:-%optflags}" \ + export CXXFLAGS="${CXXFLAGS:-%optflags}" \ + export FFLAGS="${FFLAGS:-%optflags}" \ diff --git a/meson.changes b/meson.changes index 9cd30a7..2c34733 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sat Mar 4 14:50:28 UTC 2017 - dimstar@opensuse.org + +- Update to version 0.38.1: + + New Uninstall target. + + Support for arbitrary test setups. + + Intel C/C++ compiler support. + + Get values from configuration data objects. + + Python 3 module support simplified. + + Default options to subprojects. + + Set targets to be built (or not) by default. + + Add option to mesonconf to wipe cached data. + + Can specify file permissions and owner when installing data. + + has_header() checks are now faster. + + Array indexing now supports fallback values. + + Silent mode for Mesontest. +- Rebase meson-suse-ify-macros.patch. + ------------------------------------------------------------------- Tue Jan 10 16:14:32 UTC 2017 - dimstar@opensuse.org @@ -25,7 +43,7 @@ Mon Dec 19 05:55:00 UTC 2016 - dev@antergos.com - Update to version 0.37.0: * Mesontest: a new testing tool that allows you to run your - tests in many different ways. + tests in many different ways. * New shared_module function allows shared modules creation. * GNOME module now detects required programs and prints useful errors if any are missing. diff --git a/meson.spec b/meson.spec index 2989db4..055fcff 100644 --- a/meson.spec +++ b/meson.spec @@ -18,7 +18,7 @@ %define _name mesonbuild Name: meson -Version: 0.37.1 +Version: 0.38.1 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -109,6 +109,7 @@ python3 run_tests.py %{_mandir}/man1/%{name}.1%{?ext_man} %{_mandir}/man1/%{name}conf.1%{?ext_man} %{_mandir}/man1/%{name}introspect.1%{?ext_man} +%{_mandir}/man1/mesontest.1%{?ext_man} %{_mandir}/man1/wraptool.1%{?ext_man} %changelog From 737411b4f52593521d4e726382db15265116a648a600173948840a9052548968 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Thu, 16 Mar 2017 11:06:31 +0000 Subject: [PATCH 2/7] - Update to version 0.39.1. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=31 --- meson-0.38.1.tar.gz | 3 --- meson-0.38.1.tar.gz.asc | 16 ---------------- meson-0.39.1.tar.gz | 3 +++ meson-0.39.1.tar.gz.asc | 16 ++++++++++++++++ meson.changes | 7 +++++++ meson.spec | 4 ++-- 6 files changed, 28 insertions(+), 21 deletions(-) delete mode 100644 meson-0.38.1.tar.gz delete mode 100644 meson-0.38.1.tar.gz.asc create mode 100644 meson-0.39.1.tar.gz create mode 100644 meson-0.39.1.tar.gz.asc diff --git a/meson-0.38.1.tar.gz b/meson-0.38.1.tar.gz deleted file mode 100644 index ae21555..0000000 --- a/meson-0.38.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dcb05349b32427924fa2a258a5e23e40e09c1bf9dd09919198c3a2ae1c38ba53 -size 515249 diff --git a/meson-0.38.1.tar.gz.asc b/meson-0.38.1.tar.gz.asc deleted file mode 100644 index 4ebac42..0000000 --- a/meson-0.38.1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAliaLWoACgkQO/RpO/7r -lCg/nQ/9HWCMOJc9xXr5aVVGf7Oe5aBJi1xhxM31qKczt5oXtN7YelXT6a5qNLKU -/3jFqO1m2Nzp+Z9hhTJLGRWT7sjeF5WtEzJpUaBlxDzss4BlBOt/ssF0mjFwZuIA -UzzFF8RzlEYpt2tkwddR+A3pH/vC5AbWk7kP+F1MNzl6Q5TjvV+lpDAR39f/MyZI -OlK9HdrvBXQfwo/WJKBcm6O3FHGy0BR697UB8pqcrOGTmNsxZh7m0n7yDOv6hBwM -qbHnqdJYNoAxYGd/dsv/56Zz3I1eV5ZRRrekV8bv1fE/yWDb0iaLG9wX9dgJ8pIQ -dX3k/Vx9Rmr/7+KOMQehOnT817v6JdMMyC5QUCqhJAxplBb3EKAzvPx58lqJddQ+ -fxcAE+971WdNxr0zJbbn/gqRMhg+FEK7Ulx0WzgQKVb7Sk16Xd7y70jZC5bhVaW8 -yuR8C03fpe/EZLyTH9C9Z+DsQi3oVqWQCGv2Q5Cx1u6er+oD1eYzvXS6BX8pEUDg -ri/kwCLpeu0I8hgopRS1JdUTsYP6HonwvjQXYcxMgXMmNU5T6hfZqer2rB9stKwU -jXQ0O0YhoRyH2FH/Mc1YQV694sIll0lZjHgBrIrUW/uImBuAVv/0OeI4/dNgoIl4 -0xhjkR5rSvfBu/kIK2EDOjlQ4rM4XRThnWVxcRHNWdFmYvC9ZDM= -=QQ2n ------END PGP SIGNATURE----- diff --git a/meson-0.39.1.tar.gz b/meson-0.39.1.tar.gz new file mode 100644 index 0000000..eeefc21 --- /dev/null +++ b/meson-0.39.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44885ccfef94d3d4afb1053fa6673ed130d3093fc9e9f6624d08161d8a385220 +size 558914 diff --git a/meson-0.39.1.tar.gz.asc b/meson-0.39.1.tar.gz.asc new file mode 100644 index 0000000..695024a --- /dev/null +++ b/meson-0.39.1.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAljJrtsACgkQO/RpO/7r +lCiLjg//Zbsymr19pq7BbSZzWrWPUzx5IivWUNvtg7Mi7ChUKcn3g9New2J00Uiv +DNT/SNq/75EwIXzqqSm6A9PqoKLRyaPiWImGvFHELllr2VB/nyIzbadBF64s5ncs +CYxLat5SB90yTshXf6F9T4I87mdOLJV75xHfjnhqu5+kmAx9qQd/efFEaOH9hrTS +PWfnciSRS+LgWJ9Ew+66TMVAg7VCRPW866GzTl7gfjdcgW+HebduJkXt8We5IhLf +JAXf1GvcVYJpEdoRqrcGe9gNXfvdHqb1hTjO5tJCVKMJ7SrdYm4U3SwU96KccWXB +DT8LTF3psl/DkjUMvuR6LqL13IDd9lowEGhyDR/z3T9KROSUj14FIiPdPiMzTXvy +jtwCBAtN58yO2knahqw6l3bvoWEOzR3eQ7zvCoj6OK73mYXuZq6+yGEybyYTWINp +RwBaf2JSrIW6++5pQRIAhZW2bf7cinhpQdBYkhlPCt0UEfwPhpqpinOMO8xnQBzI +W2ADyf8Jq88sUCCU/DIbUjWDIcPa9UdWC+YkjljlciwhRDRYUC3ykkQt4MOIahK/ +AOUtFY03W3spAU0EZ6aqCJxKE/egNezVQsqDNFVXZIka5cshAaq5lQzqLSjJsjMG +bTUmm+sPs9hqm2BasWyMinehd73EHgW1htZjMgTQHZD7YX45gxg= +=Z8Al +-----END PGP SIGNATURE----- diff --git a/meson.changes b/meson.changes index 2c34733..146e2f5 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 16 11:04:13 UTC 2017 - sor.alexei@meowr.ru + +- Update to version 0.39.1 (changes since 0.38.1): + * Allow specifying extra arguments for tests. + * Bug fixes and minor polishes. + ------------------------------------------------------------------- Sat Mar 4 14:50:28 UTC 2017 - dimstar@opensuse.org diff --git a/meson.spec b/meson.spec index 055fcff..4acde71 100644 --- a/meson.spec +++ b/meson.spec @@ -18,7 +18,7 @@ %define _name mesonbuild Name: meson -Version: 0.38.1 +Version: 0.39.1 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -109,7 +109,7 @@ python3 run_tests.py %{_mandir}/man1/%{name}.1%{?ext_man} %{_mandir}/man1/%{name}conf.1%{?ext_man} %{_mandir}/man1/%{name}introspect.1%{?ext_man} -%{_mandir}/man1/mesontest.1%{?ext_man} +%{_mandir}/man1/%{name}test.1%{?ext_man} %{_mandir}/man1/wraptool.1%{?ext_man} %changelog From fabac88c57d6c66895e88c712aefe79fffed7411a99a7b41a8dcb14379ab8827 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 17 Mar 2017 13:58:10 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=32 --- meson-fix-gcc48.patch | 23 +++++++++++++++++++++++ meson.changes | 2 ++ meson.spec | 6 +++++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meson-fix-gcc48.patch diff --git a/meson-fix-gcc48.patch b/meson-fix-gcc48.patch new file mode 100644 index 0000000..ddae08e --- /dev/null +++ b/meson-fix-gcc48.patch @@ -0,0 +1,23 @@ +--- a/mesonbuild/compilers.py ++++ b/mesonbuild/compilers.py +@@ -2403,13 +2403,18 @@ class GnuCPPCompiler(GnuCompiler, CPPCom + '3': default_warn_args + ['-Wextra', '-Wpedantic']} + + def get_options(self): ++ c_stds = ['c++03', 'c++11'] ++ g_stds = ['gnu++03', 'gnu++11'] ++ if mesonlib.version_compare(self.version, '>=5.0.0'): ++ c_stds += ['c++14', 'c++1z'] ++ g_stds += ['gnu++14', 'gnu++1z'] + opts = {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use', +- ['none', 'c++03', 'c++11', 'c++14', 'c++1z', +- 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++1z'], ++ ['none'] + c_stds + g_stds, + 'none'), + 'cpp_debugstl': coredata.UserBooleanOption('cpp_debugstl', + 'STL debug mode', + False)} ++ + if self.gcc_type == GCC_MINGW: + opts.update({ + 'cpp_winlibs': coredata.UserStringArrayOption('cpp_winlibs', 'Standard Win libraries to link against', diff --git a/meson.changes b/meson.changes index 146e2f5..2147cb6 100644 --- a/meson.changes +++ b/meson.changes @@ -4,6 +4,8 @@ Thu Mar 16 11:04:13 UTC 2017 - sor.alexei@meowr.ru - Update to version 0.39.1 (changes since 0.38.1): * Allow specifying extra arguments for tests. * Bug fixes and minor polishes. +- Add meson-fix-gcc48.patch: fix GCC 4.8 handling for + openSUSE Leap 42.x. ------------------------------------------------------------------- Sat Mar 4 14:50:28 UTC 2017 - dimstar@opensuse.org diff --git a/meson.spec b/meson.spec index 4acde71..c39ca87 100644 --- a/meson.spec +++ b/meson.spec @@ -27,10 +27,13 @@ Url: http://mesonbuild.com/ Source: https://github.com/%{_name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz Source1: https://github.com/%{_name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz.asc Source2: %{name}.keyring -# PATCH-FIX-OPENSUSE meson-suse-ify-macros.patch dimstar@opensuse.org -- Make the macros non-RetHat specific. So far we do not have sep. {C,CXX,F}FLAGS +# PATCH-FIX-OPENSUSE meson-suse-ify-macros.patch dimstar@opensuse.org -- Make the macros non-RedHat specific: so far there are no separate {C,CXX,F}FLAGS. Patch0: meson-suse-ify-macros.patch +# PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x. +Patch1: meson-fix-gcc48.patch BuildRequires: bison BuildRequires: boost-devel +BuildRequires: doxygen BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gcc-fortran @@ -74,6 +77,7 @@ Domain Specific Language. %prep %setup -q %patch0 -p1 +%patch1 -p1 # Lack of gtest, gmock, gnustep. rm -rf "test cases/frameworks/2 gtest" \ From 41f431fdb4b8d52c32cc4d8e46af8ebc08d3f73f522d299235b691de3ffabb79 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 17 Mar 2017 14:13:57 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=33 --- meson.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.spec b/meson.spec index c39ca87..9459bf3 100644 --- a/meson.spec +++ b/meson.spec @@ -33,7 +33,6 @@ Patch0: meson-suse-ify-macros.patch Patch1: meson-fix-gcc48.patch BuildRequires: bison BuildRequires: boost-devel -BuildRequires: doxygen BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gcc-fortran From 81f051cf2bc2299a4769c704ad23fbf2b9f24779bc52319cc339b1f597c8dcce Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 17 Mar 2017 14:21:59 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=34 --- meson-fix-gcc48.patch | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meson-fix-gcc48.patch b/meson-fix-gcc48.patch index ddae08e..09f387d 100644 --- a/meson-fix-gcc48.patch +++ b/meson-fix-gcc48.patch @@ -1,6 +1,6 @@ --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py -@@ -2403,13 +2403,18 @@ class GnuCPPCompiler(GnuCompiler, CPPCom +@@ -2403,9 +2403,13 @@ class GnuCPPCompiler(GnuCompiler, CPPCom '3': default_warn_args + ['-Wextra', '-Wpedantic']} def get_options(self): @@ -16,8 +16,3 @@ 'none'), 'cpp_debugstl': coredata.UserBooleanOption('cpp_debugstl', 'STL debug mode', - False)} -+ - if self.gcc_type == GCC_MINGW: - opts.update({ - 'cpp_winlibs': coredata.UserStringArrayOption('cpp_winlibs', 'Standard Win libraries to link against', From 8ba18e34f7ad0a9474b9fbaa3a248487d37e2530498d0b7aa0ef74ddd7105985 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 20 Mar 2017 11:41:12 +0000 Subject: [PATCH 6/7] Accepting request 481274 from GNOME:Next - Add meson-disable-untested-code.patch: meson has code in the test suite that assumes different behaviour between glib 2.51.5 (rc) and 2.52.0 (final); this must be a wrong assumption to start with and the test suite fails with 2.52.20. When this was added by upstream 4 months before glib-2.52.0 was released, there must have been no way at all to test this. We revert back to a state like with the previous glib verison, where this test was simply skipped (gh#mesonbuild/meson#1480). OBS-URL: https://build.opensuse.org/request/show/481274 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=35 --- meson-disable-untested-code.patch | 13 +++++++++++++ meson.changes | 12 ++++++++++++ meson.spec | 3 +++ 3 files changed, 28 insertions(+) create mode 100644 meson-disable-untested-code.patch diff --git a/meson-disable-untested-code.patch b/meson-disable-untested-code.patch new file mode 100644 index 0000000..b15a938 --- /dev/null +++ b/meson-disable-untested-code.patch @@ -0,0 +1,13 @@ +Index: meson-0.39.1/test cases/frameworks/7 gnome/resources/meson.build +=================================================================== +--- meson-0.39.1.orig/test cases/frameworks/7 gnome/resources/meson.build ++++ meson-0.39.1/test cases/frameworks/7 gnome/resources/meson.build +@@ -29,7 +29,7 @@ gnome.compile_resources('simple-resource + ) + test('simple resource test (gresource)', find_program('resources.py')) + +-if glib.version() >= '2.52.0' ++if glib.version() >= '9.99.9' + # This test cannot pass if GLib version is older than 9.99.9. + # Meson will raise an error if the user tries to use the 'dependencies' + # argument and the version of GLib is too old for generated resource diff --git a/meson.changes b/meson.changes index 2147cb6..7d56bef 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Mar 20 11:21:10 UTC 2017 - dimstar@opensuse.org + +- Add meson-disable-untested-code.patch: meson has code in the test + suite that assumes different behaviour between glib 2.51.5 (rc) + and 2.52.0 (final); this must be a wrong assumption to start with + and the test suite fails with 2.52.20. When this was added by + upstream 4 months before glib-2.52.0 was released, there must + have been no way at all to test this. We revert back to a state + like with the previous glib verison, where this test was simply + skipped (gh#mesonbuild/meson#1480). + ------------------------------------------------------------------- Thu Mar 16 11:04:13 UTC 2017 - sor.alexei@meowr.ru diff --git a/meson.spec b/meson.spec index 9459bf3..ebb19f1 100644 --- a/meson.spec +++ b/meson.spec @@ -31,6 +31,8 @@ Source2: %{name}.keyring Patch0: meson-suse-ify-macros.patch # PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x. Patch1: meson-fix-gcc48.patch +# PATCH-FIX-UPSTREAM meson-disable-untested-code.patch gh#mesonbuild/meson#1480 dimstar@opensuse.org -- Do not assume that the untested meson test works with glib 2.52.0 +Patch2: meson-disable-untested-code.patch BuildRequires: bison BuildRequires: boost-devel BuildRequires: flex @@ -77,6 +79,7 @@ Domain Specific Language. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Lack of gtest, gmock, gnustep. rm -rf "test cases/frameworks/2 gtest" \ From 907e7b43342126f7520aeeaaab9e01283cd6ec3ea40dfa8df8f110058f83bea1 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 20 Mar 2017 11:53:17 +0000 Subject: [PATCH 7/7] Accepting request 481278 from GNOME:Next Sorry, a minor tweak to .changes' OBS-URL: https://build.opensuse.org/request/show/481278 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=36 --- meson.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.changes b/meson.changes index 7d56bef..e6b7306 100644 --- a/meson.changes +++ b/meson.changes @@ -4,7 +4,7 @@ Mon Mar 20 11:21:10 UTC 2017 - dimstar@opensuse.org - Add meson-disable-untested-code.patch: meson has code in the test suite that assumes different behaviour between glib 2.51.5 (rc) and 2.52.0 (final); this must be a wrong assumption to start with - and the test suite fails with 2.52.20. When this was added by + and the test suite fails with 2.52.0. When this was added by upstream 4 months before glib-2.52.0 was released, there must have been no way at all to test this. We revert back to a state like with the previous glib verison, where this test was simply