[packages/meson] up to 0.59.0

atler atler at pld-linux.org
Tue Jul 20 10:46:41 CEST 2021


commit dccbdbcdb8812f51aaed4518182a562497cd6916
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Jul 20 10:43:38 2021 +0200

    up to 0.59.0
    
    - cmake deps issue fixed upstream

 meson-cmake_deps.patch | 11 -----------
 meson-gtkdocdir.patch  |  4 ++--
 meson.spec             | 22 ++++++++++------------
 3 files changed, 12 insertions(+), 25 deletions(-)
---
diff --git a/meson.spec b/meson.spec
index a9612bc..0b144f5 100644
--- a/meson.spec
+++ b/meson.spec
@@ -1,28 +1,27 @@
 Summary:	High productivity build system
 Summary(pl.UTF-8):	System budowania o dużej produktywności
 Name:		meson
-Version:	0.57.1
-Release:	2
+Version:	0.59.0
+Release:	1
 License:	Apache v2.0
 Group:		Development/Tools
 #Source0Download: https://github.com/mesonbuild/meson/releases/
 Source0:	https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	fbd744560351491892478a36a1586815
+# Source0-md5:	bb8bf3898afefc8272989e4be8ff0a5b
 Patch0:		%{name}-gtkdocdir.patch
-Patch1:		%{name}-cmake_deps.patch
 URL:		http://mesonbuild.com/
-BuildRequires:	ninja >= 1.7
-BuildRequires:	python3 >= 1:3.5.2
-BuildRequires:	python3-modules >= 1:3.5.2
+BuildRequires:	ninja >= 1.8.2
+BuildRequires:	python3 >= 1:3.6
+BuildRequires:	python3-modules >= 1:3.6
 BuildRequires:	python3-setuptools
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.714
 BuildRequires:	sed >= 4.0
-Requires:	python3-devel-tools >= 1:3.5.2
-Requires:	python3-libs >= 1:3.5.2
-Requires:	python3-modules >= 1:3.5.2
+Requires:	python3-devel-tools >= 1:3.6
+Requires:	python3-libs >= 1:3.6
+Requires:	python3-modules >= 1:3.6
 Requires:	python3-setuptools
-Conflicts:	ninja < 1.7
+Conflicts:	ninja < 1.8.2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,7 +54,6 @@ Mesona.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
 	meson.py
diff --git a/meson-cmake_deps.patch b/meson-cmake_deps.patch
deleted file mode 100644
index 7fb77fc..0000000
--- a/meson-cmake_deps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson-0.56.2/mesonbuild/cmake/toolchain.py.orig	2021-01-06 11:39:48.000000000 +0100
-+++ meson-0.56.2/mesonbuild/cmake/toolchain.py	2021-02-03 18:01:01.872590064 +0100
-@@ -191,7 +191,7 @@
-             defaults[prefix + 'COMPILER_ID']      = [comp_id]
-             defaults[prefix + 'COMPILER_VERSION'] = [comp_version]
-             #defaults[prefix + 'COMPILER_LOADED']  = ['1']
--            defaults[prefix + 'COMPILER_FORCED']  = ['1']
-+            #defaults[prefix + 'COMPILER_FORCED']  = ['1']
-             defaults[prefix + 'COMPILER_WORKS']   = ['TRUE']
-             #defaults[prefix + 'ABI_COMPILED']     = ['TRUE']
- 
diff --git a/meson-gtkdocdir.patch b/meson-gtkdocdir.patch
index f103392..2377436 100644
--- a/meson-gtkdocdir.patch
+++ b/meson-gtkdocdir.patch
@@ -5,8 +5,8 @@ diff -urN meson-0.46.1/mesonbuild/modules/gnome.py meson-0.46.1.new/mesonbuild/m
          modulename = args[0]
          if not isinstance(modulename, str):
              raise MesonException('Argument must be a string')
--        return ModuleReturnValue(os.path.join('share/gtk-doc/html', modulename), [])
-+        return ModuleReturnValue(os.path.join('share/doc/gtk-doc/html', modulename), [])
+-        return os.path.join('share/gtk-doc/html', modulename)
++        return os.path.join('share/doc/gtk-doc/html', modulename)
  
      @staticmethod
      def _unpack_args(arg, kwarg_name, kwargs, expend_file_state=None):
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/meson.git/commitdiff/dccbdbcdb8812f51aaed4518182a562497cd6916



More information about the pld-cvs-commit mailing list