1From ff3db531608eb0f9de8a88c1bc34fe0f1d93121c Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Fri, 12 Nov 2021 18:01:05 +0100
4Subject: [PATCH] meson.build: add girdir to gio-2.0.pc and glib-2.0.pc
5
6Add girdir to gio-2.0.pc and glib-2.0.pc to fix the following build
7failure with atk or libnice:
8
9/home/giuliobenetti/autobuild/run/instance-1/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler atk/Atk-1.0.gir --output atk/Atk-1.0.typelib --includedir=/usr/share/gir-1.0
10Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir
11
12Fixes:
13 - http://autobuild.buildroot.org/results/2716929db638977e6bf665352a08bd580e1dd0ae
14 - http://autobuild.buildroot.org/results/3088ef32b03e0bb984291b1227b187f1ff816eb7
15
16Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
17---
18 gio/meson.build  | 1 +
19 glib/meson.build | 1 +
20 2 files changed, 2 insertions(+)
21
22diff --git a/gio/meson.build b/gio/meson.build
23index 29473d26b..112d4ada9 100644
24--- a/gio/meson.build
25+++ b/gio/meson.build
26@@ -831,6 +831,7 @@ pkg.generate(libgio,
27   variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
28                'schemasdir=' + join_paths('${datadir}', schemas_subdir),
29                'bindir=' + join_paths('${prefix}', get_option('bindir')),
30+               'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
31                'giomoduledir=' + pkgconfig_giomodulesdir,
32                'gio=' + join_paths('${bindir}', 'gio'),
33                'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
34diff --git a/glib/meson.build b/glib/meson.build
35index f78f32969..6c5486699 100644
36--- a/glib/meson.build
37+++ b/glib/meson.build
38@@ -377,6 +377,7 @@ pkg.generate(libglib,
39   subdirs : ['glib-2.0'],
40   extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
41   variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
42+               'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
43                'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'),
44                'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
45                'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
46--
472.33.0
48
49