PolicyKit: Branch 'master'

[GitLab Mirror]

 docs/meson.build        |    6 ------
 docs/polkit/meson.build |    8 +++++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c83b2f61933d346df60269b2884414454d7b78a4
Author: mikhailnov <mikhailnov at dumalogiya.ru>
Date:   Fri Sep 9 14:29:28 2022 +0000

    docs: fix building with meson 0.61.1

diff --git a/docs/meson.build b/docs/meson.build
index d4a0548..0d78099 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -19,11 +19,5 @@ if enable_gtk_doc
     configuration: {'VERSION': pk_version},
   )
 
-  html_images = files(
-    'polkit-architecture.png',
-    'polkit-authentication-agent-example.png',
-    'polkit-authentication-agent-example-wheel.png',
-  )
-
   subdir('polkit')
 endif
diff --git a/docs/polkit/meson.build b/docs/polkit/meson.build
index 297a261..7c5f5a0 100644
--- a/docs/polkit/meson.build
+++ b/docs/polkit/meson.build
@@ -15,6 +15,12 @@ content_files += files(
   'docbook-interface-org.freedesktop.PolicyKit1.Authority.xml',
 )
 
+html_images = [
+  '../polkit-architecture.png',
+  '../polkit-authentication-agent-example.png',
+  '../polkit-authentication-agent-example-wheel.png',
+]
+
 gnome.gtkdoc(
   doc_module,
   main_xml: doc_module + '-docs.xml',
@@ -24,7 +30,7 @@ gnome.gtkdoc(
   namespace: meson.project_name(),
   html_assets: html_images,
   fixxref_args: '--html-dir=' + pk_api_docpath,
-  gobject_typesfile: files(doc_module + '.types'),
+  gobject_typesfile: doc_module + '.types',
   content_files: content_files,
   install: true,
 )