Skip to content

Commit

Permalink
Updated to facilitate mesonbuild/meson#13800
Browse files Browse the repository at this point in the history
Previsouly, android_usecase was expected now import('gnome').executable
should be used to indicate applications supporting android.
  • Loading branch information
sp1ritCS committed Oct 19, 2024
1 parent f0ccc23 commit 5a2d09b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 44 deletions.
3 changes: 2 additions & 1 deletion pixiewood
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
43 changes: 0 additions & 43 deletions prepare/wraps/gtk/android-glue.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 5a2d09b

Please sign in to comment.