From 7e0209f9052b5fe3c83c2cd1ab2a1f38567b0184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 16 Jan 2024 13:30:36 +0100
Subject: [PATCH] build: Make g-ir-scanner warnings fatal when werror is set

This should help catching problems with introspection in CI.

Adapted from Sebastian Wick's corresponding mutter change
in https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3528.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3121>
---
 src/meson.build                  | 11 ++++++++---
 src/st/meson.build               |  4 +---
 subprojects/shew/src/meson.build |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index 748d855a3..422a68d8d 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -3,6 +3,13 @@ src_builddir = meson.current_build_dir()
 service_data = configuration_data()
 service_data.set('libexecdir', libexecdir)
 
+introspection_common = {
+  'install_dir_gir': pkgdatadir,
+  'install_dir_typelib': pkglibdir,
+  'install': true,
+  'fatal_warnings': get_option('werror'),
+}
+
 subdir('calendar-server')
 subdir('hotplug-sniffer')
 subdir('st')
@@ -237,9 +244,7 @@ libshell_gir = gnome.generate_gir(libshell,
   namespace: 'Shell',
   includes: libshell_gir_includes,
   extra_args: ['--quiet'],
-  install_dir_gir: pkgdatadir,
-  install_dir_typelib: pkglibdir,
-  install: true
+  kwargs: introspection_common,
 )
 
 executable('gnome-shell', 'main.c',
diff --git a/src/st/meson.build b/src/st/meson.build
index c66a43281..8161a6b2b 100644
--- a/src/st/meson.build
+++ b/src/st/meson.build
@@ -221,7 +221,5 @@ libst_gir = gnome.generate_gir(libst,
   dependencies: [mutter_dep, gdk_pixbuf_dep],
   include_directories: include_directories('..'),
   extra_args: ['-DST_COMPILATION', '--quiet'],
-  install_dir_gir: pkgdatadir,
-  install_dir_typelib: pkglibdir,
-  install: true
+  kwargs: introspection_common,
 )
diff --git a/subprojects/shew/src/meson.build b/subprojects/shew/src/meson.build
index e590a4612..22d9735b2 100644
--- a/subprojects/shew/src/meson.build
+++ b/subprojects/shew/src/meson.build
@@ -23,6 +23,7 @@ libshew_gir = gnome.generate_gir(libshew,
   namespace: 'Shew',
   includes: ['Gdk-4.0', 'Gtk-4.0'],
   extra_args: ['--quiet'],
+  fatal_warnings: get_option('werror'),
   install_dir_gir: girdir,
   install_dir_typelib: typelibdir,
   install: true,