Package: tuigreet
Version: 0.9.1-4
Severity: serious
Tags: patch

recently some rust crates were updated in Debian

rust-rust-ini 0.18 -> 0.21
rust-i18n-embed 0.14 -> 0.15
rust-i18n-embed-fl 0.7 -> 0.9

The Debian build-dependencies for your package allow the new
versions, but the cargo dependencies do not, so your package
FTBFS, furthermore the bump of rust-i18n-embed-fl requires
a small code tweak for your package to build successfully.

A patch addressing these issues is attatched.

diff -Nru tuigreet-0.9.1/debian/changelog tuigreet-0.9.1/debian/changelog
--- tuigreet-0.9.1/debian/changelog     2024-11-24 17:51:09.000000000 +0000
+++ tuigreet-0.9.1/debian/changelog     2024-12-26 00:17:34.000000000 +0000
@@ -1,3 +1,13 @@
+tuigreet (0.9.1-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove upper limit from Cargo dependencies on rust-ini, i18n-embed and
+    i18n-embed-impl.
+  * Add patch to support i18n-embed 0.15 with i18n-embed-fl 0.9 and bump
+    dependencies accordgingly.
+
+ -- Peter Michael Green <plugw...@debian.org>  Thu, 26 Dec 2024 00:17:34 +0000
+
 tuigreet (0.9.1-4) unstable; urgency=medium
 
   [ Peter Michael Green ]
diff -Nru tuigreet-0.9.1/debian/control tuigreet-0.9.1/debian/control
--- tuigreet-0.9.1/debian/control       2024-11-24 17:51:09.000000000 +0000
+++ tuigreet-0.9.1/debian/control       2024-12-26 00:17:34.000000000 +0000
@@ -11,8 +11,8 @@
  librust-futures-dev,
  librust-getopts-dev,
  librust-greetd-ipc-dev,
- librust-i18n-embed-dev,
- librust-i18n-embed-fl-dev,
+ librust-i18n-embed-dev (>= 0.15),
+ librust-i18n-embed-fl-dev (>= 0.9),
  librust-lazy-static-dev,
  librust-nix+feature-dev,
  librust-ratatui-dev (>= 0.28),
diff -Nru tuigreet-0.9.1/debian/patches/i18n-embed_0.15.patch 
tuigreet-0.9.1/debian/patches/i18n-embed_0.15.patch
--- tuigreet-0.9.1/debian/patches/i18n-embed_0.15.patch 1970-01-01 
00:00:00.000000000 +0000
+++ tuigreet-0.9.1/debian/patches/i18n-embed_0.15.patch 2024-12-26 
00:17:34.000000000 +0000
@@ -0,0 +1,31 @@
+Index: tuigreet-0.9.1/Cargo.toml
+===================================================================
+--- tuigreet-0.9.1.orig/Cargo.toml
++++ tuigreet-0.9.1/Cargo.toml
+@@ -15,11 +15,11 @@ crossterm = { version = "^0.27", feature
+ futures = "0.3"
+ getopts = "^0.2"
+ greetd_ipc = { version = "^0.10", features = ["tokio-codec"] }
+-i18n-embed = { version = "^0.14", features = [
++i18n-embed = { version = ">= 0.15", features = [
+   "desktop-requester",
+   "fluent-system",
+ ] }
+-i18n-embed-fl = "^0.8"
++i18n-embed-fl = ">= 0.9"
+ lazy_static = "^1.4"
+ nix = { version = ">= 0.27", features = ["feature"] }
+ tui = { package = "ratatui", version = "^0.28", default-features = false, 
features = [
+Index: tuigreet-0.9.1/src/ui/i18n.rs
+===================================================================
+--- tuigreet-0.9.1.orig/src/ui/i18n.rs
++++ tuigreet-0.9.1/src/ui/i18n.rs
+@@ -13,7 +13,7 @@ lazy_static! {
+   pub static ref MESSAGES: FluentLanguageLoader = {
+     let locales = Localizations;
+     let loader = fluent_language_loader!();
+-    loader.load_languages(&locales, &[loader.fallback_language()]).unwrap();
++    loader.load_languages(&locales, 
&[loader.fallback_language().clone()]).unwrap();
+ 
+     let _ = i18n_embed::select(&loader, &locales, 
&DesktopLanguageRequester::requested_languages());
+ 
diff -Nru tuigreet-0.9.1/debian/patches/relax_deps.patch 
tuigreet-0.9.1/debian/patches/relax_deps.patch
--- tuigreet-0.9.1/debian/patches/relax_deps.patch      2024-11-24 
17:51:09.000000000 +0000
+++ tuigreet-0.9.1/debian/patches/relax_deps.patch      2024-12-26 
00:17:34.000000000 +0000
@@ -1,11 +1,10 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -19,14 +19,14 @@ i18n-embed = { version = "^0.14", featur
-   "desktop-requester",
-   "fluent-system",
+Index: tuigreet-0.9.1/Cargo.toml
+===================================================================
+--- tuigreet-0.9.1.orig/Cargo.toml
++++ tuigreet-0.9.1/Cargo.toml
+@@ -21,12 +21,12 @@ i18n-embed = { version = "^0.14", featur
  ] }
--i18n-embed-fl = "^0.8"
-+i18n-embed-fl = "^0.7"
+ i18n-embed-fl = "^0.8"
  lazy_static = "^1.4"
 -nix = { version = "^0.28", features = ["feature"] }
 -tui = { package = "ratatui", version = "^0.26", default-features = false, 
features = [
@@ -15,7 +14,7 @@
  ] }
  rust-embed = "^8.0"
 -rust-ini = "^0.21"
-+rust-ini = "^0.18"
++rust-ini = ">= 0.18"
  smart-default = "^0.7"
  textwrap = "^0.16"
  tokio = { version = "^1.2", default-features = false, features = [
diff -Nru tuigreet-0.9.1/debian/patches/series 
tuigreet-0.9.1/debian/patches/series
--- tuigreet-0.9.1/debian/patches/series        2024-11-24 17:51:09.000000000 
+0000
+++ tuigreet-0.9.1/debian/patches/series        2024-12-26 00:17:34.000000000 
+0000
@@ -1,2 +1,3 @@
 relax_deps.patch
 c1251d126efae73accdf26f93256832cd9bb2255.patch
+i18n-embed_0.15.patch

Reply via email to