On 19/10/2025 14:06, Johannes Schauer Marin Rodrigues wrote:
Hi,
Quoting Peter Michael Green (2025-10-19 08:27:17)
I replaced .unescape() with .decode() and the code built succesfully, I would
appreciate if the maintainers could test the patch and report back if the
package is still fully functional.
Debdiff is attatched
you forgot to attach the debdiff. :)
Attatched.
Do you see an easy way to support both versions of rust-quick-xml?
Not an obvious one.
diff -Nru reform-setup-wizard-1.0/debian/changelog
reform-setup-wizard-1.0/debian/changelog
--- reform-setup-wizard-1.0/debian/changelog 2025-09-08 06:54:05.000000000
+0000
+++ reform-setup-wizard-1.0/debian/changelog 2025-10-19 06:13:56.000000000
+0000
@@ -1,3 +1,10 @@
+reform-setup-wizard (1.0-14.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch for quick-xml 0.38
+
+ -- Peter Michael Green <[email protected]> Sun, 19 Oct 2025 06:13:56 +0000
+
reform-setup-wizard (1.0-14) unstable; urgency=medium
* debian/source/lintian-overrides: remove unused override for
illegal-runtime-test-name
diff -Nru reform-setup-wizard-1.0/debian/control
reform-setup-wizard-1.0/debian/control
--- reform-setup-wizard-1.0/debian/control 2025-09-08 06:54:05.000000000
+0000
+++ reform-setup-wizard-1.0/debian/control 2025-10-19 06:10:51.000000000
+0000
@@ -11,7 +11,7 @@
librust-gdk-pixbuf-dev (>= 0.21),
librust-libadwaita-dev (>= 0.8.0),
librust-pwhash-dev (>= 1),
- librust-quick-xml-dev (>= 0.27.0),
+ librust-quick-xml-dev (>= 0.38.0),
librust-regex-dev,
libstd-rust-dev,
rustc:native,
diff -Nru reform-setup-wizard-1.0/debian/patches/quick-xml-0.38.patch
reform-setup-wizard-1.0/debian/patches/quick-xml-0.38.patch
--- reform-setup-wizard-1.0/debian/patches/quick-xml-0.38.patch 1970-01-01
00:00:00.000000000 +0000
+++ reform-setup-wizard-1.0/debian/patches/quick-xml-0.38.patch 2025-10-19
06:13:56.000000000 +0000
@@ -0,0 +1,24 @@
+Index: reform-setup-wizard-1.0/Cargo.toml
+===================================================================
+--- reform-setup-wizard-1.0.orig/Cargo.toml
++++ reform-setup-wizard-1.0/Cargo.toml
+@@ -13,5 +13,5 @@ adw = { version = "0.8.0", package = "li
+ gtk = { version = "0.10.0", package = "gtk4", features = ["v4_12"] }
+ gdk-pixbuf = "0.21"
+ regex = ">= 1.10"
+-quick-xml = ">= 0.27.0"
++quick-xml = ">= 0.38.0"
+ pwhash = "1"
+Index: reform-setup-wizard-1.0/src/main.rs
+===================================================================
+--- reform-setup-wizard-1.0.orig/src/main.rs
++++ reform-setup-wizard-1.0/src/main.rs
+@@ -263,7 +263,7 @@ fn parse_keyboard_layout_file(file_path:
+ };
+ },
+ Ok(XmlEvent::Text(e)) if in_layout_list && in_config_item => {
+- let val = e.unescape().unwrap().clone();
++ let val = e.decode().unwrap().clone();
+ if in_name {
+ if in_variant {
+ variant = val.to_string();
diff -Nru reform-setup-wizard-1.0/debian/patches/series
reform-setup-wizard-1.0/debian/patches/series
--- reform-setup-wizard-1.0/debian/patches/series 2025-09-08
06:54:05.000000000 +0000
+++ reform-setup-wizard-1.0/debian/patches/series 2025-10-19
06:09:26.000000000 +0000
@@ -1,3 +1,4 @@
relax-deps
sway-configd.patch
0001-Port-to-gtk-rs-0.10.patch
+quick-xml-0.38.patch
