From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 18 Sep 2022 18:48:21 +0000 (+0200)
Subject: build: fix gi-docgen detection in cross builds
X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~20^2~1^2~46^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=98796d4513f04cb2f4dbe55fa55af4504b1ac610;p=gtk4.git

build: fix gi-docgen detection in cross builds

gi-docgen is supposed to be ran natively on the build machine, without
native: true dependency() searches for gi-docgen on the host system.
When it doesn't find it, it falls back to a subproject even if gi-docgen
is available on the build machine.

also make gtk_doc require introspection
---

diff --git a/meson.build b/meson.build
index f45da9dce3..a4e69be6d1 100644
--- a/meson.build
+++ b/meson.build
@@ -443,7 +443,8 @@ iso_codes_dep  = dependency('iso-codes', required: false)
 
 gidocgen_dep    = dependency('gi-docgen', version: '>= 2021.1',
                              fallback: ['gi-docgen', 'dummy_dep'],
-                             required: get_option('gtk_doc'))
+                             required: get_option('gtk_doc') and get_option('introspection').enabled(),
+                             native: true)
 gi_dep         = dependency('gobject-introspection-1.0', version: introspection_req,
                             required: get_option('introspection').enabled() and
                                       get_option('build-tests'))