From 81964dec1f37b6ab0486a97a0e3ff74330d8ae0f Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 7 Jul 2020 15:29:11 +0100 Subject: [PATCH] build: Re-add libglib-testing subproject MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This time, add it as a wrap module rather than a git submodule. They’re easier to manage, and integrate better with Meson. The subproject has to be re-added so that malcontent can be built on Debian Stable and Fedora 31 for the gnome-software CI. See https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/487. Signed-off-by: Philip Withnall --- libmalcontent/tests/meson.build | 2 +- subprojects/libglib-testing.wrap | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 subprojects/libglib-testing.wrap diff --git a/libmalcontent/tests/meson.build b/libmalcontent/tests/meson.build index 27b67e1..e79ce7d 100644 --- a/libmalcontent/tests/meson.build +++ b/libmalcontent/tests/meson.build @@ -3,7 +3,7 @@ deps = [ dependency('gio-unix-2.0', version: '>= 2.44'), dependency('glib-2.0', version: '>= 2.60.0'), dependency('gobject-2.0', version: '>= 2.44'), - dependency('glib-testing-0'), + dependency('glib-testing-0', fallback: ['libglib-testing', 'libglib_testing_dep']), libmalcontent_dep, ] diff --git a/subprojects/libglib-testing.wrap b/subprojects/libglib-testing.wrap new file mode 100644 index 0000000..537a946 --- /dev/null +++ b/subprojects/libglib-testing.wrap @@ -0,0 +1,4 @@ +[wrap-git] +directory = libglib-testing +url = https://gitlab.gnome.org/pwithnall/libglib-testing.git +revision = 0.1.0