diff --git a/meson-fix-gcc48.patch b/meson-fix-gcc48.patch index 1dd899c..122e1b5 100644 --- a/meson-fix-gcc48.patch +++ b/meson-fix-gcc48.patch @@ -1,15 +1,14 @@ -diff -ur meson-0.42.0/mesonbuild/compilers/cpp.py meson-0.42.patched/mesonbuild/compilers/cpp.py ---- meson-0.42.0/mesonbuild/compilers/cpp.py 2017-08-13 20:43:17.000000000 +0200 -+++ meson-0.42.patched/mesonbuild/compilers/cpp.py 2017-08-15 12:42:07.216511972 +0200 +--- a/mesonbuild/compilers/cpp.py ++++ b/mesonbuild/compilers/cpp.py @@ -75,9 +75,13 @@ '3': default_warn_args + ['-Wextra', '-Wpedantic']} def get_options(self): + c_stds = ['c++03', 'c++11'] + g_stds = ['gnu++11'] -+ if mesonlib.version_compare(self.version, '>=5.0.0'): -+ c_stds += ['c++14', 'c++1z'] -+ g_stds += ['gnu++14', 'gnu++1z'] ++ if version_compare(self.version, '>=5.0.0'): ++ c_stds += ['c++14', 'c++1z'] ++ g_stds += ['gnu++14', 'gnu++1z'] return {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use', - ['none', 'c++03', 'c++11', 'c++14', 'c++1z', - 'gnu++11', 'gnu++14', 'gnu++1z'], diff --git a/meson-testsuite.spec b/meson-testsuite.spec index 34b4c37..f8654d5 100644 --- a/meson-testsuite.spec +++ b/meson-testsuite.spec @@ -152,8 +152,6 @@ python3 run_tests.py %endif %files -%defattr(-,root,root) - %doc contributing.txt COPYING %if !%{testsuite} %{_bindir}/meson @@ -173,7 +171,6 @@ python3 run_tests.py %if !%{testsuite} %files vim -%defattr(-,root,root) %doc syntax-highlighting/vim/README %dir %{vim_data_dir} %dir %{vim_data_dir}/site diff --git a/meson.changes b/meson.changes index 037fbb6..c01bb74 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 8 12:22:38 UTC 2017 - sor.alexei@meowr.ru + +- Rebase meson-fix-gcc48.patch (boo#1057701). + ------------------------------------------------------------------- Tue Aug 15 11:00:02 UTC 2017 - dimstar@opensuse.org diff --git a/meson.spec b/meson.spec index 29bbcea..929f53d 100644 --- a/meson.spec +++ b/meson.spec @@ -152,8 +152,6 @@ python3 run_tests.py %endif %files -%defattr(-,root,root) - %doc contributing.txt COPYING %if !%{testsuite} %{_bindir}/meson @@ -173,7 +171,6 @@ python3 run_tests.py %if !%{testsuite} %files vim -%defattr(-,root,root) %doc syntax-highlighting/vim/README %dir %{vim_data_dir} %dir %{vim_data_dir}/site