Accepting request 573229 from GNOME:Next

Update to 0.44.0

OBS-URL: https://build.opensuse.org/request/show/573229
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=72

meson-0.43.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c513eca90e0d70bf14cd1eaafea2fa91cf40a73326a7ff61f08a005048057340
-size 1066546

meson-0.43.0.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlnaiuQACgkQO/RpO/7r
-lCicmw/+NHaUsWG+3dG9UbBg8N0+FkGxOkobkAFSFIAwK2faKpHsEu/ka3nzsXln
-nL3SzlNAx4kuhhFRf4PWRDkVLgeyfdnhp0rouPJ0TIOyGjShBXXzCoRMitw6dxyy
-ipBUc9p5G/hbcwhPJ45PYOE8/zovbaZuiCujjlqwCl9IwWdNoUAcgzzsvOJzIXWy
-IGQUKFxPtaMqm1F4CjpDt+yYQXYlzEr9OERSO6E3tk0nzUbvWZ0SyUmO/lF/ZNLV
-sfZVLN9NBTIbToPVrLVMV/l8RmhAzARzAQrLJaeE500XFrLG7p0RM9QLQRf6UMQj
-Ims9Cqg/x7ns8b0FwdtBNWHiPDFgYi+iLsKG1fa9/0WEpFKv4nx1P/al+3twdZz+
-RNFUWolRhnU1W6rczBdB67FZVpcQ1P6Bcq0JDuoBiRrrT08syzMUjLF/oNYMp5dz
-eK/YmSqTM0F29M+KFGP73fJW9ca737CTChdTNHFsh4R1GPZmnwSqhKXmqf4Qirt9
-r8LySWJM6jZdNMl1XB7NcFoKkCUSB0rwTkVTY0iVIlKAslmoy1zp9Ivcx71JkSa1
-OKCCrp3PodMc9qIEvktrf8Oc1FvuZSspBYYVoyICUFzCJFJl1hvi0pLSRC9dlLX/
-zuCgY0HrhvWYOY39l1bw0cnNDhX6t0SHMzIaC4icdgYw3B9gi4k=
-=GaA2
------END PGP SIGNATURE-----

meson-0.44.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50f9b12b77272ef6ab064d26b7e06667f07fa9f931e6a20942bba2216ba4281b
+size 1102644

meson-0.44.0.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlotXrYACgkQO/RpO/7r
+lCi/9Q/+JmJHM+1BPG+GtvH49UyZu5UH+IlWuW5aBPsiwJPkt8zdPFSAGXd8HABt
+gB6UI1btRESNTFDro8pyh+TXaRlxENuBAEMg/8RWbIubOt114fPjt8LA0VSuq3EV
+lEGAYxxcw/rD+6enFky+G5qejVkGzgfbq+belV7uzupnRnkIHdq3i3cqozgx1osQ
+R6tucDzpGfRsmwmCVwhz373uk1FpuT1xmv6JH99A9HsBREA+Xl96nAUkW2Xs+XO4
+6dmIM5JcIadMn24cEA6WkGslcrawWiiI3d4tsSXw2HbKZcrN2lDOHChZ0SGn0R7n
+6885zZmPqO5I9fEs0CQEYXiQ7LqK1v9CAgAN4Rh/IzaT+mHsPejroR+3mQArCB9V
+opAkQ7J8X4Hh+XWl/QHdHYwmcgdStj0iF2sMgy4i87eivCVVRQ1qYToGQsphZSKI
+7ecVtCgt+YkrdoyV83ZoXFzoz1+uQNws4xtO+odtKFWBfjTmatgIsv72fSdEPLM/
+LVhykaoEe3mHWgKNRwbd0abmBzpQj7Xxqxv3WL9b+m8bDOatydkfqH/aNkg0Z3bz
+HzkQU62O8KXOXQQ36QooklazamAyw/9e6sJWtpkOOnjzGsnrpQHt8GFK12Vdvnso
+b9q6CDNbdqT9zofIwhYOCupGdQRPWqOn/uXXUkZLhGpN2rtAaz4=
+=970p
+-----END PGP SIGNATURE-----

meson-fix-gcc48.patch

@@ -1,17 +1,19 @@
---- a/mesonbuild/compilers/cpp.py
+Index: meson-0.44.0/mesonbuild/compilers/cpp.py
-+++ b/mesonbuild/compilers/cpp.py
+===================================================================
-@@ -75,9 +75,13 @@
+--- meson-0.44.0.orig/mesonbuild/compilers/cpp.py
++++ meson-0.44.0/mesonbuild/compilers/cpp.py
+@@ -75,9 +75,13 @@ class ClangCPPCompiler(ClangCompiler, CP
                            '3': default_warn_args + ['-Wextra', '-Wpedantic']}
  
      def get_options(self):
