[Pkg-rust-maintainers] Bug#1118392: starship- upcoming rust-quick-xml update

[Peter Michael Green]

Package: starship

I hope to update rust-quick-xml to 0.38 soon. Attatched is a debdiff
that backports the upstream patch to make starship build with the
new version. This dediff also includes the changes for rust-nix 0.30.

-------------- next part --------------
diff -Nru starship-1.22.1/debian/changelog starship-1.22.1/debian/changelog
--- starship-1.22.1/debian/changelog	2025-08-19 09:18:57.000000000 +0000
+++ starship-1.22.1/debian/changelog	2025-09-28 13:09:58.000000000 +0000
@@ -1,3 +1,11 @@
+starship (1.22.1-6.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Relax dependency on nix.
+  * Add upstream patch for quick-xml 0.38
+
+ -- Peter Michael Green <plugwash at debian.org>  Sun, 28 Sep 2025 13:09:58 +0000
+
 starship (1.22.1-6) unstable; urgency=medium
 
   [ Blair Noctis ]
diff -Nru starship-1.22.1/debian/control starship-1.22.1/debian/control
--- starship-1.22.1/debian/control	2025-08-19 09:08:26.000000000 +0000
+++ starship-1.22.1/debian/control	2025-09-28 13:09:58.000000000 +0000
@@ -28,7 +28,7 @@
  librust-pest-dev,
  librust-pest-derive-dev,
  librust-process-control-dev,
- librust-quick-xml-dev,
+ librust-quick-xml-0.38-dev,
  librust-rand-dev,
  librust-rayon-dev,
  librust-regex-dev,
diff -Nru starship-1.22.1/debian/patches/quick-xml-0.38.patch starship-1.22.1/debian/patches/quick-xml-0.38.patch
--- starship-1.22.1/debian/patches/quick-xml-0.38.patch	1970-01-01 00:00:00.000000000 +0000
+++ starship-1.22.1/debian/patches/quick-xml-0.38.patch	2025-09-28 13:09:58.000000000 +0000
@@ -0,0 +1,42 @@
+This patch is based on portions of the upstream commit described below,
+adapted for use in the Debian package by Peter Michael Green.
+
+commit d85ee0a18c17412de42e37d68be35435b182db2c
+Author: David Knaack <davidkna at users.noreply.github.com>
+Date:   Thu Sep 11 22:05:38 2025 +0200
+
+    build(deps): bump schemars, quick-xml & windows (#6928)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 06155465..af952e44 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -62,1 +62,1 @@
+-quick-xml = "0.37.2"
++quick-xml = "0.38.3"
+diff --git a/src/modules/dotnet.rs b/src/modules/dotnet.rs
+index 77e9f0d5..da5df05c 100644
+--- a/src/modules/dotnet.rs
++++ b/src/modules/dotnet.rs
+@@ -119,7 +119,7 @@ fn get_tfm_from_project_file(path: &Path) -> Option<String> {
+             // unescape and decode the text event using the reader encoding
+             Ok(Event::Text(e)) => {
+                 if in_tfm {
+-                    return e.unescape().ok().map(std::borrow::Cow::into_owned);
++                    return e.decode().ok().map(std::borrow::Cow::into_owned);
+                 }
+             }
+             Ok(Event::Eof) => break, // exits the loop when reaching end of file
+diff --git a/src/modules/package.rs b/src/modules/package.rs
+index 01957f8e..2379aeaf 100644
+--- a/src/modules/package.rs
++++ b/src/modules/package.rs
+@@ -188,7 +188,7 @@ fn get_maven_version(context: &Context, config: &PackageConfig) -> Option<String
+                 depth -= 1;
+             }
+             Ok(QXEvent::Text(t)) if in_ver => {
+-                let ver = t.unescape().ok().map(std::borrow::Cow::into_owned);
++                let ver = t.decode().ok().map(std::borrow::Cow::into_owned);
+                 return match ver {
+                     // Ignore version which is just a property reference
+                     Some(ref v) if !v.starts_with('$') => format_version(v, config.version_format),
diff -Nru starship-1.22.1/debian/patches/relax-deps.patch starship-1.22.1/debian/patches/relax-deps.patch
--- starship-1.22.1/debian/patches/relax-deps.patch	2025-08-19 09:08:16.000000000 +0000
+++ starship-1.22.1/debian/patches/relax-deps.patch	2025-09-28 13:09:58.000000000 +0000
@@ -1,7 +1,9 @@
 Forwarded: not-needed
-Last-Update: 2025-03-13
---- a/Cargo.toml
-+++ b/Cargo.toml
+Last-Update: 2025-09-28
+Index: starship-1.22.1/Cargo.toml
+===================================================================
+--- starship-1.22.1.orig/Cargo.toml
++++ starship-1.22.1/Cargo.toml
 @@ -46,2 +46,2 @@
 -clap = { version = "4.5.26", features = ["derive", "cargo", "unicode"] }
 -clap_complete = "4.5.42"
@@ -15,9 +17,6 @@
 -pest_derive = "2.7.15"
 +pest = "2.7"
 +pest_derive = "2.7"
-@@ -66 +66 @@
--quick-xml = "0.37.2"
-+quick-xml = "0.36"
 @@ -71 +71 @@
 -semver = "1.0.24"
 +semver = "1.0"
@@ -39,6 +38,9 @@
 @@ -95 +95 @@
 -libz-ng-sys = { version = "<1.1.20", optional = true }
 +#libz-ng-sys = { version = "<1.1.20", optional = true }
+@@ -117 +117 @@
+-nix = { version = "0.29.0", default-features = false, features = ["feature", "fs", "user"] }
++nix = { version = ">= 0.29.0", default-features = false, features = ["feature", "fs", "user"] }
 @@ -120 +120 @@
 -shadow-rs = { version = "0.37.0", default-features = false }
 +shadow-rs = "1"
diff -Nru starship-1.22.1/debian/patches/series starship-1.22.1/debian/patches/series
--- starship-1.22.1/debian/patches/series	2025-08-19 09:07:50.000000000 +0000
+++ starship-1.22.1/debian/patches/series	2025-09-28 13:09:58.000000000 +0000
@@ -3,3 +3,4 @@
 disable-windows.patch
 inline-guess_host_triple.patch
 turn-off-strip.patch
+quick-xml-0.38.patch