From fa8d42de2e41b64801b1e04585b3890d0af4523f Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse@gmail.com>
Date: Thu, 9 Nov 2017 20:35:45 -0500
Subject: [PATCH] Meson: Fix build of gtkdoc

This requires change added in Meson 0.44.0

https://bugzilla.gnome.org/show_bug.cgi?id=786796
---
 docs/reference/gio/meson.build     | 3 +++
 docs/reference/gobject/meson.build | 3 +++
 meson.build                        | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
index e6b1386f6..8e3a24d2d 100644
--- a/docs/reference/gio/meson.build
+++ b/docs/reference/gio/meson.build
@@ -52,9 +52,12 @@ if get_option('with-docs') != 'no'
     'gnetworkmonitorbase.h',
     'gnetworkmonitornetlink.h',
     'gnetworkmonitornm.h',
+    'gnetworkmonitorportal.h',
     'gnotificationbackend.h',
     'gnotification-private.h',
+    'gosxappinfo.h',
     'gpollfilemonitor.h',
+    'gproxyresolverportal.h',
     'gregistrysettingsbackend.h',
     'gresourcefile.h',
     'gsettingsbackendinternal.h',
diff --git a/docs/reference/gobject/meson.build b/docs/reference/gobject/meson.build
index 5a7aa4754..ea998fa8a 100644
--- a/docs/reference/gobject/meson.build
+++ b/docs/reference/gobject/meson.build
@@ -72,12 +72,15 @@ if get_option('with-docs') != 'no'
     configuration: version_conf
   )
 
+  gtkdocincl = include_directories('.')
+
   gnome.gtkdoc('gobject',
     main_xml : 'gobject-docs.xml',
     namespace : 'g',
     gobject_typesfile : join_paths(meson.current_source_dir(), 'gobject.types'),
     mode : 'none',
     dependencies : [libgobject_dep, libglib_dep],
+    include_directories : [gtkdocincl],
     src_dir : 'gobject',
     scan_args : [
       '--deprecated-guards=G_DISABLE_DEPRECATED',
diff --git a/meson.build b/meson.build
index b7755d69a..83ebeb4af 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('glib', 'c', 'cpp',
   version : '2.55.0',
-  meson_version : '>= 0.38.1',
+  meson_version : '>= 0.44.0',
   default_options : [
     'warning_level=1',
     'c_std=gnu89'