-+        c_stds = ['c++03', 'c++11']
++        c_stds = ['c++98', 'c++03', 'c++11']
 +        g_stds = ['gnu++11']
 +        if version_compare(self.version, '>=5.0.0'):
-+            c_stds += ['c++14', 'c++1z']
++            c_stds += ['c++14', 'c++17', 'c++1z']
-+            g_stds += ['gnu++14', 'gnu++1z']
++            g_stds += ['gnu++14', 'gnu++17', 'gnu++1z']
          return {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
--                                                    ['none', 'c++03', 'c++11', 'c++14', 'c++1z',
+-                                                    ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z',
--                                                     'gnu++11', 'gnu++14', 'gnu++1z'],
+-                                                     'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z'],
 +                                                    ['none'] + c_stds + g_stds,
                                                      'none')}
  

meson-suse-ify-macros.patch

@@ -1,7 +1,7 @@
-Index: meson-0.41.0/data/macros.meson
+Index: meson-0.44.0/data/macros.meson
 ===================================================================
---- meson-0.41.0.orig/data/macros.meson
+--- meson-0.44.0.orig/data/macros.meson
-+++ meson-0.41.0/data/macros.meson
++++ meson-0.44.0/data/macros.meson
 @@ -1,12 +1,14 @@
  %__meson %{_bindir}/meson
  %__meson_wrap_mode nodownload
@@ -22,7 +22,7 @@ Index: meson-0.41.0/data/macros.meson
      %{__meson}                              \\\
          --buildtype=plain                   \\\
          --prefix=%{_prefix}                 \\\
-@@ -27,10 +29,13 @@
+@@ -27,12 +29,15 @@
          %{nil}
  
  %meson_build \
@@ -35,4 +35,6 @@ Index: meson-0.41.0/data/macros.meson
  
  %meson_test \
 +    export LANG=C.UTF-8                      \
