From 1241ae2bd7dae945ed4816e7bf97a39590b7d55c Mon Sep 17 00:00:00 2001
From: Marco Melorio <marco.melorio@protonmail.com>
Date: Sun, 28 Aug 2022 17:42:36 +0200
Subject: [PATCH 1/2] plugins/meson-templates/rust: make build always stale

This was missing after 674b6e0c8c4f02a3710040462d54dcd624297469. This is
needed because otherwise meson will always skip the build, even when
rust files are changed.
---
 src/plugins/meson-templates/resources/src/meson-cli.build     | 1 +
 src/plugins/meson-templates/resources/src/meson-rs-gtk4.build | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/plugins/meson-templates/resources/src/meson-cli.build b/src/plugins/meson-templates/resources/src/meson-cli.build
index 18210b68c..071025562 100644
--- a/src/plugins/meson-templates/resources/src/meson-cli.build
+++ b/src/plugins/meson-templates/resources/src/meson-cli.build
@@ -40,6 +40,7 @@ endif
 cargo_build = custom_target(
   'cargo-build',
   build_by_default: true,
+  build_always_stale: true,
   output: meson.project_name(),
   console: true,
   install: true,
diff --git a/src/plugins/meson-templates/resources/src/meson-rs-gtk4.build b/src/plugins/meson-templates/resources/src/meson-rs-gtk4.build
index 4892c3db5..f5fab69d5 100644
--- a/src/plugins/meson-templates/resources/src/meson-rs-gtk4.build
+++ b/src/plugins/meson-templates/resources/src/meson-rs-gtk4.build
@@ -43,6 +43,7 @@ endif
 cargo_build = custom_target(
   'cargo-build',
   build_by_default: true,
+  build_always_stale: true,
   output: meson.project_name(),
   console: true,
   install: true,
-- 
GitLab


From f3edc8f5214ccd1b81daabfb8aedf35a380d1291 Mon Sep 17 00:00:00 2001
From: Marco Melorio <marco.melorio@protonmail.com>
Date: Sun, 28 Aug 2022 17:55:42 +0200
Subject: [PATCH 2/2] plugins/meson-templates/rust: avoid warnings by default

The Rust Gnome Application template had a warning about unused
`gtk::subclass::prelude::*` use declaration. This commit fixes that.
---
 .../meson-templates/resources/src/application-gtk4.rs        | 5 +++--
 src/plugins/meson-templates/resources/src/window-gtk4.rs     | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/meson-templates/resources/src/application-gtk4.rs b/src/plugins/meson-templates/resources/src/application-gtk4.rs
index 6bad3c8de..b52f4b01c 100644
--- a/src/plugins/meson-templates/resources/src/application-gtk4.rs
+++ b/src/plugins/meson-templates/resources/src/application-gtk4.rs
@@ -2,11 +2,12 @@
 
 use glib::clone;
 use gtk::prelude::*;
-use gtk::subclass::prelude::*;
-use gtk::{gio, glib};
 {{if is_adwaita}}
 use adw::subclass::prelude::*;
+{{else}}
+use gtk::subclass::prelude::*;
 {{end}}
+use gtk::{gio, glib};
 
 use crate::config::VERSION;
 use crate::{{PreFix}}Window;
diff --git a/src/plugins/meson-templates/resources/src/window-gtk4.rs b/src/plugins/meson-templates/resources/src/window-gtk4.rs
index 23732815a..783e14cd5 100644
--- a/src/plugins/meson-templates/resources/src/window-gtk4.rs
+++ b/src/plugins/meson-templates/resources/src/window-gtk4.rs
@@ -1,10 +1,11 @@
 {{include "license.rs"}}
 
+use gtk::prelude::*;
 {{if is_adwaita}}
 use adw::subclass::prelude::*;
-{{end}}
-use gtk::prelude::*;
+{{else}}
 use gtk::subclass::prelude::*;
+{{end}}
 use gtk::{gio, glib, CompositeTemplate};
 
 mod imp {
-- 
GitLab