1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
From 4e6be5d15e5d2f8e494d22a3d49b623064f9c1a5 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Tue, 23 Apr 2024 11:24:34 +0200
Subject: [PATCH] girepository/introspection: correctly install .gir files into
custom locations provided via meson option
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4020]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
girepository/introspection/meson.build | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/girepository/introspection/meson.build b/girepository/introspection/meson.build
index 9405686..862ca61 100644
--- a/girepository/introspection/meson.build
+++ b/girepository/introspection/meson.build
@@ -49,6 +49,7 @@ glib_gir = gnome.generate_gir(libglib,
export_packages: 'glib-2.0',
header: 'glib.h',
install: true,
+ install_dir_gir: glib_girdir,
dependencies: [
libgobject_dep,
],
@@ -76,6 +77,7 @@ if host_system == 'windows'
header: 'glib.h',
includes: [ glib_gir[0] ],
install: true,
+ install_dir_gir: glib_girdir,
dependencies: [
libgobject_dep,
],
@@ -104,6 +106,7 @@ else
header: 'glib.h',
includes: [ glib_gir[0] ],
install: true,
+ install_dir_gir: glib_girdir,
dependencies: [
libgobject_dep,
],
@@ -137,6 +140,7 @@ gobject_gir = gnome.generate_gir(libgobject,
header: 'glib-object.h',
includes: [ glib_gir[0] ],
install: true,
+ install_dir_gir: glib_girdir,
env: gi_gen_env_variables,
extra_args: gir_args + [
'-DGOBJECT_COMPILATION',
@@ -162,6 +166,7 @@ gmodule_gir = gnome.generate_gir(libgmodule,
header: 'gmodule.h',
includes: [ glib_gir[0] ],
install: true,
+ install_dir_gir: glib_girdir,
dependencies: [
libglib_dep,
],
@@ -224,6 +229,7 @@ gio_gir = gnome.generate_gir(libgio,
header: 'gio/gio.h',
includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0] ],
install: true,
+ install_dir_gir: glib_girdir,
dependencies: [
libglib_dep,
libgobject_dep,
@@ -249,6 +255,7 @@ if host_system == 'windows'
header: 'gio/gio.h',
includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ],
install: true,
+ install_dir_gir: glib_girdir,
dependencies: [
libglib_dep,
libgobject_dep,
@@ -277,6 +284,7 @@ else
header: 'gio/gio.h',
includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ],
install: true,
+ install_dir_gir: glib_girdir,
dependencies: [
libglib_dep,
libgobject_dep,
@@ -314,6 +322,7 @@ girepository_gir = gnome.generate_gir(libgirepository,
header: 'girepository/girepository.h',
includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ],
install: true,
+ install_dir_gir: glib_girdir,
dependencies: [ libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep ],
extra_args: gir_args + libgirepository_gir_args,
)
|
