Fix
This commit is contained in:
		@@ -1,17 +1,17 @@
 | 
			
		||||
From 2e70da4f71e2966aa2107755d476973b0caa5026 Mon Sep 17 00:00:00 2001
 | 
			
		||||
From f1b594002045cc16753847932507aec6bd60ab8f Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: Gerben Jan Dijkman <gjdijkman@gjdwebserver.nl>
 | 
			
		||||
Date: Thu, 23 May 2024 23:30:17 +0200
 | 
			
		||||
Subject: [PATCH] Make gmobile not dep on the subproject
 | 
			
		||||
Date: Thu, 23 May 2024 23:46:34 +0200
 | 
			
		||||
Subject: [PATCH] Gmobile subproject fix
 | 
			
		||||
 | 
			
		||||
---
 | 
			
		||||
 meson.build | 8 +-------
 | 
			
		||||
 1 file changed, 1 insertion(+), 7 deletions(-)
 | 
			
		||||
 meson.build | 15 +++++++++------
 | 
			
		||||
 1 file changed, 9 insertions(+), 6 deletions(-)
 | 
			
		||||
 | 
			
		||||
diff --git a/meson.build b/meson.build
 | 
			
		||||
index 23959bb..8708f07 100644
 | 
			
		||||
index 23959bb..9a56dce 100644
 | 
			
		||||
--- a/meson.build
 | 
			
		||||
+++ b/meson.build
 | 
			
		||||
@@ -29,13 +29,7 @@ glib_dep = dependency('glib-2.0', version: glib_ver_cmp)
 | 
			
		||||
@@ -29,12 +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)
 | 
			
		||||
@@ -21,11 +21,18 @@ index 23959bb..8708f07 100644
 | 
			
		||||
-    'gtk_doc=false',
 | 
			
		||||
-    'tests=false',
 | 
			
		||||
-  ])
 | 
			
		||||
-gmobile_dep = gmobile.get_variable('gmobile_dep')
 | 
			
		||||
+gmobile_dep = dependency('gmobile', version: '>=0.6.0')
 | 
			
		||||
+gmobile_dep = dependency('gmobile',
 | 
			
		||||
+  version: '>= 0.1.0',
 | 
			
		||||
+  fallback: ['gmobile', 'gmobile_dep'],
 | 
			
		||||
+  default_options:
 | 
			
		||||
+    [ 'examples=false',
 | 
			
		||||
+      'introspection=false',
 | 
			
		||||
+      'gtk_doc=false',
 | 
			
		||||
+      'tests=false'
 | 
			
		||||
+    ])
 | 
			
		||||
 gmobile_dep = gmobile.get_variable('gmobile_dep')
 | 
			
		||||
 gsound_dep = dependency('gsound')
 | 
			
		||||
 gtk_dep = dependency('gtk4', version: gtk_ver_cmp)
 | 
			
		||||
 gtk_wayland_dep = dependency('gtk4-wayland', version: gtk_ver_cmp)
 | 
			
		||||
-- 
 | 
			
		||||
2.44.1
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user