-     %ninja_test -C %{_vpath_builddir}
+     %ninja_test -C %{_vpath_builddir} || \
+     { rc=$?; \
+       echo "-----BEGIN TESTLOG-----"; \

meson-test-installed-bin.patch

@@ -1,7 +1,7 @@
-Index: meson-0.43.0/run_project_tests.py
+Index: meson-0.44.0/run_project_tests.py
 ===================================================================
---- meson-0.43.0.orig/run_project_tests.py
+--- meson-0.44.0.orig/run_project_tests.py
-+++ meson-0.43.0/run_project_tests.py
++++ meson-0.44.0/run_project_tests.py
 @@ -126,7 +126,7 @@ no_meson_log_msg = 'No meson-log.txt fou
  
  system_compiler = None
@@ -11,23 +11,16 @@ Index: meson-0.43.0/run_project_tests.py
  if not os.path.exists(meson_command):
      meson_command += '.py'
      if not os.path.exists(meson_command):
-Index: meson-0.43.0/run_unittests.py
+Index: meson-0.44.0/run_unittests.py
 ===================================================================
---- meson-0.43.0.orig/run_unittests.py
+--- meson-0.44.0.orig/run_unittests.py
-+++ meson-0.43.0/run_unittests.py
++++ meson-0.44.0/run_unittests.py
-@@ -459,11 +459,11 @@ class BasePlatformTests(unittest.TestCas
+@@ -462,7 +462,7 @@ class BasePlatformTests(unittest.TestCas
          # Get the backend
          # FIXME: Extract this from argv?
          self.backend = getattr(Backend, os.environ.get('MESON_UNIT_TEST_BACKEND', 'ninja'))
--        self.meson_args = [os.path.join(src_root, 'meson.py'), '--backend=' + self.backend.name]
+-        self.meson_mainfile = os.path.join(src_root, 'meson.py')
-+        self.meson_args = ['/usr/bin/meson', '--backend=' + self.backend.name]
++        self.meson_mainfile = '/usr/bin/meson'
-         self.meson_command = [sys.executable] + self.meson_args
+         self.meson_args = ['--backend=' + self.backend.name]
--        self.mconf_command = [sys.executable, os.path.join(src_root, 'meson.py'), 'configure']
+         self.meson_command = meson_command + self.meson_args
--        self.mintro_command = [sys.executable, os.path.join(src_root, 'meson.py'), 'introspect']
+         self.mconf_command = meson_command + ['configure']
--        self.mtest_command = [sys.executable, os.path.join(src_root, 'meson.py'), 'test', '-C', self.builddir]
-+        self.mconf_command = [sys.executable, '/usr/bin/meson', 'configure']
-+        self.mintro_command = [sys.executable, '/usr/bin/meson', 'introspect']
-+        self.mtest_command = [sys.executable, '/usr/bin/meson', 'test', '-C', self.builddir]
-         # Backend-specific build commands
-         self.build_command, self.clean_command, self.test_command, self.install_command, \
-             self.uninstall_command = get_backend_commands(self.backend)

meson-testsuite.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Feb  5 15:06:54 UTC 2018 - dimstar@opensuse.org
+
+- Update to version 0.44.0:
+  + New features:
+    - Added warning function.
+    - Adds support for additional Qt5-Module keyword
+      moc_extra_arguments.
+    - Prefix-dependent defaults for sysconfdir, localstatedir and
+      sharedstatedir.
+    - An array type for user options.
+    - LLVM dependency supports both dynamic and static linking.
+    - Added if_found to subdir.
+    - get_unquoted() method for the configuration data object.
+    - Added disabler object.
+    - Config-Tool based dependencies gained a method to get
+      arbitrary options.
+    - Embedded Python in Windows MSI packages.
+- Rebase meson-suse-ify-macros.patch, meson-fix-gcc48.patch and
+  meson-test-installed-bin.patch.
+- Testsuite changes:
+  + Disable tests for static llvm: we don't ship the static libs.
+  + Add cmake(Qt5LinguistTools), libwmf-devel BuildRequires and
+    zlib-devel-static: new dependencies for various tests.
+
 -------------------------------------------------------------------
 Wed Nov 22 17:47:29 UTC 2017 - sor.alexei@meowr.ru
 

meson-testsuite.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package meson-testsuite
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
 %endif
 %define _name   mesonbuild
 Name:           meson%{name_ext}
-Version:        0.43.0
+Version:        0.44.0
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -56,8 +56,9 @@ BuildRequires:  googletest-devel
 BuildRequires:  gtk-doc
 BuildRequires:  itstool
 BuildRequires:  libpcap-devel
+BuildRequires:  libwmf-devel
 BuildRequires:  llvm-devel
-BuildRequires:  meson >= %{version}
+BuildRequires:  meson = %{version}
 BuildRequires:  ncurses-devel
 BuildRequires:  ninja
 BuildRequires:  openmpi-devel
@@ -67,8 +68,10 @@ BuildRequires:  python3-gobject
 BuildRequires:  python3-setuptools
 BuildRequires:  vala
 BuildRequires:  vulkan-devel
+BuildRequires:  zlib-devel-static
 BuildRequires:  cmake(Qt5Core)
 BuildRequires:  cmake(Qt5Gui)
+BuildRequires:  cmake(Qt5LinguistTools)
 BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
@@ -125,6 +128,9 @@ This package provides support for meson.build files in Vim.
 # 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
 
+# Disable test of llvm-static libs: openSUSE does not package/ship them
+sed -i "s/foreach static : \[true, false\]/foreach static : \[false\]/" test\ cases/frameworks/15\ llvm/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"
@@ -138,7 +144,9 @@ sed -i '1{/\/usr\/bin\/env/d;}' ./mesonbuild/rewriter.py
 python3 setup.py build
 %else
 # When running the test suite, we want to be sure to use the installed meson version
-rm -rf meson.py mesonbuild
+# For now, the only supported test suite is against the source directory, https://github.com/mesonbuild/meson/issues/3015
+# and there is so much weird code now in mesonlibs, that patching it to not require it became a nightmare - let's do what upstream wants for now
+echo "Prefereably we would do 'rm -rf meson.py mesonbuild' here, but we can't"
 %endif
 
 %install
@@ -150,11 +158,11 @@ python3 setup.py install \
 install -Dpm 0644 data/macros.meson \
   %{buildroot}%{_rpmconfigdir}/macros.d/macros.meson
 
-install -Dpm 0644 syntax-highlighting/vim/ftdetect/meson.vim \
+install -Dpm 0644 data/syntax-highlighting/vim/ftdetect/meson.vim \
   -t %{buildroot}%{vim_data_dir}/site/ftdetect
-install -Dpm 0644 syntax-highlighting/vim/indent/meson.vim \
+install -Dpm 0644 data/syntax-highlighting/vim/indent/meson.vim \
   -t %{buildroot}%{vim_data_dir}/site/indent
-install -Dpm 0644 syntax-highlighting/vim/syntax/meson.vim \
+install -Dpm 0644 data/syntax-highlighting/vim/syntax/meson.vim \
   -t %{buildroot}%{vim_data_dir}/site/syntax
 %endif
 
@@ -187,7 +195,7 @@ python3 run_tests.py
 
 %if !%{testsuite}
 %files vim
-%doc syntax-highlighting/vim/README
+%doc data/syntax-highlighting/vim/README
 %dir %{vim_data_dir}
 %dir %{vim_data_dir}/site
 %dir %{vim_data_dir}/site/ftdetect

meson.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Feb  5 15:06:54 UTC 2018 - dimstar@opensuse.org
+
+- Update to version 0.44.0:
+  + New features:
+    - Added warning function.
+    - Adds support for additional Qt5-Module keyword
+      moc_extra_arguments.
+    - Prefix-dependent defaults for sysconfdir, localstatedir and
+      sharedstatedir.
+    - An array type for user options.
+    - LLVM dependency supports both dynamic and static linking.
+    - Added if_found to subdir.
+    - get_unquoted() method for the configuration data object.
+    - Added disabler object.
+    - Config-Tool based dependencies gained a method to get
+      arbitrary options.
+    - Embedded Python in Windows MSI packages.
+- Rebase meson-suse-ify-macros.patch, meson-fix-gcc48.patch and
+  meson-test-installed-bin.patch.
+- Testsuite changes:
+  + Disable tests for static llvm: we don't ship the static libs.
+  + Add cmake(Qt5LinguistTools), libwmf-devel BuildRequires and
+    zlib-devel-static: new dependencies for various tests.
+
 -------------------------------------------------------------------
 Wed Nov 22 17:47:29 UTC 2017 - sor.alexei@meowr.ru
 

meson.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package meson-testsuite
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
 %endif
 %define _name   mesonbuild
 Name:           meson%{name_ext}
-Version:        0.43.0
+Version:        0.44.0
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -56,8 +56,9 @@ BuildRequires:  googletest-devel
 BuildRequires:  gtk-doc
 BuildRequires:  itstool
 BuildRequires:  libpcap-devel
+BuildRequires:  libwmf-devel
 BuildRequires:  llvm-devel
-BuildRequires:  meson >= %{version}
+BuildRequires:  meson = %{version}
 BuildRequires:  ncurses-devel
 BuildRequires:  ninja
 BuildRequires:  openmpi-devel
@@ -67,8 +68,10 @@ BuildRequires:  python3-gobject
 BuildRequires:  python3-setuptools
 BuildRequires:  vala
 BuildRequires:  vulkan-devel
+BuildRequires:  zlib-devel-static
 BuildRequires:  cmake(Qt5Core)
 BuildRequires:  cmake(Qt5Gui)
+BuildRequires:  cmake(Qt5LinguistTools)
 BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
@@ -125,6 +128,9 @@ This package provides support for meson.build files in Vim.
 # 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
 
+# Disable test of llvm-static libs: openSUSE does not package/ship them
+sed -i "s/foreach static : \[true, false\]/foreach static : \[false\]/" test\ cases/frameworks/15\ llvm/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"
@@ -138,7 +144,9 @@ sed -i '1{/\/usr\/bin\/env/d;}' ./mesonbuild/rewriter.py
 python3 setup.py build
 %else
 # When running the test suite, we want to be sure to use the installed meson version
-rm -rf meson.py mesonbuild
+# For now, the only supported test suite is against the source directory, https://github.com/mesonbuild/meson/issues/3015
+# and there is so much weird code now in mesonlibs, that patching it to not require it became a nightmare - let's do what upstream wants for now
+echo "Prefereably we would do 'rm -rf meson.py mesonbuild' here, but we can't"
 %endif
 
 %install
@@ -150,11 +158,11 @@ python3 setup.py install \
 install -Dpm 0644 data/macros.meson \
   %{buildroot}%{_rpmconfigdir}/macros.d/macros.meson
 
-install -Dpm 0644 syntax-highlighting/vim/ftdetect/meson.vim \
+install -Dpm 0644 data/syntax-highlighting/vim/ftdetect/meson.vim \
   -t %{buildroot}%{vim_data_dir}/site/ftdetect
-install -Dpm 0644 syntax-highlighting/vim/indent/meson.vim \
+install -Dpm 0644 data/syntax-highlighting/vim/indent/meson.vim \
   -t %{buildroot}%{vim_data_dir}/site/indent
-install -Dpm 0644 syntax-highlighting/vim/syntax/meson.vim \
+install -Dpm 0644 data/syntax-highlighting/vim/syntax/meson.vim \
   -t %{buildroot}%{vim_data_dir}/site/syntax
 %endif
 
@@ -187,7 +195,7 @@ python3 run_tests.py
 
 %if !%{testsuite}
 %files vim
-%doc syntax-highlighting/vim/README
+%doc data/syntax-highlighting/vim/README
 %dir %{vim_data_dir}
 %dir %{vim_data_dir}/site
 %dir %{vim_data_dir}/site/ftdetect