From 5a2d09b48ede4dba6e240868ad8cc0746cc105af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20=22sp1rit=22=E2=80=8B?= <sp1rit@disroot.org>
Date: Sat, 19 Oct 2024 18:25:06 +0200
Subject: [PATCH] Updated to facilitate mesonbuild/meson#13800

Previsouly, android_usecase was expected now import('gnome').executable
should be used to indicate applications supporting android.
---
 pixiewood                                     |  3 +-
 prepare/wraps/gtk/android-glue.patch          | 43 -------------------
 .../gtk/{demo-xmlns.patch => demo.patch}      | 13 ++++++
 3 files changed, 15 insertions(+), 44 deletions(-)
 delete mode 100644 prepare/wraps/gtk/android-glue.patch
 rename prepare/wraps/gtk/{demo-xmlns.patch => demo.patch} (56%)

diff --git a/pixiewood b/pixiewood
index 5fbab1d..e5f9d38 100755
--- a/pixiewood
+++ b/pixiewood
@@ -267,7 +267,8 @@ my %actions = (
 			local $/;
 			my $json = decode_json <$fh>;
 			close $fh;
-			grep { defined $_->{android_usecase} and $_->{android_usecase} eq 'application' } @$json
+			# TODO: filter out anything that wasn't produced by gnome.executable (not possible yet)
+			@$json;
 		};
 		my $target = $appx->findvalue('//pw:app/pw:build/@target');
 		@targets = grep { $_->{name} eq $target } @targets if $target;
diff --git a/prepare/wraps/gtk/android-glue.patch b/prepare/wraps/gtk/android-glue.patch
deleted file mode 100644
index 190611d..0000000
--- a/prepare/wraps/gtk/android-glue.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
-index bd32cb57f2..96296be437 100644
---- a/demos/gtk-demo/meson.build
-+++ b/demos/gtk-demo/meson.build
-@@ -240,6 +240,7 @@ executable('gtk4-demo',
-   dependencies: gtkdemo_deps,
-   include_directories: confinc,
-   win_subsystem: 'windows',
-+  android_usecase: 'application',
-   link_args: extra_demo_ldflags,
-   install: true,
- )
-diff --git a/gdk/android/glue/meson.build b/gdk/android/glue/meson.build
-new file mode 100644
-index 0000000000..f134d04a55
---- /dev/null
-+++ b/gdk/android/glue/meson.build
-@@ -0,0 +1,10 @@
-+gdk_android_glue = static_library('glue', 'glue.c',
-+  dependencies: [
-+    glib_dep,
-+    libgtk_dep,
-+    cc.find_library('log')
-+  ]
-+)
-+
-+gdk_android_glue_dep = declare_dependency(link_whole: gdk_android_glue)
-+meson.override_dependency('android:application', gdk_android_glue_dep)
-diff --git a/meson.build b/meson.build
-index b9f6190831..20c7529bcf 100644
---- a/meson.build
-+++ b/meson.build
-@@ -830,6 +830,9 @@ subdir('gdk')
- subdir('gsk')
- subdir('gtk')
- subdir('modules')
-+if os_android
-+  subdir('gdk/android/glue')
-+endif
- if get_option('build-demos')
-   subdir('demos')
- endif
-
diff --git a/prepare/wraps/gtk/demo-xmlns.patch b/prepare/wraps/gtk/demo.patch
similarity index 56%
rename from prepare/wraps/gtk/demo-xmlns.patch
rename to prepare/wraps/gtk/demo.patch
index 0c01e6b..fac046b 100644
--- a/prepare/wraps/gtk/demo-xmlns.patch
+++ b/prepare/wraps/gtk/demo.patch
@@ -1,3 +1,16 @@
+diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
+index bd32cb57f2..6bd2b6e64d 100644
+--- a/demos/gtk-demo/meson.build
++++ b/demos/gtk-demo/meson.build
+@@ -234,7 +234,7 @@ endforeach
+ 
+ gtkdemo_deps += [ profile_conf_h ]
+ 
+-executable('gtk4-demo',
++gnome.executable('gtk4-demo',
+   sources: [demos, demos_h, extra_demo_sources, gtkdemo_resources],
+   c_args: demo_cflags,
+   dependencies: gtkdemo_deps,
 diff --git a/demos/gtk-demo/org.gtk.Demo4.appdata.xml.in b/demos/gtk-demo/org.gtk.Demo4.appdata.xml.in
 index 87f9267e67..6a80e4e0ad 100644
 --- a/demos/gtk-demo/org.gtk.Demo4.appdata.xml.in