From 50cb68d1606c21c0b3a3a766619462cfa716d1dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
Date: Fri, 17 Jan 2025 10:57:22 +0100
Subject: [PATCH] meson-build: Use relative path in gtk-doc
So meson searches for source files in the right place by itself (source
directory or build directory). meson.project_source_root() prevents it
from doing so, while meson.current_source_dir() is simply useless.
Fixes: #30
Related: https://gitlab.xfce.org/xfce/xfce4-dev-tools/-/merge_requests/140#note_100394
---
docs/reference/meson.build | 4 ++--
meson.build | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 6119733..d585772 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -26,11 +26,11 @@ if get_option('gtk-doc')
gnome.gtkdoc(
libxfce4util_doc_name,
- src_dir: meson.project_source_root() / 'libxfce4util',
+ src_dir: 'libxfce4util',
ignore_headers: libxfce4util_doc_private_headers,
main_xml: 'libxfce4util-docs.xml',
dependencies: libxfce4util_dep,
- gobject_typesfile: meson.current_source_dir() / 'libxfce4util.types',
+ gobject_typesfile: 'libxfce4util.types',
fixxref_args: libxfce4util_doc_fixxref_args,
install: true,
check: false,
diff --git a/meson.build b/meson.build
index b72ebcb..199814b 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
'c',
version : '4.20.0-dev',
license : 'GPL-2',
- meson_version : '>= 0.56.0',
+ meson_version : '>= 0.54.0',
default_options : ['c_std=gnu11', 'buildtype=debugoptimized', 'warning_level=2', 'b_ndebug=if-release']
)
libxfce4util_soversion = '7.0.0'
--
GitLab