From 612585109ffc9a14a507c3c8423c6aa790c35cbf Mon Sep 17 00:00:00 2001
From: Richard <richardsoncusto@gmail.com>
Date: Mon, 14 Jun 2021 17:21:55 -0300
Subject: [PATCH] Use `winit` and `glutin` forks in `iced-rs` org

---
 Cargo.toml                |  3 ---
 glutin/Cargo.toml         |  6 ++++--
 glutin/src/application.rs | 10 ++++++++--
 winit/Cargo.toml          |  6 +++++-
 winit/src/application.rs  | 10 ++++++++--
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 789ece88..329877c8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -92,9 +92,6 @@ iced_core = { version = "0.4", path = "core" }
 iced_futures = { version = "0.3", path = "futures" }
 thiserror = "1.0"
 
-[patch.crates-io]
-winit = { git="https://github.com/iced-rs/winit", rev="152eda9b2d995dd0f5b886a53bddac7c75738b47" }
-
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 iced_winit = { version = "0.3", path = "winit" }
 iced_glutin = { version = "0.2", path = "glutin", optional = true }
diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml
index 92aa5018..913ff5b8 100644
--- a/glutin/Cargo.toml
+++ b/glutin/Cargo.toml
@@ -13,8 +13,10 @@ categories = ["gui"]
 [features]
 debug = ["iced_winit/debug"]
 
-[dependencies]
-glutin = "0.27"
+[dependencies.glutin]
+version = "0.27"
+git = "https://github.com/iced-rs/glutin"
+rev = "be6793b5b3defc9452cd1c896cd315ed7442d546"
 
 [dependencies.iced_native]
 version = "0.4"
diff --git a/glutin/src/application.rs b/glutin/src/application.rs
index 22dff149..a8e5dbf9 100644
--- a/glutin/src/application.rs
+++ b/glutin/src/application.rs
@@ -237,9 +237,15 @@ async fn run_instance<A, E, C>(
 
                 context.window().request_redraw();
             }
-            event::Event::PlatformSpecific(event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(url))) => {
+            event::Event::PlatformSpecific(event::PlatformSpecific::MacOS(
+                event::MacOS::ReceivedUrl(url),
+            )) => {
                 use iced_native::event;
-                events.push(iced_native::Event::PlatformSpecific(event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(url))));
+                events.push(iced_native::Event::PlatformSpecific(
+                    event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(
+                        url,
+                    )),
+                ));
             }
             event::Event::UserEvent(message) => {
                 messages.push(message);
diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 4bb46029..b926a9c5 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -14,11 +14,15 @@ categories = ["gui"]
 debug = ["iced_native/debug"]
 
 [dependencies]
-winit = "0.25"
 window_clipboard = "0.2"
 log = "0.4"
 thiserror = "1.0"
 
+[dependencies.winit]
+version = "0.25"
+git = "https://github.com/iced-rs/winit"
+rev = "9c358959ed99736566d50a511b03d2fed3aac2ae"
+
 [dependencies.iced_native]
 version = "0.4"
 path = "../native"
diff --git a/winit/src/application.rs b/winit/src/application.rs
index ce57bd1d..49f2f513 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -310,9 +310,15 @@ async fn run_instance<A, E, C>(
 
                 window.request_redraw();
             }
-            event::Event::PlatformSpecific(event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(url))) => {
+            event::Event::PlatformSpecific(event::PlatformSpecific::MacOS(
+                event::MacOS::ReceivedUrl(url),
+            )) => {
                 use iced_native::event;
-                events.push(iced_native::Event::PlatformSpecific(event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(url))));
+                events.push(iced_native::Event::PlatformSpecific(
+                    event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(
+                        url,
+                    )),
+                ));
             }
             event::Event::UserEvent(message) => {
                 messages.push(message);