Your message dated Mon, 16 Oct 2023 13:19:33 +0000 with message-id <e1qsnvn-005z2l...@fasolo.debian.org> and subject line Bug#1053536: fixed in squeekboard 1.22.0-5 has caused the Debian Bug report #1053536, regarding squeekboard FTBFS with version 0.18 of rust gtk stack. to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 1053536: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1053536 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: squeekboard Version: 1.22.0-4 Severity: serious Tags: patch The rust gtk stack was recently updated, and squeekboard needs a few tweaks to build with the new version. I have whipped up a patch and tested that squeekboard builds with it, I have not tested it beyond that.diff -Nru squeekboard-1.22.0/debian/changelog squeekboard-1.22.0/debian/changelog --- squeekboard-1.22.0/debian/changelog 2023-08-23 08:47:31.000000000 +0000 +++ squeekboard-1.22.0/debian/changelog 2023-10-05 19:31:30.000000000 +0000 @@ -1,3 +1,10 @@ +squeekboard (1.22.0-4.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * update patches for gtk-rs 0.18 + + -- Peter Michael Green <plugw...@debian.org> Thu, 05 Oct 2023 19:31:30 +0000 + squeekboard (1.22.0-4) unstable; urgency=medium [ Peter Michael Green ] diff -Nru squeekboard-1.22.0/debian/patches/0001-Cargo.deps.newer-update-for-gtk-rs-0.17.patch squeekboard-1.22.0/debian/patches/0001-Cargo.deps.newer-update-for-gtk-rs-0.17.patch --- squeekboard-1.22.0/debian/patches/0001-Cargo.deps.newer-update-for-gtk-rs-0.17.patch 2023-08-23 08:47:31.000000000 +0000 +++ squeekboard-1.22.0/debian/patches/0001-Cargo.deps.newer-update-for-gtk-rs-0.17.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -From: Arnaud Ferraris <arnaud.ferra...@collabora.com> -Date: Tue, 27 Jun 2023 12:31:30 +0200 -Subject: Cargo.deps.newer: update for gtk-rs 0.17 - ---- - Cargo.deps.newer | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Cargo.deps.newer b/Cargo.deps.newer -index 197dfa3..c236cc5 100644 ---- a/Cargo.deps.newer -+++ b/Cargo.deps.newer -@@ -9,30 +9,30 @@ zvariant = "2.10.*" - zvariant_derive = "2.10.*" - - [dependencies.cairo-rs] --version = "0.14.*" -+version = "0.17.*" - - [dependencies.cairo-sys-rs] --version = "0.14.*" -+version = "0.17.*" - - [dependencies.gdk] --version = "0.14.*" -+version = "0.17.*" - - [dependencies.gio] --version = "0.14.*" -+version = "0.17.*" - features = ["v2_58"] - - [dependencies.glib] --version = "0.14.*" -+version = "0.17.*" - features = ["v2_58"] - - [dependencies.glib-sys] --version = "0.14.*" -+version = "0.17.*" - features = ["v2_58"] - - [dependencies.gtk] --version = "0.14.*" --features = ["v3_22"] -+version = "0.17.*" -+features = ["v3_24"] - - [dependencies.gtk-sys] --version = "0.14.*" --features = ["v3_22"] -+version = "0.17.*" -+features = ["v3_24"] diff -Nru squeekboard-1.22.0/debian/patches/0001-Cargo.deps.newer-update-for-gtk-rs-0.18.patch squeekboard-1.22.0/debian/patches/0001-Cargo.deps.newer-update-for-gtk-rs-0.18.patch --- squeekboard-1.22.0/debian/patches/0001-Cargo.deps.newer-update-for-gtk-rs-0.18.patch 1970-01-01 00:00:00.000000000 +0000 +++ squeekboard-1.22.0/debian/patches/0001-Cargo.deps.newer-update-for-gtk-rs-0.18.patch 2023-10-05 19:31:30.000000000 +0000 @@ -0,0 +1,55 @@ +Modified by Peter Michael Green for version 0.18 of rust gtk stack. + +From: Arnaud Ferraris <arnaud.ferra...@collabora.com> +Date: Tue, 27 Jun 2023 12:31:30 +0200 +Subject: Cargo.deps.newer: update for gtk-rs 0.17 + +--- + Cargo.deps.newer | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Cargo.deps.newer b/Cargo.deps.newer +index 197dfa3..c236cc5 100644 +--- a/Cargo.deps.newer ++++ b/Cargo.deps.newer +@@ -9,30 +9,30 @@ zvariant = "2.10.*" + zvariant_derive = "2.10.*" + + [dependencies.cairo-rs] +-version = "0.14.*" ++version = "0.18.*" + + [dependencies.cairo-sys-rs] +-version = "0.14.*" ++version = "0.18.*" + + [dependencies.gdk] +-version = "0.14.*" ++version = "0.18.*" + + [dependencies.gio] +-version = "0.14.*" ++version = "0.18.*" + features = ["v2_58"] + + [dependencies.glib] +-version = "0.14.*" ++version = "0.18.*" + features = ["v2_58"] + + [dependencies.glib-sys] +-version = "0.14.*" ++version = "0.18.*" + features = ["v2_58"] + + [dependencies.gtk] +-version = "0.14.*" +-features = ["v3_22"] ++version = "0.18.*" ++features = ["v3_24"] + + [dependencies.gtk-sys] +-version = "0.14.*" +-features = ["v3_22"] ++version = "0.18.*" ++features = ["v3_24"] diff -Nru squeekboard-1.22.0/debian/patches/0004-Cargo.-use-xkbcommon-v0.5.patch squeekboard-1.22.0/debian/patches/0004-Cargo.-use-xkbcommon-v0.5.patch --- squeekboard-1.22.0/debian/patches/0004-Cargo.-use-xkbcommon-v0.5.patch 2023-08-23 08:47:31.000000000 +0000 +++ squeekboard-1.22.0/debian/patches/0004-Cargo.-use-xkbcommon-v0.5.patch 2023-10-05 19:31:30.000000000 +0000 @@ -26,14 +26,10 @@ index c236cc5..b36e616 100644 --- a/Cargo.deps.newer +++ b/Cargo.deps.newer -@@ -7,6 +7,7 @@ zbus = "1.9.*" - zvariant = "2.10.*" - # Newer versions seem to confuse the version of Cargo on Debian Bullseye +@@ -9,2 +9,3 @@ zbus = "1.9.*" zvariant_derive = "2.10.*" +xkbcommon = { version = "0.5.*", features = ["wayland"] } - [dependencies.cairo-rs] - version = "0.17.*" diff --git a/Cargo.toml.in b/Cargo.toml.in index c9b2064..557e6c6 100644 --- a/Cargo.toml.in diff -Nru squeekboard-1.22.0/debian/patches/0005-src-popover-gtk-rs-0.18.patch squeekboard-1.22.0/debian/patches/0005-src-popover-gtk-rs-0.18.patch --- squeekboard-1.22.0/debian/patches/0005-src-popover-gtk-rs-0.18.patch 1970-01-01 00:00:00.000000000 +0000 +++ squeekboard-1.22.0/debian/patches/0005-src-popover-gtk-rs-0.18.patch 2023-10-05 19:31:30.000000000 +0000 @@ -0,0 +1,13 @@ +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() ++ ¤t_layout_name.to_variant() + ); + + let menu_inner = menu.clone(); diff -Nru squeekboard-1.22.0/debian/patches/0006-replace-continue-with-controlflow.patch squeekboard-1.22.0/debian/patches/0006-replace-continue-with-controlflow.patch --- squeekboard-1.22.0/debian/patches/0006-replace-continue-with-controlflow.patch 1970-01-01 00:00:00.000000000 +0000 +++ squeekboard-1.22.0/debian/patches/0006-replace-continue-with-controlflow.patch 2023-10-05 19:31:30.000000000 +0000 @@ -0,0 +1,47 @@ +Index: squeekboard-1.22.0/src/popover.rs +=================================================================== +--- squeekboard-1.22.0.orig/src/popover.rs ++++ squeekboard-1.22.0/src/popover.rs +@@ -376,6 +376,6 @@ pub fn show( + menu.bind_model(Some(&model), Some("popup")); + glib::idle_add_local(move || { + menu.popup(); +- Continue(false) ++ glib::ControlFlow::Break + }); + } +Index: squeekboard-1.22.0/src/main.rs +=================================================================== +--- squeekboard-1.22.0.orig/src/main.rs ++++ squeekboard-1.22.0/src/main.rs +@@ -10,7 +10,7 @@ use crate::data::loading; + use crate::event_loop; + use crate::panel; + use crate::state; +-use glib::{Continue, MainContext, PRIORITY_DEFAULT, Receiver}; ++use glib::{ControlFlow, MainContext, PRIORITY_DEFAULT, Receiver}; + + + mod c { +@@ -163,7 +163,7 @@ mod c { + hint_manager, + dbus_handler, + ); +- Continue(true) ++ ControlFlow::Continue + }, + ); + #[cfg(not(feature = "glib_v0_14"))] +Index: squeekboard-1.22.0/src/panel.rs +=================================================================== +--- squeekboard-1.22.0.orig/src/panel.rs ++++ squeekboard-1.22.0/src/panel.rs +@@ -66,7 +66,7 @@ pub mod c { + glib::idle_add_local(move || { + let panel = panel.clone_ref(); + panel.borrow_mut().set_configured(Size{width, height}); +- glib::Continue(false) ++ glib::ControlFlow::Break + }); + } + } diff -Nru squeekboard-1.22.0/debian/patches/0007-priority-constants-glib-rs-0.18.patch squeekboard-1.22.0/debian/patches/0007-priority-constants-glib-rs-0.18.patch --- squeekboard-1.22.0/debian/patches/0007-priority-constants-glib-rs-0.18.patch 1970-01-01 00:00:00.000000000 +0000 +++ squeekboard-1.22.0/debian/patches/0007-priority-constants-glib-rs-0.18.patch 2023-10-05 19:31:30.000000000 +0000 @@ -0,0 +1,22 @@ +Index: squeekboard-1.22.0/src/main.rs +=================================================================== +--- squeekboard-1.22.0.orig/src/main.rs ++++ squeekboard-1.22.0/src/main.rs +@@ -10,7 +10,7 @@ use crate::data::loading; + use crate::event_loop; + use crate::panel; + use crate::state; +-use glib::{ControlFlow, MainContext, PRIORITY_DEFAULT, Receiver}; ++use glib::{ControlFlow, MainContext, Priority, Receiver}; + + + mod c { +@@ -103,7 +103,7 @@ mod c { + pub extern "C" + fn squeek_init() -> RsObjects { + // Set up channels +- let (sender, receiver) = MainContext::channel(PRIORITY_DEFAULT); ++ let (sender, receiver) = MainContext::channel(Priority::default()); + let now = Instant::now(); + let state_manager = driver::Threaded::new(sender, state::Application::new(now)); + diff -Nru squeekboard-1.22.0/debian/patches/series squeekboard-1.22.0/debian/patches/series --- squeekboard-1.22.0/debian/patches/series 2023-08-23 08:47:31.000000000 +0000 +++ squeekboard-1.22.0/debian/patches/series 2023-10-05 19:31:30.000000000 +0000 @@ -1,4 +1,7 @@ -0001-Cargo.deps.newer-update-for-gtk-rs-0.17.patch +0001-Cargo.deps.newer-update-for-gtk-rs-0.18.patch 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-src-popover-gtk-rs-0.18.patch +0006-replace-continue-with-controlflow.patch +0007-priority-constants-glib-rs-0.18.patch
--- End Message ---
--- Begin Message ---Source: squeekboard Source-Version: 1.22.0-5 Done: Arnaud Ferraris <aferra...@debian.org> We believe that the bug you reported is fixed in the latest version of squeekboard, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 1053...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Arnaud Ferraris <aferra...@debian.org> (supplier of updated squeekboard package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Mon, 16 Oct 2023 12:52:51 +0200 Source: squeekboard Architecture: source Version: 1.22.0-5 Distribution: unstable Urgency: medium Maintainer: DebianOnMobile Maintainers <debian-on-mobile-maintain...@alioth-lists.debian.net> Changed-By: Arnaud Ferraris <aferra...@debian.org> Closes: 1053536 Changes: squeekboard (1.22.0-5) unstable; urgency=medium . [ Peter Michael Green ] * update patches for gtk-rs 0.18 (Closes: #1053536) . [ Arnaud Ferraris ] * d/control: update version requirements for gtk-rs dependencies Checksums-Sha1: d95c376081d62269d1c11276bb9510f92083f909 2844 squeekboard_1.22.0-5.dsc 6b8aebb8c2d6d8153b1d270a5a92aff2de53305a 11048 squeekboard_1.22.0-5.debian.tar.xz 484ac02f9f61c316d780f677c3cf202a27f516bd 25130 squeekboard_1.22.0-5_source.buildinfo Checksums-Sha256: 44dd0dccdc5b22b04ee3193a0b7efdd25f4740676201406a1acd1f03196e14e9 2844 squeekboard_1.22.0-5.dsc 292f8f3ebccc96fea88605ade530425038923820604e1e131e0d02072ab44fed 11048 squeekboard_1.22.0-5.debian.tar.xz d6b0d0b65b3753c56438e31836ed5d771b0f7eb5afdd0d18f4fb94f374bda3df 25130 squeekboard_1.22.0-5_source.buildinfo Files: be5553c3975be38fd55e427cc3bb71a1 2844 x11 optional squeekboard_1.22.0-5.dsc 8b3c72230ab438be8f7e86d7f0b40d3a 11048 x11 optional squeekboard_1.22.0-5.debian.tar.xz 1f2b21665d5cae6cdcb0db2c5c6a4c04 25130 x11 optional squeekboard_1.22.0-5_source.buildinfo -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEeW2zk9w/9AIituoi0+u1lmu5kZYFAmUtMfkACgkQ0+u1lmu5 kZbwxxAAp0csymfi5Ywsd5aZ7xP8CW4UHHefZgC9KNadiAZMjhCqv6oir1NGtOSY ZJx7rDb+H/Dz02+3vzGD8jpB+KsWiApmS69Q6dv7B4mLYzxi9R8kT+AREc9C7MeQ XapsyeP1HhWf9W0tc/FgUl+t+EGODmoPvlaYq+dxlCLk03FfRCV4VdZgXTgFz9Ef h2oHOTzXacNX8DUHPQ9NaxNeAxThke5wpWjc6czus8VPOquJw0e03JB3k5+6iBNs /gPcJYWwQsD9zfB+WKxi/nI1FfMTq0GUg0ayNiDxl8HV1RmipuqvpzWba1qSEkja hufNYHpRp1kJ7sCsIivblkJEyJ/CzKXvmVlnVmkhpNeFvqaXXSKR4guUymlquSCs JmFZdROJ9ysZo7n4Gq7ZQyMxb9VCIj1YskaYEbDX/OT+L3SB80HMFfS2nuw1gpHi UBOny/+HK60UXAyd7vSBZ1Kir4EQ/q2f21cEEGDsnbX3hkcdaoKD0f7NlsDhLtQu SZkC4mNF7eXB/Sy/WrQCAJQinNCGHKBFqjHrbuAtkQMyZStueM+LiSaSkGgUSPFT X/H5yORTlwom3FGpzU7m8NQzNLmT6AxsyfYZB40Z2EJ2NHew0m+zNFrbxNXQyhLY U+7Mn5J7VsRgltcWNwQ6Gcm/gwjdHB4EC0nxDwORDb5TsG0S+RY= =oy/Z -----END PGP SIGNATURE-----
--- End Message ---
