public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-wayland-scanner] rawhide: Update quick-xml to 0.40 and similar to v3
@ 2026-06-09  9:31 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-06-09  9:31 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust-wayland-scanner
Branch : rawhide
Commit : 7b7b4dd8b7ee736c95f2009c7571da8d80165b97
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-06-09T06:42:16+01:00
Stats  : +55/-0 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-wayland-scanner/c/7b7b4dd8b7ee736c95f2009c7571da8d80165b97?branch=rawhide

Log:
Update quick-xml to 0.40 and similar to v3

---
diff --git a/rust-wayland-scanner.spec b/rust-wayland-scanner.spec
index 1569e19..d2c68a3 100644
--- a/rust-wayland-scanner.spec
+++ b/rust-wayland-scanner.spec
@@ -12,6 +12,14 @@ Summary:        Wayland Scanner for generating rust APIs from XML wayland protoc
 License:        MIT
 URL:            https://crates.io/crates/wayland-scanner
 Source:         %{crates_source}
+# Manually created patch for downstream crate metadata changes
+# * Update quick-xml (to 0.40) and similar (to v3),
+#   https://github.com/Smithay/wayland-rs/commit/ec2d932855593d48aa83c76820f3efbcfea86d39.
+#   This requires an accompanying source-code patch for quick-xml 0.40.
+Patch:          wayland-scanner-fix-metadata.diff
+# * Source-code patch for API changes in quick-xml 0.40, from
+#   https://github.com/Smithay/wayland-rs/commit/ec2d932855593d48aa83c76820f3efbcfea86d39.
+Patch10:        wayland-scanner-0.31.10-quick-xml-0.40.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 %if %{with check}

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 91cdb7f..65eff68 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,2 +1,21 @@
+[package]
+cargo-toml-patch-comments = [
+    """\
+Update quick-xml (to 0.40) and similar (to v3), \
+https://github.com/Smithay/wayland-rs/commit/ec2d932855593d48aa83c76820f3efbcfea86d39. \
+This requires an accompanying source-code patch for quick-xml 0.40.\
+""",
+]
+
+[[package.extra-patches]]
+number = 10
+file = "wayland-scanner-0.31.10-quick-xml-0.40.patch"
+comments = [
+    """\
+Source-code patch for API changes in quick-xml 0.40, from \
+https://github.com/Smithay/wayland-rs/commit/ec2d932855593d48aa83c76820f3efbcfea86d39.\
+""",
+]
+
 [requires]
 test = ["rustfmt"]

diff --git a/wayland-scanner-0.31.10-quick-xml-0.40.patch b/wayland-scanner-0.31.10-quick-xml-0.40.patch
new file mode 100644
index 0000000..608a277
--- /dev/null
+++ b/wayland-scanner-0.31.10-quick-xml-0.40.patch
@@ -0,0 +1,13 @@
+diff --git a/src/parse.rs b/src/parse.rs
+index 19c34860..ae03ab90 100644
+--- a/src/parse.rs
++++ b/src/parse.rs
+@@ -90,7 +90,7 @@ fn parse_protocol<R: BufRead>(mut reader: Reader<R>) -> Protocol {
+                                 Ok(Event::GeneralRef(byte_ref)) => {
+                                     if let Ok(Some(c)) = byte_ref.resolve_char_ref() {
+                                         copyright.push(c);
+-                                    } else if let Ok(content) = byte_ref.xml_content() {
++                                    } else if let Ok(content) = byte_ref.xml10_content() {
+                                         if let Some(s) =
+                                             quick_xml::escape::resolve_xml_entity(&content)
+                                         {

diff --git a/wayland-scanner-fix-metadata.diff b/wayland-scanner-fix-metadata.diff
new file mode 100644
index 0000000..bbb0ee7
--- /dev/null
+++ b/wayland-scanner-fix-metadata.diff
@@ -0,0 +1,15 @@
+--- wayland-scanner-0.31.10/Cargo.toml	2006-07-24T01:21:28+00:00
++++ wayland-scanner-0.31.10/Cargo.toml	2026-06-09T05:41:34.378741+00:00
+@@ -51,10 +51,10 @@
+ version = "1.0.11"
+ 
+ [dependencies.quick-xml]
+-version = "0.39"
++version = "0.40"
+ 
+ [dependencies.quote]
+ version = "1.0"
+ 
+ [dev-dependencies.similar]
+-version = "2"
++version = "3"

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-09  9:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-09  9:31 [rpms/rust-wayland-scanner] rawhide: Update quick-xml to 0.40 and similar to v3 Benjamin A. Beasley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox