From 8d4fe9f902a1255d5f97e4c74d38db029867ad9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 9 Apr 2024 15:27:51 +0200 Subject: [PATCH 1/2] build: Switch to gmobile 0.1.0 --- debian/not-installed | 3 +++ subprojects/gmobile.wrap | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 debian/not-installed diff --git a/debian/not-installed b/debian/not-installed new file mode 100644 index 0000000..b5e4cc8 --- /dev/null +++ b/debian/not-installed @@ -0,0 +1,3 @@ +usr/include/gmobile/ +usr/lib/aarch64-linux-gnu/libgmobile.* +usr/lib/aarch64-linux-gnu/pkgconfig/gmobile.pc \ No newline at end of file diff --git a/subprojects/gmobile.wrap b/subprojects/gmobile.wrap index 85901c3..b9ec8e9 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.4 +revision=v0.1.0 depth=1 From 72ef71a01bca5ba7afb4064e04277abd7b8b1a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 9 Apr 2024 15:28:04 +0200 Subject: [PATCH 2/2] build: Allow to use shared gmobile --- meson.build | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 8725e76..5b9e39c 100644 --- a/meson.build +++ b/meson.build @@ -14,13 +14,15 @@ gio_unix = dependency('gio-unix-2.0', version: '>=2.50.0') glib = dependency('glib-2.0', version: '>=2.50.0') if get_option('daemon') gobject = dependency('gobject-2.0', version: '>=2.50.0') - gmobile_subp = subproject('gmobile', - default_options: [ - 'examples=false', - 'gtk_doc=false', - 'tests=false', - ]) - gmobile = gmobile_subp.get_variable('gmobile_dep') + gmobile = dependency('gmobile', + version: '>= 0.1.0', + fallback: ['gmobile', 'gmobile_dep'], + default_options: [ + 'examples=false', + 'introspection=false', + 'gtk_doc=false', + 'tests=false', + ]) gsound = dependency('gsound') gudev = dependency('gudev-1.0', version: '>=232') json_glib = dependency('json-glib-1.0')