[Debian-on-mobile-maintainers] Bug#1042983: squeekboard - rust gtk stack update.

[Peter Green]

Package: squeekboard
Version: 1.22.0-3
Severity: serious

The rust gtk stack is currently being updated in Debian,
squeekboard needs a small patch

Please test that squeekboard works with this patch and
if-so apply it.
-------------- next part --------------
diff -Nru squeekboard-1.22.0/debian/changelog squeekboard-1.22.0/debian/changelog
--- squeekboard-1.22.0/debian/changelog	2023-07-01 15:14:45.000000000 +0000
+++ squeekboard-1.22.0/debian/changelog	2023-08-03 16:41:53.000000000 +0000
@@ -1,3 +1,10 @@
+squeekboard (1.22.0-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Update for gtk-rs 0.17.
+
+ -- Peter Michael Green <plugwash at debian.org>  Thu, 03 Aug 2023 16:41:53 +0000
+
 squeekboard (1.22.0-3) unstable; urgency=medium
 
   * debian: update build dependencies.
diff -Nru squeekboard-1.22.0/debian/control squeekboard-1.22.0/debian/control
--- squeekboard-1.22.0/debian/control	2023-07-01 15:14:45.000000000 +0000
+++ squeekboard-1.22.0/debian/control	2023-08-03 16:39:01.000000000 +0000
@@ -17,11 +17,11 @@
  librust-aho-corasick-dev,
  librust-bitflags-1-dev (>= 1.0),
  librust-clap-4+std-dev (>= 4.0),
- librust-gio+v2-58-dev (>= 0.16),
- librust-glib+v2-58-dev (>= 0.16),
- librust-glib-sys-dev (>= 0.16),
- librust-gtk+v3-24-dev (>= 0.16),
- librust-gtk-sys-dev (>= 0.16),
+ librust-gio+v2-58-dev (>= 0.17),
+ librust-glib+v2-58-dev (>= 0.17),
+ librust-glib-sys-dev (>= 0.17),
+ librust-gtk+v3-24-dev (>= 0.17),
+ librust-gtk-sys-dev (>= 0.17),
  librust-maplit-1-dev (>= 1.0),
  librust-serde-derive-1-dev (>= 1.0),
  librust-serde-yaml-0.8-dev (>= 0.8),
diff -Nru squeekboard-1.22.0/debian/patches/0005-gtk-rs-0.17.patch squeekboard-1.22.0/debian/patches/0005-gtk-rs-0.17.patch
--- squeekboard-1.22.0/debian/patches/0005-gtk-rs-0.17.patch	1970-01-01 00:00:00.000000000 +0000
+++ squeekboard-1.22.0/debian/patches/0005-gtk-rs-0.17.patch	2023-08-03 16:41:53.000000000 +0000
@@ -0,0 +1,56 @@
+Index: squeekboard-1.22.0/Cargo.deps.newer
+===================================================================
+--- squeekboard-1.22.0.orig/Cargo.deps.newer
++++ squeekboard-1.22.0/Cargo.deps.newer
+@@ -10,30 +10,30 @@ zvariant_derive = "2.10.*"
+ xkbcommon = { version = "0.5.*", features = ["wayland"] }
+ 
+ [dependencies.cairo-rs]
+-version = "0.16.*"
++version = "0.17.*"
+ 
+ [dependencies.cairo-sys-rs]
+-version = "0.16.*"
++version = "0.17.*"
+ 
+ [dependencies.gdk]
+-version = "0.16.*"
++version = "0.17.*"
+ 
+ [dependencies.gio]
+-version = "0.16.*"
++version = "0.17.*"
+ features = ["v2_58"]
+ 
+ [dependencies.glib]
+-version = "0.16.*"
++version = "0.17.*"
+ features = ["v2_58"]
+ 
+ [dependencies.glib-sys]
+-version = "0.16.*"
++version = "0.17.*"
+ features = ["v2_58"]
+ 
+ [dependencies.gtk]
+-version = "0.16.*"
++version = "0.17.*"
+ features = ["v3_24"]
+ 
+ [dependencies.gtk-sys]
+-version = "0.16.*"
++version = "0.17.*"
+ features = ["v3_24"]
+Index: squeekboard-1.22.0/src/popover.rs
+===================================================================
+--- squeekboard-1.22.0.orig/src/popover.rs
++++ squeekboard-1.22.0/src/popover.rs
+@@ -326,7 +326,7 @@ pub fn show(
+         let layout_action = gio::SimpleAction::new_stateful(
+             "layout",
+             Some(current_layout_name.to_variant().type_()),
+-            &current_layout_name.to_variant()
++            current_layout_name.to_variant()
+         );
+ 
+         let menu_inner = menu.clone();
diff -Nru squeekboard-1.22.0/debian/patches/series squeekboard-1.22.0/debian/patches/series
--- squeekboard-1.22.0/debian/patches/series	2023-07-01 15:14:45.000000000 +0000
+++ squeekboard-1.22.0/debian/patches/series	2023-08-03 16:40:41.000000000 +0000
@@ -2,3 +2,4 @@
 0002-src-popover-fix-build-with-newer-gtk-rs.patch
 0003-src-style-fix-build-with-newer-gtk-rs.patch
 0004-Cargo.-use-xkbcommon-v0.5.patch
+0005-gtk-rs-0.17.patch