From f93767cfb244b87271c823761d5ea0f838227f5e Mon Sep 17 00:00:00 2001
From: Tristan Partin <tristan@partin.io>
Date: Fri, 28 Jul 2023 14:00:04 -0500
Subject: [PATCH] meson: use variables for gio-2.0, glib-2.0, and gio-unix-2.0

---
 contrib/eggbitset/meson.build            | 2 +-
 contrib/linereader/meson.build           | 2 +-
 meson.build                              | 2 ++
 src/libsysprof-capture/tests/meson.build | 2 +-
 src/libsysprof/meson.build               | 6 ++----
 src/sysprofd/meson.build                 | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/contrib/eggbitset/meson.build b/contrib/eggbitset/meson.build
index 0b5fd036..82cd8a40 100644
--- a/contrib/eggbitset/meson.build
+++ b/contrib/eggbitset/meson.build
@@ -3,7 +3,7 @@ libeggbitset_sources = [
 ]
 
 libeggbitset_deps = [
-  dependency('gio-2.0', version: glib_req_version),
+  gio_dep,
 ]
 
 libeggbitset_static = static_library('eggbitset', libeggbitset_sources,
diff --git a/contrib/linereader/meson.build b/contrib/linereader/meson.build
index 9055b71e..ef78c3ae 100644
--- a/contrib/linereader/meson.build
+++ b/contrib/linereader/meson.build
@@ -1,5 +1,5 @@
 liblinereader_deps = [
-  dependency('gio-2.0', version: glib_req_version),
+  gio_dep,
 ]
 
 liblinereader_static_dep = declare_dependency(
diff --git a/meson.build b/meson.build
index 2e4c4a48..44397b12 100644
--- a/meson.build
+++ b/meson.build
@@ -60,6 +60,8 @@ cc = meson.get_compiler('c')
 cxx = meson.get_compiler('cpp')
 
 glib_dep = dependency('glib-2.0', version: glib_req_version, required: need_glib)
+gio_dep = dependency('gio-2.0', version: glib_req_version, required: need_glib)
+gio_unix_dep = dependency('gio-unix-2.0', version: glib_req_version, required: host_machine.system() != 'windows')
 gtk_dep = dependency('gtk4', version: gtk_req_version, required: need_gtk)
 libsystemd_dep = dependency('libsystemd', required: false)
 
diff --git a/src/libsysprof-capture/tests/meson.build b/src/libsysprof-capture/tests/meson.build
index d5d7ddb0..db0a3681 100644
--- a/src/libsysprof-capture/tests/meson.build
+++ b/src/libsysprof-capture/tests/meson.build
@@ -25,7 +25,7 @@ libsysprof_capture_testsuite = {
 }
 
 libsysprof_capture_testsuite_deps = [
-  dependency('gio-2.0'),
+  gio_dep,
   libsysprof_capture_dep,
 ]
 
diff --git a/src/libsysprof/meson.build b/src/libsysprof/meson.build
index 7d221ff9..1c3ed34a 100644
--- a/src/libsysprof/meson.build
+++ b/src/libsysprof/meson.build
@@ -171,10 +171,8 @@ libsysprof_resources = gnome.compile_resources('libsysprof-resources', 'libsyspr
 )
 
 libsysprof_deps = [
-  dependency('gio-2.0', version: glib_req_version),
-  dependency('gio-unix-2.0',
-     version: glib_req_version,
-    required: host_machine.system() != 'windows'),
+  gio_dep,
+  gio_unix_dep,
   dependency('libdex-1', version: dex_req_version),
   dependency('json-glib-1.0'),
 
diff --git a/src/sysprofd/meson.build b/src/sysprofd/meson.build
index 456d7a9a..254c4d6c 100644
--- a/src/sysprofd/meson.build
+++ b/src/sysprofd/meson.build
@@ -23,9 +23,9 @@ sysprofd_sources = [
 pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
 
 sysprofd_deps = [
-  dependency('glib-2.0', version: glib_req_version),
-  dependency('gio-2.0', version: glib_req_version),
-  dependency('gio-unix-2.0', version: glib_req_version),
+  glib_dep,
+  gio_dep,
+  gio_unix_dep,
   polkit_dep,
 
   libsysprof_capture_dep,