From 0b776bc20cfdbb529a97a7f8f8a4d88ddbef9329 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaessens@netflix.com>
Date: Wed, 13 Nov 2024 11:07:12 -0500
Subject: [PATCH] meson: Add variables to -uninstalled.pc files

This allows building a glib project within glib's devenv. Otherwise
Meson won't find glib tools.
---
 gio/meson.build  | 10 ++++++++++
 glib/meson.build |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/gio/meson.build b/gio/meson.build
index a56c210a0..04d8f5918 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -915,6 +915,16 @@ pkg.generate(libgio,
     'gresource=' + '${bindir}' / 'gresource',
     'gsettings=' + '${bindir}' / 'gsettings',
   ],
+  uninstalled_variables : [
+    'gio=${prefix}/gio/gio',
+    'gio_querymodules=${prefix}/gio/gio-querymodules',
+    'glib_compile_schemas=${prefix}/gio/glib-compile-schemas',
+    'glib_compile_resources=${prefix}/gio/glib-compile-resources',
+    'gdbus=${prefix}/gio/gdbus',
+    'gdbus_codegen=${prefix}/gio/gdbus-2.0/codegen/gdbus-codegen',
+    'gresource=${prefix}/gio/gresource',
+    'gsettings=${prefix}/gio/gsettings',
+  ],
   version : glib_version,
   install_dir : glib_pkgconfigreldir,
   filebase : 'gio-2.0',
diff --git a/glib/meson.build b/glib/meson.build
index 5fd77590a..2522356ee 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -450,6 +450,12 @@ pkg.generate(libglib,
       valgrind_suppression_file_install_subdir /
       fs.name(valgrind_suppression_file),
   ],
+  uninstalled_variables : [
+    'glib_genmarshal=${prefix}/gobject/glib-genmarshal',
+    'gobject_query=${prefix}/gobject/gobject-query',
+    'glib_mkenums=${prefix}/gobject/glib-mkenums',
+    'glib_valgrind_suppressions=' + valgrind_suppression_file.full_path(),
+  ],
   version : glib_version,
   install_dir : glib_pkgconfigreldir,
   filebase : 'glib-2.0',