From 3fb1c78117b03ce3b6fef605a03b807ab17615dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 11 Jun 2024 08:19:53 +0200 Subject: [PATCH 1/3] build: Don't use deprecated build_root MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther Part-of: --- tests/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index 7a9a8d59..9983ca04 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -28,7 +28,7 @@ if phoc.found() foreach opt : local_opts test('test-@0@'.format(opt), phoc, args: ['-E', - '@0@/src/phosh-mobile-settings --@1@'.format(meson.build_root(), opt), + '@0@/src/phosh-mobile-settings --@1@'.format(meson.project_build_root(), opt), ], env: test_env_phoc) endforeach -- GitLab From ab301237942af6bb14c47e6aef5b8099db57503f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 11 Jun 2024 08:20:50 +0200 Subject: [PATCH 2/3] build: Bump meson dependency to 1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther Part-of: --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 23959bbc..acf1e25b 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('phosh-mobile-settings', 'c', version: '0.39.0', - meson_version: '>= 0.58.0', + meson_version: '>= 1.0.0', default_options: [ 'warning_level=2', 'werror=false', 'c_std=gnu11', -- GitLab From 70dd6e7111ca43c5d533b787e1accdd550fdcb95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 11 Jun 2024 08:17:12 +0200 Subject: [PATCH 3/3] build: Allow to use shared gmobile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump dependency to gmobile 0.2.0 while at that. Signed-off-by: Guido Günther Part-of: --- meson.build | 16 +++++++++------- subprojects/gmobile.wrap | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index acf1e25b..e6807d65 100644 --- a/meson.build +++ b/meson.build @@ -29,13 +29,15 @@ glib_dep = dependency('glib-2.0', version: glib_ver_cmp) gio_dep = dependency('gio-2.0', version: glib_ver_cmp) gio_unix_dep = dependency('gio-unix-2.0', version: glib_ver_cmp) gmodule_dep = dependency('gmodule-2.0', version: glib_ver_cmp) -gmobile = subproject('gmobile', - default_options: [ - 'examples=false', - 'gtk_doc=false', - 'tests=false', - ]) -gmobile_dep = gmobile.get_variable('gmobile_dep') +gmobile_dep = dependency('gmobile', + version: '>= 0.2.0', + fallback: ['gmobile', 'gmobile_dep'], + default_options: + [ 'examples=false', + 'introspection=false', + 'gtk_doc=false', + 'tests=false' + ]) gsound_dep = dependency('gsound') gtk_dep = dependency('gtk4', version: gtk_ver_cmp) gtk_wayland_dep = dependency('gtk4-wayland', version: gtk_ver_cmp) diff --git a/subprojects/gmobile.wrap b/subprojects/gmobile.wrap index e7940991..ba41322e 100644 --- a/subprojects/gmobile.wrap +++ b/subprojects/gmobile.wrap @@ -1,5 +1,5 @@ [wrap-git] directory=gmobile url=https://gitlab.gnome.org/World/Phosh/gmobile.git -revision=v0.0.6 +revision=v0.2.0 depth=1 -- GitLab