From cba0c75414689d9655cbc2d3c195f76bb864ef32 Mon Sep 17 00:00:00 2001 From: Marcin Banasiak Date: Tue, 19 Jun 2018 22:24:36 +0200 Subject: [PATCH] Fix gtkdocdir path in gnome module as well. Release 5 --- meson-gtkdocdir.patch | 19 ++++++++++++++++--- meson.spec | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/meson-gtkdocdir.patch b/meson-gtkdocdir.patch index 70c56bb..f103392 100644 --- a/meson-gtkdocdir.patch +++ b/meson-gtkdocdir.patch @@ -1,6 +1,19 @@ ---- meson-0.42.1/mesonbuild/scripts/gtkdochelper.py.pathfix 2017-09-12 21:21:54.832059192 +0200 -+++ meson-0.42.1/mesonbuild/scripts/gtkdochelper.py 2017-09-12 21:22:03.258725859 +0200 -@@ -226,7 +226,7 @@ def run(args): +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 ModuleReturnValue(os.path.join('share/gtk-doc/html', modulename), []) ++ return ModuleReturnValue(os.path.join('share/doc/gtk-doc/html', modulename), []) + + @staticmethod + def _unpack_args(arg, kwarg_name, kwargs, expend_file_state=None): +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 +@@ -244,7 +244,7 @@ install_gtkdoc(options.builddir, options.subdir, install_prefix, diff --git a/meson.spec b/meson.spec index 0b3749b..a110efe 100644 --- a/meson.spec +++ b/meson.spec @@ -2,7 +2,7 @@ Summary: High productivity build system Summary(pl.UTF-8): System budowania o dużej produktywności Name: meson Version: 0.46.1 -Release: 4 +Release: 5 License: Apache v2.0 Group: Development/Tools #Source0Download: https://github.com/mesonbuild/meson/releases/ -- 2.44.0