gjdwebserver/gjdwebserver-overlay
gjdwebserver/gjdwebserver-overlay
3
0
Fork 0
Code Pull Requests Releases Activity

Fix

Browse Source
This commit is contained in:
Gerben Jan Dijkman 2024-05-23 23:51:41 +02:00
parent cceb7e3d26
commit 3b76d751a2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11-misc/phosh-mobile-settings/files/0001-Make-gmobile-not-dep-on-the-subproject.patch
View File

@ -1,17 +1,17 @@
From f1b594002045cc16753847932507aec6bd60ab8f Mon Sep 17 00:00:00 2001 From e277e6324f39ae804f522c962e9ea12010a17414 Mon Sep 17 00:00:00 2001
From: Gerben Jan Dijkman <gjdijkman@gjdwebserver.nl> From: Gerben Jan Dijkman <gjdijkman@gjdwebserver.nl>
Date: Thu, 23 May 2024 23:46:34 +0200 Date: Thu, 23 May 2024 23:50:57 +0200
Subject: [PATCH] Gmobile subproject fix Subject: [PATCH] Gmobile subproject fix
--- ---
meson.build | 15 +++++++++------ meson.build | 16 +++++++++-------
1 file changed, 9 insertions(+), 6 deletions(-) 1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 23959bb..9a56dce 100644 index 23959bb..f964fd7 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -29,12 +29,15 @@ glib_dep = dependency('glib-2.0', version: glib_ver_cmp) @@ -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_dep = dependency('gio-2.0', version: glib_ver_cmp)
gio_unix_dep = dependency('gio-unix-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) gmodule_dep = dependency('gmodule-2.0', version: glib_ver_cmp)
@ -21,6 +21,7 @@ index 23959bb..9a56dce 100644
- 'gtk_doc=false', - 'gtk_doc=false',
- 'tests=false', - 'tests=false',
- ]) - ])
-gmobile_dep = gmobile.get_variable('gmobile_dep')
+gmobile_dep = dependency('gmobile', +gmobile_dep = dependency('gmobile',
+ version: '>= 0.1.0', + version: '>= 0.1.0',
+ fallback: ['gmobile', 'gmobile_dep'], + fallback: ['gmobile', 'gmobile_dep'],
@ -30,9 +31,9 @@ index 23959bb..9a56dce 100644
+ 'gtk_doc=false', + 'gtk_doc=false',
+ 'tests=false' + 'tests=false'
+ ]) + ])
gmobile_dep = gmobile.get_variable('gmobile_dep')
gsound_dep = dependency('gsound') gsound_dep = dependency('gsound')
gtk_dep = dependency('gtk4', version: gtk_ver_cmp) gtk_dep = dependency('gtk4', version: gtk_ver_cmp)
gtk_wayland_dep = dependency('gtk4-wayland', version: gtk_ver_cmp)
-- --
2.44.1 2.44.1