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.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-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-fix-gcc48.patch b/meson-fix-gcc48.patch new file mode 100644 index 0000000..09f387d --- /dev/null +++ b/meson-fix-gcc48.patch @@ -0,0 +1,18 @@ +--- a/mesonbuild/compilers.py ++++ b/mesonbuild/compilers.py +@@ -2403,9 +2403,13 @@ 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', 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..e6b7306 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +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.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 + skipped (gh#mesonbuild/meson#1480). + +------------------------------------------------------------------- +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 + +- 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 +64,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..ebb19f1 100644 --- a/meson.spec +++ b/meson.spec @@ -18,7 +18,7 @@ %define _name mesonbuild Name: meson -Version: 0.37.1 +Version: 0.39.1 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -27,8 +27,12 @@ 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 +# 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 @@ -74,6 +78,8 @@ Domain Specific Language. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 # Lack of gtest, gmock, gnustep. rm -rf "test cases/frameworks/2 gtest" \ @@ -109,6 +115,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/%{name}test.1%{?ext_man} %{_mandir}/man1/wraptool.1%{?ext_man} %changelog