From 6deb42dbd50f3633ec83c077dfd56c45a4a2d9e1 Mon Sep 17 00:00:00 2001
From: Martin Robinson <mrobinson@igalia.com>
Date: Wed, 17 Sep 2025 10:04:45 +0200
Subject: [PATCH] servoshell: Switch from `winres` to `winresources` (#39344)

`winres` is unmaintained and it seems like `winresoures` is the
successor.

Testing: This should not have any behavior changes and just modifies
a build step, so shouldn't need tests.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
---
 Cargo.lock                  | 40 +++++++++++++++----------------------
 deny.toml                   |  1 -
 ports/servoshell/Cargo.toml |  2 +-
 ports/servoshell/build.rs   |  2 +-
 4 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 566189a9359..d294be515a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -378,7 +378,7 @@ dependencies = [
  "objc2-foundation 0.3.1",
  "parking_lot",
  "percent-encoding",
- "windows-sys 0.52.0",
+ "windows-sys 0.60.2",
  "x11rb",
 ]
 
@@ -1216,7 +1216,7 @@ dependencies = [
  "serde-untagged",
  "serde-value",
  "thiserror 1.0.69",
- "toml 0.8.23",
+ "toml",
  "unicode-xid",
  "url",
 ]
@@ -2151,7 +2151,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -2556,7 +2556,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -4971,7 +4971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.53.3",
 ]
 
 [[package]]
@@ -7185,7 +7185,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
- "windows-sys 0.52.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -8031,7 +8031,7 @@ dependencies = [
  "webdriver_server",
  "windows-sys 0.61.0",
  "winit",
- "winres",
+ "winresource",
  "xcomponent-sys",
 ]
 
@@ -8580,7 +8580,7 @@ dependencies = [
  "cfg-expr 0.15.8",
  "heck 0.5.0",
  "pkg-config",
- "toml 0.8.23",
+ "toml",
  "version-compare",
 ]
 
@@ -8593,7 +8593,7 @@ dependencies = [
  "cfg-expr 0.20.2",
  "heck 0.5.0",
  "pkg-config",
- "toml 0.8.23",
+ "toml",
  "version-compare",
 ]
 
@@ -8649,7 +8649,7 @@ dependencies = [
  "getrandom 0.3.3",
  "once_cell",
  "rustix 1.0.8",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -8959,15 +8959,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml"
 version = "0.8.23"
@@ -10168,7 +10159,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -10651,12 +10642,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "winres"
-version = "0.1.12"
+name = "winresource"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"
+checksum = "edcacf11b6f48dd21b9ba002f991bdd5de29b2da8cc2800412f4b80f677e4957"
 dependencies = [
- "toml 0.5.11",
+ "toml",
+ "version_check",
 ]
 
 [[package]]
diff --git a/deny.toml b/deny.toml
index 84fdf3a05a4..4d4d1aead03 100644
--- a/deny.toml
+++ b/deny.toml
@@ -97,7 +97,6 @@ skip = [
 
     # New versions of these dependencies is pulled in by GStreamer / GLib.
     "itertools",
-    "toml",
 
     # Duplicated by egui
     "nix",
diff --git a/ports/servoshell/Cargo.toml b/ports/servoshell/Cargo.toml
index 341d671d450..b436072c0f6 100644
--- a/ports/servoshell/Cargo.toml
+++ b/ports/servoshell/Cargo.toml
@@ -26,7 +26,7 @@ bench = false
 cc = "1.2"
 
 [target.'cfg(windows)'.build-dependencies]
-winres = "0.1"
+winresource = "0.1"
 
 [package.metadata.winres]
 FileDescription = "Servo"
diff --git a/ports/servoshell/build.rs b/ports/servoshell/build.rs
index 6fb1f1eca7b..e59c002d30d 100644
--- a/ports/servoshell/build.rs
+++ b/ports/servoshell/build.rs
@@ -50,7 +50,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     if target_os == "windows" {
         #[cfg(windows)]
         {
-            let mut res = winres::WindowsResource::new();
+            let mut res = winresource::WindowsResource::new();
             res.set_icon("../../resources/servo.ico");
             res.set_manifest_file("platform/windows/servo.exe.manifest");
             res.compile().unwrap();