commit 0695d51df791a8a5e9782952bdb82ef89f28f9f3
Author: Jakub Bogusz <[email protected]>
Date: Thu Mar 3 19:00:21 2022 +0100
- updated to 0.61.2
- updated gtkdocdir patch
meson-gtkdocdir.patch | 21 ++++++++++-----------
meson.spec | 6 +++---
2 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/meson.spec b/meson.spec
index d54824c..3175d5b 100644
--- a/meson.spec
+++ b/meson.spec
@@ -1,15 +1,15 @@
Summary: High productivity build system
Summary(pl.UTF-8): System budowania o dużej produktywności
Name: meson
-Version: 0.60.3
+Version: 0.61.2
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: 03ddd7272d8cbb9f33269cb37a200d24
+# Source0-md5: 7c4220066c70057b4c5a997a47ac710c
Patch0: %{name}-gtkdocdir.patch
-URL: http://mesonbuild.com/
+URL: https://mesonbuild.com/
BuildRequires: ninja >= 1.8.2
BuildRequires: python3 >= 1:3.6
BuildRequires: python3-modules >= 1:3.6
diff --git a/meson-gtkdocdir.patch b/meson-gtkdocdir.patch
index 2377436..f96aecd 100644
--- a/meson-gtkdocdir.patch
+++ b/meson-gtkdocdir.patch
@@ -1,15 +1,14 @@
-diff -urN meson-0.46.1/mesonbuild/modules/gnome.py
meson-0.46.1.new/mesonbuild/modules/gnome.py
---- meson-0.46.1/mesonbuild/modules/gnome.py 2018-05-16 18:23:56.000000000
+0200
-+++ meson-0.46.1.new/mesonbuild/modules/gnome.py 2018-06-19
22:19:00.491036568 +0200
-@@ -854,7 +854,7 @@
- modulename = args[0]
- if not isinstance(modulename, str):
- raise MesonException('Argument must be a string')
-- return os.path.join('share/gtk-doc/html', modulename)
-+ return os.path.join('share/doc/gtk-doc/html', modulename)
+--- meson-0.61.2/mesonbuild/modules/gnome.py.orig 2022-03-02
21:17:14.811136886 +0100
++++ meson-0.61.2/mesonbuild/modules/gnome.py 2022-03-02 21:17:50.327611143
+0100
+@@ -1444,7 +1444,7 @@ class GnomeModule(ExtensionModule):
+ @noKwargs
+ @typed_pos_args('gnome.gtkdoc_html_dir', str)
+ def gtkdoc_html_dir(self, state: 'ModuleState', args: T.Tuple[str],
kwargs: 'TYPE_kwargs') -> str:
+- return os.path.join('share/gtk-doc/html', args[0])
++ return os.path.join('share/doc/gtk-doc/html', args[0])
- @staticmethod
- def _unpack_args(arg, kwarg_name, kwargs, expend_file_state=None):
+ @typed_pos_args('gnome.gdbus_codegen', str, optargs=[(str,
mesonlib.File)])
+ @typed_kwargs(
diff -urN meson-0.46.1/mesonbuild/scripts/gtkdochelper.py
meson-0.46.1.new/mesonbuild/scripts/gtkdochelper.py
--- meson-0.46.1/mesonbuild/scripts/gtkdochelper.py 2018-05-16
18:23:56.000000000 +0200
+++ meson-0.46.1.new/mesonbuild/scripts/gtkdochelper.py 2018-06-19
22:18:27.554479460 +0200
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/meson.git/commitdiff/0695d51df791a8a5e9782952bdb82ef89f28f9f3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
