From 9f8b89168c82e0b4be30e57741d3f9cfdd5bd077 Mon Sep 17 00:00:00 2001
From: Kamil Jarosz <kjarosh256@gmail.com>
Date: Thu, 22 Aug 2024 11:30:16 +0200
Subject: [PATCH] chore: Move rfd dependency to workspace

This makes sure there's only one version of rfd
used and fixes Flatpak compilation issues.
---
 Cargo.lock         | 47 ++--------------------------------------------
 Cargo.toml         |  1 +
 desktop/Cargo.toml |  2 +-
 web/Cargo.toml     |  2 +-
 4 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 99da299e9..47bedefdf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3408,17 +3408,6 @@ dependencies = [
  "malloc_buf",
 ]
 
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
 [[package]]
 name = "objc-sys"
 version = "0.3.5"
@@ -3535,15 +3524,6 @@ dependencies = [
  "objc2-metal",
 ]
 
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
 [[package]]
 name = "object"
 version = "0.35.0"
@@ -4181,29 +4161,6 @@ dependencies = [
  "windows-registry",
 ]
 
-[[package]]
-name = "rfd"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251"
-dependencies = [
- "ashpd",
- "block",
- "dispatch",
- "js-sys",
- "log",
- "objc",
- "objc-foundation",
- "objc_id",
- "pollster",
- "raw-window-handle",
- "urlencoding",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "rfd"
 version = "0.14.1"
@@ -4334,7 +4291,7 @@ dependencies = [
  "image",
  "os_info",
  "rand",
- "rfd 0.14.1 (git+https://github.com/PolyMeilex/rfd.git?rev=42dcc7d61fc5e278b4ed76bb9720ba4d89266f01)",
+ "rfd",
  "ruffle_core",
  "ruffle_frontend_utils",
  "ruffle_render",
@@ -4596,7 +4553,7 @@ dependencies = [
  "getrandom",
  "gloo-net",
  "js-sys",
- "rfd 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rfd",
  "ruffle_core",
  "ruffle_render",
  "ruffle_render_canvas",
diff --git a/Cargo.toml b/Cargo.toml
index c443f087a..a1a44d38b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -73,6 +73,7 @@ url = "2.5.2"
 wasm-bindgen = "=0.2.93"
 walkdir = "2.5.0"
 tokio = { version = "1.39.3" }
+rfd = { git = "https://github.com/PolyMeilex/rfd.git", rev = "42dcc7d61fc5e278b4ed76bb9720ba4d89266f01" }
 
 [workspace.lints.rust]
 # Clippy nightly often adds new/buggy lints that we want to ignore.
diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml
index 4569d5dc7..82db42cdc 100644
--- a/desktop/Cargo.toml
+++ b/desktop/Cargo.toml
@@ -32,7 +32,7 @@ winit = "0.29.15"
 webbrowser = "1.0.1"
 url = { workspace = true }
 dirs = "5.0"
-rfd = { git = "https://github.com/PolyMeilex/rfd.git", rev = "42dcc7d61fc5e278b4ed76bb9720ba4d89266f01" }
+rfd = { workspace = true }
 anyhow = { workspace = true }
 bytemuck = { workspace = true }
 os_info = { version = "3", default-features = false }
diff --git a/web/Cargo.toml b/web/Cargo.toml
index f0e166cb2..6db72a5bc 100644
--- a/web/Cargo.toml
+++ b/web/Cargo.toml
@@ -56,7 +56,7 @@ base64 = "0.22.0"
 async-channel = { workspace = true }
 futures-util = { version = "0.3.30", features = ["sink"] }
 gloo-net =  { version = "0.6.0", default-features = false, features = ["websocket"] }
-rfd = { version = "0.14.1", features = ["file-handle-inner"] }
+rfd = { workspace = true, features = ["file-handle-inner"] }
 wasm-streams = "0.4.0"
 futures = { workspace = true }
 zip = { version = "2.1.6", default-features = false}