From 837b37170a530310a7bc7f29540692962529a4e1 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Wed, 19 Jun 2024 12:11:17 +0200
Subject: [PATCH] build: Add gvdb dependency

This library is not shipped standalone and is meant to be used
through subprojects. Add a Meson wrap file for it.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3825>
---
 .gitlab-ci.yml        | 5 ++++-
 meson.build           | 1 +
 src/meson.build       | 1 +
 src/tests/meson.build | 1 +
 subprojects/gvdb.wrap | 8 ++++++++
 5 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 subprojects/gvdb.wrap

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99911e1be..c5eb92ac9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -530,9 +530,11 @@ build-wayland-only@x86_64:
     - pushd build
     - gcovr --root=..
         --filter='\.\./src/'
+        --filter='\.\./subprojects/'
         --filter='\.\./clutter/'
         --filter='\.\./cogl/'
         --filter='\.\./mtk/'
+        --gcov-ignore-errors=no_working_dir_found
         --exclude='\.\./build/.*\.[ch]$' --exclude='.*/tests/.*\.[ch]$'
         --json --output=../coverage-${CI_JOB_NAME}.json
     - popd
@@ -557,6 +559,7 @@ build-wayland-only@x86_64:
           -C build
           --setup plain
           --no-suite 'mutter/kvm'
+          --no-suite 'gvdb'
           --no-rebuild
           --timeout-multiplier 10
           --print-errorlogs
@@ -721,7 +724,7 @@ dist-mutter:
     - mkdir -m 1777 /tmp/.X11-unix
     - ./src/tests/meta-dbus-runner.py
         --
-        meson dist -C build
+        meson dist -C build --include-subprojects
   artifacts:
     expire_in: 7 day
     name: "mutter-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
diff --git a/meson.build b/meson.build
index 565e3729f..0100fd28f 100644
--- a/meson.build
+++ b/meson.build
@@ -129,6 +129,7 @@ lcms2_dep = dependency('lcms2', version: lcms2_req)
 harfbuzz_dep = dependency('harfbuzz', version: harfbuzz_req)
 libeis_dep = dependency('libeis-1.0', version: libei_req)
 libei_dep = dependency('libei-1.0', version: libei_req)
+gvdb_dep = dependency('gvdb')
 
 have_wayland = get_option('wayland')
 have_x11 = get_option('x11')
diff --git a/src/meson.build b/src/meson.build
index 785565947..f4f01b1f5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1232,6 +1232,7 @@ libmutter = shared_library(libmutter_name,
     libmutter_cogl_dep,
     libmutter_clutter_dep,
     mutter_deps,
+    gvdb_dep,
   ],
   install_rpath: pkglibdir,
   install_dir: libdir,
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 4f39724b3..59385dd8d 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -48,6 +48,7 @@ tests_deps = [
   mutter_deps,
   locally_compiled_schemas_dep,
   wayland_client_dep,
+  gvdb_dep,
 ]
 
 libmutter_test = shared_library(libmutter_test_name,
diff --git a/subprojects/gvdb.wrap b/subprojects/gvdb.wrap
new file mode 100644
index 000000000..90026244b
--- /dev/null
+++ b/subprojects/gvdb.wrap
@@ -0,0 +1,8 @@
+[wrap-git]
+directory = gvdb
+url = https://gitlab.gnome.org/GNOME/gvdb.git
+revision = b54bc5da25127ef416858a3ad92e57159ff565b3
+depth = 1
+
+[provide]
+dependency_names = gvdb