From 51c028059b5ed766f8d829783fbe1f62d24e19e2 Mon Sep 17 00:00:00 2001 From: Benjamin Klum Date: Sun, 9 Oct 2022 11:22:22 +0200 Subject: [PATCH] #698 Fix egui link on Windows (caused panic before) --- Cargo.lock | 175 ++++++++++++++++++++++++++++++++++++++++++++++-- main/Cargo.toml | 4 +- 2 files changed, 170 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5543a5926..1275fe089 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -492,14 +492,14 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "baseview" version = "0.1.0" -source = "git+https://github.com/RustAudio/baseview.git?rev=eae4033e7d2cc9c31ccaa2794d5d08eedf2f510c#eae4033e7d2cc9c31ccaa2794d5d08eedf2f510c" +source = "git+https://github.com/helgoboss/baseview.git?branch=try-borrow-mut#c0b5bd276e65ac38cdd936f654a0e1b3db148825" dependencies = [ "cocoa", "core-foundation 0.9.1", "keyboard-types", "nix 0.22.3", "objc", - "raw-window-handle", + "raw-window-handle 0.4.3", "uuid", "winapi 0.3.9", "x11", @@ -699,6 +699,12 @@ name = "cc" version = "1.0.73" source = "git+https://github.com/petrochenkov/cc-rs.git?rev=4d52bd211aeb2b4ddccd1b9c0a0841e03aaaef7c#4d52bd211aeb2b4ddccd1b9c0a0841e03aaaef7c" +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cexpr" version = "0.3.6" @@ -835,6 +841,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes 1.1.0", + "memchr", +] + [[package]] name = "concurrent-queue" version = "1.2.2" @@ -1021,6 +1037,16 @@ dependencies = [ "darling_macro 0.10.2", ] +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core 0.13.4", + "darling_macro 0.13.4", +] + [[package]] name = "darling" version = "0.14.1" @@ -1045,6 +1071,20 @@ dependencies = [ "syn 1.0.99", ] +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2 1.0.43", + "quote 1.0.21", + "strsim 0.10.0", + "syn 1.0.99", +] + [[package]] name = "darling_core" version = "0.14.1" @@ -1070,6 +1110,17 @@ dependencies = [ "syn 1.0.99", ] +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core 0.13.4", + "quote 1.0.21", + "syn 1.0.99", +] + [[package]] name = "darling_macro" version = "0.14.1" @@ -1244,14 +1295,15 @@ dependencies = [ [[package]] name = "egui-baseview" version = "0.1.0" -source = "git+https://github.com/helgoboss/egui-baseview.git?branch=bug/10-keyboard-layout#0d557346fd3c4e96bfc7d1920d831256906ac34b" +source = "git+https://github.com/helgoboss/egui-baseview.git?branch=feature/open-links-in-browser#7255528576742c4b105253072817b24366f9a35d" dependencies = [ "baseview", "copypasta", "egui", "egui_glow", "keyboard-types", - "raw-window-handle", + "raw-window-handle 0.4.3", + "webbrowser 0.8.0", ] [[package]] @@ -2166,6 +2218,26 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "jobserver" version = "0.1.24" @@ -2609,6 +2681,64 @@ dependencies = [ "rand 0.6.5", ] +[[package]] +name = "ndk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +dependencies = [ + "bitflags", + "jni-sys", + "ndk-sys", + "num_enum 0.5.4", + "raw-window-handle 0.5.0", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-glue" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" +dependencies = [ + "libc", + "log", + "ndk", + "ndk-context", + "ndk-macro", + "ndk-sys", + "once_cell", + "parking_lot 0.12.1", +] + +[[package]] +name = "ndk-macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" +dependencies = [ + "darling 0.13.4", + "proc-macro-crate 1.0.0", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", +] + +[[package]] +name = "ndk-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21d83ec9c63ec5bf950200a8e508bdad6659972187b625469f58ef8c08e29046" +dependencies = [ + "jni-sys", +] + [[package]] name = "net2" version = "0.2.37" @@ -3578,6 +3708,15 @@ dependencies = [ "cty", ] +[[package]] +name = "raw-window-handle" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" +dependencies = [ + "cty", +] + [[package]] name = "rayon" version = "1.5.1" @@ -3743,7 +3882,7 @@ dependencies = [ "validator_derive", "vst", "walkdir", - "webbrowser", + "webbrowser 0.5.5", "webpki 0.21.3", "wildmatch", "winapi 0.3.9", @@ -4530,7 +4669,7 @@ dependencies = [ "bindgen", "objc2", "palette", - "raw-window-handle", + "raw-window-handle 0.4.3", "reaper-low", "reaper-medium", "rx-util", @@ -5440,7 +5579,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecad156490d6b620308ed411cfee90d280b3cbd13e189ea0d3fada8acc89158a" dependencies = [ "web-sys", - "widestring", + "widestring 0.4.3", + "winapi 0.3.9", +] + +[[package]] +name = "webbrowser" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d62aa75495ab67cdc273d0b95cc76bcedfea2ba28338a4cf9b4137949dfac5" +dependencies = [ + "jni", + "ndk-glue", + "objc", + "raw-window-handle 0.5.0", + "url", + "web-sys", + "widestring 1.0.2", "winapi 0.3.9", ] @@ -5505,6 +5660,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + [[package]] name = "wildmatch" version = "2.1.0" diff --git a/main/Cargo.toml b/main/Cargo.toml index d54b91f49..af292a0df 100644 --- a/main/Cargo.toml +++ b/main/Cargo.toml @@ -166,8 +166,8 @@ enigo = "0.0.14" # For the mouse target (to query mouse state) device_query = "1.1.1" # For egui graphics -egui-baseview = { git = "https://github.com/helgoboss/egui-baseview.git", branch = "bug/10-keyboard-layout" } -baseview = { git = "https://github.com/RustAudio/baseview.git", rev = "eae4033e7d2cc9c31ccaa2794d5d08eedf2f510c" } +egui-baseview = { git = "https://github.com/helgoboss/egui-baseview.git", branch = "feature/open-links-in-browser" } +baseview = { git = "https://github.com/helgoboss/baseview.git", branch = "try-borrow-mut" } egui = "0.19.0" [target.'cfg(windows)'.dependencies]