From 62be1e8bfc25bb98c50a61a7356812db708696a6 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Wed, 18 Sep 2024 22:29:28 +0200
Subject: [PATCH] Update to version 0.31.6; Fixes RHBZ#2309823

---
 .gitignore                       |  1 +
 rust-wayland-client.spec         |  7 ++++---
 rust2rpm.toml                    |  7 +++----
 sources                          |  2 +-
 wayland-client-fix-metadata.diff | 13 +++++++++++++
 5 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 wayland-client-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index a86e48f..878d8c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /wayland-client-0.31.2.crate
 /wayland-client-0.31.3.crate
 /wayland-client-0.31.5.crate
+/wayland-client-0.31.6.crate
diff --git a/rust-wayland-client.spec b/rust-wayland-client.spec
index d6d6ce2..00c81e6 100644
--- a/rust-wayland-client.spec
+++ b/rust-wayland-client.spec
@@ -5,13 +5,16 @@
 %global crate wayland-client
 
 Name:           rust-wayland-client
-Version:        0.31.5
+Version:        0.31.6
 Release:        %autorelease
 Summary:        Bindings to the standard C implementation of the wayland protocol, client side
 
 License:        MIT
 URL:            https://crates.io/crates/wayland-client
 Source:         %{crates_source}
+# Manually created patch for downstream crate metadata changes
+# * remove example code with undeclared wayland-protocols dependency
+Patch:          wayland-client-fix-metadata.diff
 
 BuildRequires:  cargo-rpm-macros >= 24
 
@@ -63,8 +66,6 @@ use the "log" feature of the "%{crate}" crate.
 %prep
 %autosetup -n %{crate}-%{version} -p1
 %cargo_prep
-# remove example code with undeclared wayland-protocols dependency
-rm examples/simple_window.rs
 
 %generate_buildrequires
 %cargo_generate_buildrequires
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 3950615..5bbcb28 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,6 +1,5 @@
-[scripts]
-prep.post = [
-    "# remove example code with undeclared wayland-protocols dependency",
-    "rm examples/simple_window.rs",
+[package]
+cargo-toml-patch-comments = [
+    "remove example code with undeclared wayland-protocols dependency",
 ]
 
diff --git a/sources b/sources
index f8a9284..8399085 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wayland-client-0.31.5.crate) = bc49d4c9d4f923ecb4416afb279f45da88742d372e716aa7299fb7b8778268e81e43298fbca122148ddc995fc7350a9bc80c27672603c2bcea834535c6827037
+SHA512 (wayland-client-0.31.6.crate) = 3279f4c706b7b90ede32718c47efaea8a814232fad132362ed91b8db877ae4abcc3b07b9c3b3dd9c259bf880db17f7ec65047aeb77bf5d13a8ed9b1bcc23e37c
diff --git a/wayland-client-fix-metadata.diff b/wayland-client-fix-metadata.diff
new file mode 100644
index 0000000..e6afacf
--- /dev/null
+++ b/wayland-client-fix-metadata.diff
@@ -0,0 +1,13 @@
+--- wayland-client-0.31.6/Cargo.toml	1970-01-01T00:00:01+00:00
++++ wayland-client-0.31.6/Cargo.toml	2024-09-18T20:23:58.827302+00:00
+@@ -53,10 +53,6 @@
+ name = "list_globals_no_dispatch"
+ path = "examples/list_globals_no_dispatch.rs"
+ 
+-[[example]]
+-name = "simple_window"
+-path = "examples/simple_window.rs"
+-
+ [dependencies.bitflags]
+ version = "2"
+