Hello community, here is the log from the commit of package meson for openSUSE:Factory checked in at 2017-10-26 18:43:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meson (Old) and /work/SRC/openSUSE:Factory/.meson.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meson" Thu Oct 26 18:43:08 2017 rev:25 rq:535997 version:0.43.0 Changes: -------- --- /work/SRC/openSUSE:Factory/meson/meson-testsuite.changes 2017-10-05 11:55:32.931920619 +0200 +++ /work/SRC/openSUSE:Factory/.meson.new/meson-testsuite.changes 2017-10-26 18:43:11.783276996 +0200 @@ -1,0 +2,44 @@ +Mon Oct 23 12:30:03 UTC 2017 - [email protected] + +- Setup MPI runtime environment before running the test suite. +- Remove tests for static boost libraries from + test\ cases/frameworks/1\ boost/meson.build. + +------------------------------------------------------------------- +Thu Oct 19 15:00:49 UTC 2017 - [email protected] + +- Update to version 0.43.0: + + Generator learned capture: Generators can now be configured to + capture the standard output. + + Can index CustomTarget objects: The CustomTarget object can + now be indexed like an array. The resulting object can be used + as a source file for other Targets, this will create a + dependency on the original CustomTarget, but will only insert + the generated file corresponding to the index value of the + CustomTarget's output keyword. + + The cross file can now be used for overriding the result of + find_program. Then issuing the command find_program('objdump') + will return the version specified in the cross file. + + Easier handling of supported compiler arguments. + + Better support for shared libraries in non-system paths: This + release adds feature parity to shared libraries that are + either in non-standard system paths or shipped as part of your + project. On systems that support rpath, Meson automatically + adds rpath entries to built targets using manually found + external libraries. + + The Wrap dependency system now supports Subversion (svn). This + support is rudimentary. The repository url has to point to a + specific (sub)directory containing the meson.build file + (typically trunk/). However, providing a revision is + supported. +- Rebase meson-test-installed-bin.patch. +- Run sed to strip the hashbang from a non-executable file; this + prevents an rpmlint warning. + +------------------------------------------------------------------- +Wed Oct 11 15:43:16 UTC 2017 - [email protected] + +- Don't use obsolete boost-devel for openSUSE Leap 15.0 and newer + (boo#1062785). + +------------------------------------------------------------------- meson.changes: same change Old: ---- meson-0.42.1.tar.gz meson-0.42.1.tar.gz.asc New: ---- meson-0.43.0.tar.gz meson-0.43.0.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meson-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.wHPmYa/_old 2017-10-26 18:43:12.815228839 +0200 +++ /var/tmp/diff_new_pack.wHPmYa/_new 2017-10-26 18:43:12.815228839 +0200 @@ -20,11 +20,11 @@ %if %{testsuite} %define name_ext -testsuite %else -%define name_ext %nil +%define name_ext %{nil} %endif %define _name mesonbuild Name: meson%{name_ext} -Version: 0.42.1 +Version: 0.43.0 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -37,13 +37,13 @@ Patch0: meson-suse-ify-macros.patch # PATCH-FIX-OPENSUSE meson-fix-gcc48.patch [email protected] -- Fix GCC 4.8 handling for openSUSE Leap 42.x. Patch1: meson-fix-gcc48.patch -# PATCH-FIX-OPENSUSE meson-test-installed-bin.patch [email protected] -- We want the test suite to run against /usr/bin/meson coming from our meson package +# PATCH-FIX-OPENSUSE meson-test-installed-bin.patch [email protected] -- We want the test suite to run against /usr/bin/meson coming from our meson package. Patch100: meson-test-installed-bin.patch BuildRequires: python3 >= 3.4 BuildArch: noarch %if %{testsuite} BuildRequires: bison -BuildRequires: boost-devel +BuildRequires: cups-devel BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gcc-fortran @@ -57,9 +57,10 @@ BuildRequires: itstool BuildRequires: libpcap-devel BuildRequires: llvm-devel -BuildRequires: meson +BuildRequires: meson >= %{version} BuildRequires: ncurses-devel BuildRequires: ninja +BuildRequires: openmpi-devel BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-gobject @@ -74,6 +75,14 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(zlib) +%if 0%{?suse_version} > 1320 +BuildRequires: libboost_log-devel +BuildRequires: libboost_system-devel +BuildRequires: libboost_test-devel +BuildRequires: libboost_thread-devel +%else +BuildRequires: boost-devel +%endif %else Requires: ninja # meson-gui was last used in openSUSE Leap 42.1. @@ -90,7 +99,7 @@ Domain Specific Language. %package vim -%{!?vim_data_dir:%global vim_data_dir %_datadir/vim} +%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} Summary: Vim support for meson.build files Group: Productivity/Text/Editors Requires: vim @@ -112,11 +121,16 @@ %patch0 -p1 %patch1 -p1 %patch100 -p1 +# Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname) +sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build # We do not have gmock available at this moment - can't run the test suite for it rm -rf "test cases/frameworks/3 gmock" \ "test cases/objc/2 nsstring" +# Remove hashbang from non-exec script +sed -i '1{/\/usr\/bin\/env/d;}' ./mesonbuild/rewriter.py + %build # If this is the test suite, we don't need anything else but the meson package %if ! %{testsuite} @@ -148,6 +162,7 @@ export LANG=C.UTF-8 export MESON_PRINT_TEST_OUTPUT=1 export SUSE_ASNEEDED=0 +source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh python3 run_tests.py %endif ++++++ meson.spec ++++++ --- /var/tmp/diff_new_pack.wHPmYa/_old 2017-10-26 18:43:12.847227346 +0200 +++ /var/tmp/diff_new_pack.wHPmYa/_new 2017-10-26 18:43:12.847227346 +0200 @@ -20,11 +20,11 @@ %if %{testsuite} %define name_ext -testsuite %else -%define name_ext %nil +%define name_ext %{nil} %endif %define _name mesonbuild Name: meson%{name_ext} -Version: 0.42.1 +Version: 0.43.0 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -37,13 +37,13 @@ Patch0: meson-suse-ify-macros.patch # PATCH-FIX-OPENSUSE meson-fix-gcc48.patch [email protected] -- Fix GCC 4.8 handling for openSUSE Leap 42.x. Patch1: meson-fix-gcc48.patch -# PATCH-FIX-OPENSUSE meson-test-installed-bin.patch [email protected] -- We want the test suite to run against /usr/bin/meson coming from our meson package +# PATCH-FIX-OPENSUSE meson-test-installed-bin.patch [email protected] -- We want the test suite to run against /usr/bin/meson coming from our meson package. Patch100: meson-test-installed-bin.patch BuildRequires: python3 >= 3.4 BuildArch: noarch %if %{testsuite} BuildRequires: bison -BuildRequires: boost-devel +BuildRequires: cups-devel BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gcc-fortran @@ -57,9 +57,10 @@ BuildRequires: itstool BuildRequires: libpcap-devel BuildRequires: llvm-devel -BuildRequires: meson +BuildRequires: meson >= %{version} BuildRequires: ncurses-devel BuildRequires: ninja +BuildRequires: openmpi-devel BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-gobject @@ -74,6 +75,14 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(zlib) +%if 0%{?suse_version} > 1320 +BuildRequires: libboost_log-devel +BuildRequires: libboost_system-devel +BuildRequires: libboost_test-devel +BuildRequires: libboost_thread-devel +%else +BuildRequires: boost-devel +%endif %else Requires: ninja # meson-gui was last used in openSUSE Leap 42.1. @@ -90,7 +99,7 @@ Domain Specific Language. %package vim -%{!?vim_data_dir:%global vim_data_dir %_datadir/vim} +%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} Summary: Vim support for meson.build files Group: Productivity/Text/Editors Requires: vim @@ -112,11 +121,16 @@ %patch0 -p1 %patch1 -p1 %patch100 -p1 +# Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname) +sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build # We do not have gmock available at this moment - can't run the test suite for it rm -rf "test cases/frameworks/3 gmock" \ "test cases/objc/2 nsstring" +# Remove hashbang from non-exec script +sed -i '1{/\/usr\/bin\/env/d;}' ./mesonbuild/rewriter.py + %build # If this is the test suite, we don't need anything else but the meson package %if ! %{testsuite} @@ -148,6 +162,7 @@ export LANG=C.UTF-8 export MESON_PRINT_TEST_OUTPUT=1 export SUSE_ASNEEDED=0 +source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh python3 run_tests.py %endif ++++++ meson-0.42.1.tar.gz -> meson-0.43.0.tar.gz ++++++ ++++ 7487 lines of diff (skipped) ++++++ meson-test-installed-bin.patch ++++++ --- /var/tmp/diff_new_pack.wHPmYa/_old 2017-10-26 18:43:13.547194680 +0200 +++ /var/tmp/diff_new_pack.wHPmYa/_new 2017-10-26 18:43:13.547194680 +0200 @@ -1,21 +1,21 @@ -Index: meson-0.42.0/run_project_tests.py +Index: meson-0.43.0/run_project_tests.py =================================================================== ---- meson-0.42.0.orig/run_project_tests.py -+++ meson-0.42.0/run_project_tests.py -@@ -124,7 +124,7 @@ print_debug = 'MESON_PRINT_TEST_OUTPUT' - do_debug = not {'MESON_PRINT_TEST_OUTPUT', 'TRAVIS', 'APPVEYOR'}.isdisjoint(os.environ) - no_meson_log_msg = 'No meson-log.txt found.' +--- meson-0.43.0.orig/run_project_tests.py ++++ meson-0.43.0/run_project_tests.py +@@ -126,7 +126,7 @@ no_meson_log_msg = 'No meson-log.txt fou + + system_compiler = None -meson_command = os.path.join(os.getcwd(), 'meson') +meson_command = '/usr/bin/meson' if not os.path.exists(meson_command): meson_command += '.py' if not os.path.exists(meson_command): -Index: meson-0.42.0/run_unittests.py +Index: meson-0.43.0/run_unittests.py =================================================================== ---- meson-0.42.0.orig/run_unittests.py -+++ meson-0.42.0/run_unittests.py -@@ -416,11 +416,11 @@ class BasePlatformTests(unittest.TestCas +--- meson-0.43.0.orig/run_unittests.py ++++ meson-0.43.0/run_unittests.py +@@ -459,11 +459,11 @@ class BasePlatformTests(unittest.TestCas # Get the backend # FIXME: Extract this from argv? self.backend = getattr(Backend, os.environ.get('MESON_UNIT_TEST_BACKEND', 'ninja'))
