From 0134888d5021c05a211e49d266f71aef549bc269 Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@gnome.org>
Date: Thu, 12 Sep 2024 15:08:16 +0100
Subject: [PATCH] build: Bump gvdb subproject dependency and disable tests

This brings in https://gitlab.gnome.org/GNOME/gvdb/-/merge_requests/23,
which is needed for the following few commits.

Unfortunately, one of the other commits it brings in introduces a
sort-of-dependency-loop between GIO and GVDB. To avoid that, we have
to disable the GVDB tests. See
https://gitlab.gnome.org/GNOME/gvdb/-/merge_requests/25 for details.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
---
 .gitlab-ci.yml              | 8 ++++----
 .gitlab-ci/mingw.Dockerfile | 2 +-
 .gitmodules                 | 2 +-
 meson.build                 | 2 +-
 subprojects/gvdb            | 2 +-
 subprojects/gvdb.wrap       | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 132aadca2..e0749b7ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,11 +11,11 @@ cache:
     - _ccache/
 
 variables:
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v39.2"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v39.3"
   COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
-  DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v20"
-  ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v4"
-  MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v39.2"
+  DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v21"
+  ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v5"
+  MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v39.3"
   GOBJECT_INTROSPECTION_TAG: "1.80.1"
   MESON_TEST_TIMEOUT_MULTIPLIER: 4
   G_MESSAGES_DEBUG: all
diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile
index 034f69a0f..6d2cdb37e 100644
--- a/.gitlab-ci/mingw.Dockerfile
+++ b/.gitlab-ci/mingw.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/glib/fedora:v39.2
+FROM registry.gitlab.gnome.org/gnome/glib/fedora:v39.3
 
 USER root
 
diff --git a/.gitmodules b/.gitmodules
index 749950b93..4bbaad338 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "subprojects/gvdb"]
 	path = subprojects/gvdb
 	url = ../../GNOME/gvdb.git
-	branch = 0854af0fdb6d527a8d1999835ac2c5059976c210
+	branch = 2b42fc75f09dbe1cd1057580b5782b08f2dcb400
 	shallow = true
diff --git a/meson.build b/meson.build
index 34d36846d..c54ad78b9 100644
--- a/meson.build
+++ b/meson.build
@@ -2239,7 +2239,7 @@ else
 endif
 
 # Import the gvdb sources as a subproject to avoid having the copylib in-tree
-subproject('gvdb')
+subproject('gvdb', default_options: {'tests': false})
 gvdb_dep = dependency('gvdb')
 
 libm = cc.find_library('m', required : false)
diff --git a/subprojects/gvdb b/subprojects/gvdb
index 0854af0fd..2b42fc75f 160000
--- a/subprojects/gvdb
+++ b/subprojects/gvdb
@@ -1 +1 @@
-Subproject commit 0854af0fdb6d527a8d1999835ac2c5059976c210
+Subproject commit 2b42fc75f09dbe1cd1057580b5782b08f2dcb400
diff --git a/subprojects/gvdb.wrap b/subprojects/gvdb.wrap
index 1cdef8dc9..651ecca79 100644
--- a/subprojects/gvdb.wrap
+++ b/subprojects/gvdb.wrap
@@ -1,7 +1,7 @@
 [wrap-git]
 directory=gvdb
 url=https://gitlab.gnome.org/GNOME/gvdb.git
-revision=0854af0fdb6d527a8d1999835ac2c5059976c210
+revision=2b42fc75f09dbe1cd1057580b5782b08f2dcb400
 depth=1
 
 [provide]