From 2d99a4fbf8b3061bc81a7d397385aa08100415b0 Mon Sep 17 00:00:00 2001 From: Doug Lau Date: Sat, 28 Oct 2023 11:41:46 -0500 Subject: [PATCH 1/5] Vendor gelatin as a module; remove workspace --- Cargo.lock | 1206 +++++++++-------- Cargo.toml | 90 +- LICENSE.txt | 1 + alloy/Cargo.toml | 75 - alloy/build.rs => build.rs | 0 {gelatin/examples => examples}/hello.rs | 0 {alloy => examples}/resource/cogs.png | Bin gelatin/.gitignore | 3 - gelatin/.vscode/launch.json | 20 - gelatin/.vscode/tasks.json | 22 - gelatin/Cargo.toml | 18 - gelatin/LICENSE.txt | 21 - gelatin/README.md | 1 - {alloy/resource => resource}/1-light.png | Bin {alloy/resource => resource}/1.png | Bin .../examples/resource => resource}/cogs.png | Bin {alloy/resource => resource}/copy-failed.png | Bin {alloy/resource => resource}/copy-ready.png | Bin {alloy/resource => resource}/copy-started.png | Bin {alloy/resource => resource}/emulsion48.png | Bin .../resource => resource}/fit-min-light.png | Bin {alloy/resource => resource}/fit-min.png | Bin .../fit-stretch-light.png | Bin {alloy/resource => resource}/fit-stretch.png | Bin {alloy/resource => resource}/light-old.png | Bin {alloy/resource => resource}/light.png | Bin {alloy/resource => resource}/moon.png | Bin .../resource => resource}/question_button.png | Bin .../question_button_light.png | Bin {alloy/resource => resource}/usage.png | Bin .../resource => resource}/use-left-to-pan.png | Bin .../Usage Panel/DejaVuSans.ttf | Bin .../Usage Panel/Emulsion Usage.odt | Bin .../Usage Panel/FiraSans-Regular.ttf | Bin .../Usage Panel/HOW TO EDIT.txt | 0 {alloy/resource_dev => resource_dev}/copy.xcf | Bin .../emulsion.icns | Bin .../emulsion.ico | Bin .../emulsion.png | Bin .../emulsion.svg | 0 .../resource_dev => resource_dev}/light.png | Bin {alloy/resource_dev => resource_dev}/moon.png | Bin .../use-left-to-pan.xcf | Bin {alloy/src => src}/clipboard_handler.rs | 2 +- {alloy/src => src}/cmd_line.rs | 0 {alloy/src => src}/configuration.rs | 0 {gelatin/src => src/gelatin}/application.rs | 2 +- {gelatin/src => src/gelatin}/button.rs | 4 +- {gelatin/src => src/gelatin}/label.rs | 4 +- .../gelatin}/line_layout_container.rs | 4 +- {gelatin/src => src/gelatin}/misc.rs | 0 gelatin/src/lib.rs => src/gelatin/mod.rs | 0 {gelatin/src => src/gelatin}/picture.rs | 11 +- {gelatin/src => src/gelatin}/shaders.rs | 0 .../gelatin}/shaders/color_f_110.glsl | 0 .../gelatin}/shaders/color_f_140.glsl | 0 .../gelatin}/shaders/color_shadow_f_110.glsl | 0 .../gelatin}/shaders/color_shadow_f_140.glsl | 0 .../shaders/texture_shadow_f_110.glsl | 0 .../shaders/texture_shadow_f_140.glsl | 0 .../gelatin}/shaders/vertex_110.glsl | 0 .../gelatin}/shaders/vertex_140.glsl | 0 {gelatin/src => src/gelatin}/slider.rs | 18 +- {gelatin/src => src/gelatin}/window.rs | 18 +- {alloy/src => src}/handle_panic.rs | 0 {alloy/src => src}/image_cache/directory.rs | 0 .../src => src}/image_cache/image_loader.rs | 6 +- {alloy/src => src}/image_cache/mod.rs | 15 +- .../image_cache/pending_requests.rs | 0 {alloy/src => src}/input_handling.rs | 2 +- {alloy/src => src}/main.rs | 29 +- {alloy/src => src}/parallel_action.rs | 0 {alloy/src => src}/playback_manager.rs | 22 +- {alloy/src => src}/shaders.rs | 0 {alloy/src => src}/shaders/fragment_110.glsl | 0 {alloy/src => src}/shaders/fragment_140.glsl | 0 {gelatin/src => src}/shaders/vertex_110.glsl | 0 {gelatin/src => src}/shaders/vertex_140.glsl | 0 {alloy/src => src}/utils.rs | 2 +- {alloy/src => src}/version.rs | 0 {alloy/src => src}/widgets/bottom_bar.rs | 2 +- .../src => src}/widgets/copy_notification.rs | 2 +- {alloy/src => src}/widgets/help_screen.rs | 15 +- {alloy/src => src}/widgets/mod.rs | 0 {alloy/src => src}/widgets/picture_widget.rs | 14 +- 85 files changed, 842 insertions(+), 787 deletions(-) delete mode 100644 alloy/Cargo.toml rename alloy/build.rs => build.rs (100%) rename {gelatin/examples => examples}/hello.rs (100%) rename {alloy => examples}/resource/cogs.png (100%) delete mode 100644 gelatin/.gitignore delete mode 100644 gelatin/.vscode/launch.json delete mode 100644 gelatin/.vscode/tasks.json delete mode 100644 gelatin/Cargo.toml delete mode 100644 gelatin/LICENSE.txt delete mode 100644 gelatin/README.md rename {alloy/resource => resource}/1-light.png (100%) rename {alloy/resource => resource}/1.png (100%) rename {gelatin/examples/resource => resource}/cogs.png (100%) rename {alloy/resource => resource}/copy-failed.png (100%) rename {alloy/resource => resource}/copy-ready.png (100%) rename {alloy/resource => resource}/copy-started.png (100%) rename {alloy/resource => resource}/emulsion48.png (100%) rename {alloy/resource => resource}/fit-min-light.png (100%) rename {alloy/resource => resource}/fit-min.png (100%) rename {alloy/resource => resource}/fit-stretch-light.png (100%) rename {alloy/resource => resource}/fit-stretch.png (100%) rename {alloy/resource => resource}/light-old.png (100%) rename {alloy/resource => resource}/light.png (100%) rename {alloy/resource => resource}/moon.png (100%) rename {alloy/resource => resource}/question_button.png (100%) rename {alloy/resource => resource}/question_button_light.png (100%) rename {alloy/resource => resource}/usage.png (100%) rename {alloy/resource => resource}/use-left-to-pan.png (100%) rename {alloy/resource_dev => resource_dev}/Usage Panel/DejaVuSans.ttf (100%) rename {alloy/resource_dev => resource_dev}/Usage Panel/Emulsion Usage.odt (100%) rename {alloy/resource_dev => resource_dev}/Usage Panel/FiraSans-Regular.ttf (100%) rename {alloy/resource_dev => resource_dev}/Usage Panel/HOW TO EDIT.txt (100%) rename {alloy/resource_dev => resource_dev}/copy.xcf (100%) rename {alloy/resource_dev => resource_dev}/emulsion.icns (100%) rename {alloy/resource_dev => resource_dev}/emulsion.ico (100%) rename {alloy/resource_dev => resource_dev}/emulsion.png (100%) rename {alloy/resource_dev => resource_dev}/emulsion.svg (100%) rename {alloy/resource_dev => resource_dev}/light.png (100%) rename {alloy/resource_dev => resource_dev}/moon.png (100%) rename {alloy/resource_dev => resource_dev}/use-left-to-pan.xcf (100%) rename {alloy/src => src}/clipboard_handler.rs (99%) rename {alloy/src => src}/cmd_line.rs (100%) rename {alloy/src => src}/configuration.rs (100%) rename {gelatin/src => src/gelatin}/application.rs (99%) rename {gelatin/src => src/gelatin}/button.rs (99%) rename {gelatin/src => src/gelatin}/label.rs (98%) rename {gelatin/src => src/gelatin}/line_layout_container.rs (99%) rename {gelatin/src => src/gelatin}/misc.rs (100%) rename gelatin/src/lib.rs => src/gelatin/mod.rs (100%) rename {gelatin/src => src/gelatin}/picture.rs (95%) rename {gelatin/src => src/gelatin}/shaders.rs (100%) rename {gelatin/src => src/gelatin}/shaders/color_f_110.glsl (100%) rename {gelatin/src => src/gelatin}/shaders/color_f_140.glsl (100%) rename {gelatin/src => src/gelatin}/shaders/color_shadow_f_110.glsl (100%) rename {gelatin/src => src/gelatin}/shaders/color_shadow_f_140.glsl (100%) rename {gelatin/src => src/gelatin}/shaders/texture_shadow_f_110.glsl (100%) rename {gelatin/src => src/gelatin}/shaders/texture_shadow_f_140.glsl (100%) rename {alloy/src => src/gelatin}/shaders/vertex_110.glsl (100%) rename {alloy/src => src/gelatin}/shaders/vertex_140.glsl (100%) rename {gelatin/src => src/gelatin}/slider.rs (98%) rename {gelatin/src => src/gelatin}/window.rs (97%) rename {alloy/src => src}/handle_panic.rs (100%) rename {alloy/src => src}/image_cache/directory.rs (100%) rename {alloy/src => src}/image_cache/image_loader.rs (99%) rename {alloy/src => src}/image_cache/mod.rs (99%) rename {alloy/src => src}/image_cache/pending_requests.rs (100%) rename {alloy/src => src}/input_handling.rs (99%) rename {alloy/src => src}/main.rs (97%) rename {alloy/src => src}/parallel_action.rs (100%) rename {alloy/src => src}/playback_manager.rs (96%) rename {alloy/src => src}/shaders.rs (100%) rename {alloy/src => src}/shaders/fragment_110.glsl (100%) rename {alloy/src => src}/shaders/fragment_140.glsl (100%) rename {gelatin/src => src}/shaders/vertex_110.glsl (100%) rename {gelatin/src => src}/shaders/vertex_140.glsl (100%) rename {alloy/src => src}/utils.rs (99%) rename {alloy/src => src}/version.rs (100%) rename {alloy/src => src}/widgets/bottom_bar.rs (99%) rename {alloy/src => src}/widgets/copy_notification.rs (96%) rename {alloy/src => src}/widgets/help_screen.rs (94%) rename {alloy/src => src}/widgets/mod.rs (100%) rename {alloy/src => src}/widgets/picture_widget.rs (99%) diff --git a/Cargo.lock b/Cargo.lock index bc9eb268..a5ca7a7a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,16 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "ab_glyph" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - [[package]] name = "ab_glyph_rasterizer" version = "0.1.8" @@ -48,9 +38,11 @@ version = "1.0.0" dependencies = [ "arboard", "backtrace", + "cgmath", "directories-next", "env_logger", - "gelatin", + "glium", + "image", "kamadak-exif", "lazy_static", "lexical-sort", @@ -63,34 +55,33 @@ dependencies = [ "serde", "sys-info", "thiserror", + "tiny-skia 0.9.1", "toml 0.7.5", "trash", + "typed-builder", + "usvg", + "winit 0.26.1", "winres", ] [[package]] -name = "android-activity" -version = "0.4.2" +name = "andrew" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40bc1575e653f158cbdc6ebcd917b9564e66321c5325c232c3591269c257be69" +checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf" dependencies = [ - "android-properties", "bitflags 1.3.2", - "cc", - "jni-sys", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "num_enum 0.6.1", + "rusttype", + "walkdir", + "xdg", + "xml-rs", ] [[package]] -name = "android-properties" -version = "0.2.2" +name = "android_glue" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" +checksum = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407" [[package]] name = "any_ascii" @@ -114,16 +105,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" dependencies = [ "clipboard-win", - "core-graphics", + "core-graphics 0.22.3", "image", "log", "objc", "objc-foundation", "objc_id", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "thiserror", - "winapi", + "winapi 0.3.9", "x11rb", ] @@ -133,12 +124,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -159,7 +144,7 @@ checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", - "cfg-if", + "cfg-if 1.0.0", "libc", "miniz_oxide", "object", @@ -196,25 +181,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -[[package]] -name = "block-sys" -version = "0.1.0-beta.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" -dependencies = [ - "objc-sys", -] - -[[package]] -name = "block2" -version = "0.2.0-alpha.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" -dependencies = [ - "block-sys", - "objc2-encode", -] - [[package]] name = "bumpalo" version = "3.13.0" @@ -235,16 +201,22 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "calloop" -version = "0.10.6" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" +checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c" dependencies = [ - "bitflags 1.3.2", "log", - "nix 0.25.1", - "slotmap", - "thiserror", - "vec_map", + "nix 0.18.0", +] + +[[package]] +name = "calloop" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf2eec61efe56aa1e813f5126959296933cf0700030e4314786c48779a66ab82" +dependencies = [ + "log", + "nix 0.22.3", ] [[package]] @@ -252,21 +224,18 @@ name = "cc" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -dependencies = [ - "jobserver", -] [[package]] name = "cfg-if" -version = "1.0.0" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] -name = "cfg_aliases" -version = "0.1.1" +name = "cfg-if" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cgl" @@ -295,7 +264,7 @@ checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" dependencies = [ "error-code", "str-buf", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -307,6 +276,22 @@ dependencies = [ "cc", ] +[[package]] +name = "cocoa" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c54201c07dcf3a5ca33fececb8042aed767ee4bfd5a0235a8ceabcda956044b2" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation 0.9.3", + "core-graphics 0.22.3", + "foreign-types", + "libc", + "objc", +] + [[package]] name = "cocoa" version = "0.24.1" @@ -316,9 +301,9 @@ dependencies = [ "bitflags 1.3.2", "block", "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.3.2", + "core-foundation 0.9.3", + "core-graphics 0.22.3", + "foreign-types", "libc", "objc", ] @@ -331,9 +316,9 @@ checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ "bitflags 1.3.2", "block", - "core-foundation", + "core-foundation 0.9.3", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "libc", "objc", ] @@ -344,22 +329,50 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "core-foundation" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +dependencies = [ + "core-foundation-sys 0.7.0", + "libc", +] + [[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.8.4", "libc", ] +[[package]] +name = "core-foundation-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" + [[package]] name = "core-foundation-sys" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +[[package]] +name = "core-graphics" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.7.0", + "foreign-types", + "libc", +] + [[package]] name = "core-graphics" version = "0.22.3" @@ -367,9 +380,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.3", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "libc", ] @@ -380,20 +393,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.3", "libc", ] [[package]] -name = "core-text" -version = "19.2.0" +name = "core-video-sys" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" +checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" dependencies = [ - "core-foundation", - "core-graphics", - "foreign-types 0.3.2", + "cfg-if 0.1.10", + "core-foundation-sys 0.7.0", + "core-graphics 0.19.2", "libc", + "objc", ] [[package]] @@ -402,7 +416,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -411,7 +425,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-utils", ] @@ -421,7 +435,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] @@ -433,7 +447,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 1.0.0", "crossbeam-utils", "memoffset 0.9.0", "scopeguard", @@ -445,30 +459,7 @@ version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossfont" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21fd3add36ea31aba1520aa5288714dd63be506106753226d0eb387a93bc9c45" -dependencies = [ - "cocoa", - "core-foundation", - "core-foundation-sys", - "core-graphics", - "core-text", - "dwrote", - "foreign-types 0.5.0", - "freetype-rs", - "libc", - "log", - "objc", - "once_cell", - "pkg-config", - "servo-fontconfig", - "winapi", + "cfg-if 1.0.0", ] [[package]] @@ -483,14 +474,38 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" +[[package]] +name = "darling" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +dependencies = [ + "darling_core 0.10.2", + "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", - "darling_macro", + "darling_core 0.13.4", + "darling_macro 0.13.4", +] + +[[package]] +name = "darling_core" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.9.3", + "syn 1.0.109", ] [[package]] @@ -503,7 +518,18 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +dependencies = [ + "darling_core 0.10.2", + "quote", "syn 1.0.109", ] @@ -513,7 +539,7 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "darling_core", + "darling_core 0.13.4", "quote", "syn 1.0.109", ] @@ -524,13 +550,24 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "directories-next" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "dirs-sys-next", ] @@ -542,7 +579,7 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", "redox_users", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -551,6 +588,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "dlib" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76" +dependencies = [ + "libloading 0.6.7", +] + [[package]] name = "dlib" version = "0.5.2" @@ -566,20 +612,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" -[[package]] -name = "dwrote" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" -dependencies = [ - "lazy_static", - "libc", - "serde", - "serde_derive", - "winapi", - "wio", -] - [[package]] name = "either" version = "1.8.1" @@ -613,7 +645,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -636,16 +668,6 @@ dependencies = [ "str-buf", ] -[[package]] -name = "expat-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" -dependencies = [ - "cmake", - "pkg-config", -] - [[package]] name = "exr" version = "1.6.5" @@ -726,7 +748,7 @@ dependencies = [ "memmap2 0.6.2", "slotmap", "tinyvec", - "ttf-parser 0.19.1", + "ttf-parser 0.19.2", ] [[package]] @@ -735,28 +757,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.23", + "foreign-types-shared", ] [[package]] @@ -765,12 +766,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - [[package]] name = "form_urlencoded" version = "1.2.0" @@ -781,26 +776,20 @@ dependencies = [ ] [[package]] -name = "freetype-rs" -version = "0.26.0" +name = "fuchsia-zircon" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" dependencies = [ "bitflags 1.3.2", - "freetype-sys", - "libc", + "fuchsia-zircon-sys", ] [[package]] -name = "freetype-sys" -version = "0.13.1" +name = "fuchsia-zircon-sys" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" -dependencies = [ - "cmake", - "libc", - "pkg-config", -] +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futures-core" @@ -814,17 +803,6 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" -[[package]] -name = "gelatin" -version = "0.7.0" -dependencies = [ - "cgmath", - "glium", - "image", - "typed-builder", - "winit 0.28.6", -] - [[package]] name = "gethostname" version = "0.2.3" @@ -832,7 +810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" dependencies = [ "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -841,7 +819,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "libc", "wasi", @@ -877,9 +855,9 @@ dependencies = [ [[package]] name = "glium" -version = "0.32.1" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2766728ecb86014b91d3d687614b32d65aacbbdc887f424a7b03cba3ab593bf" +checksum = "0a58e115545ab8ce2238630c06a60f30a835271e3aff861db08d81561643d7a9" dependencies = [ "backtrace", "fnv", @@ -893,28 +871,29 @@ dependencies = [ [[package]] name = "glutin" -version = "0.29.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444c9ad294fdcaf20ccf6726b78f380b5450275540c9b68ab62f49726ad1c713" +checksum = "1ae1cbb9176b9151c4ce03f012e3cd1c6c18c4be79edeaeb3d99f5d8085c5fa3" dependencies = [ + "android_glue", "cgl", - "cocoa", - "core-foundation", + "cocoa 0.23.0", + "core-foundation 0.9.3", "glutin_egl_sys", + "glutin_emscripten_sys", "glutin_gles2_sys", "glutin_glx_sys", "glutin_wgl_sys", - "libloading 0.7.4", + "lazy_static", + "libloading 0.6.7", "log", "objc", - "once_cell", "osmesa-sys", - "parking_lot", - "raw-window-handle 0.5.2", - "wayland-client", + "parking_lot 0.11.2", + "wayland-client 0.28.6", "wayland-egl", - "winapi", - "winit 0.27.5", + "winapi 0.3.9", + "winit 0.24.0", ] [[package]] @@ -924,9 +903,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68900f84b471f31ea1d1355567eb865a2cf446294f06cef8d653ed7bcf5f013d" dependencies = [ "gl_generator", - "winapi", + "winapi 0.3.9", ] +[[package]] +name = "glutin_emscripten_sys" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80de4146df76e8a6c32b03007bc764ff3249dcaeb4f675d68a06caf1bac363f1" + [[package]] name = "glutin_gles2_sys" version = "0.1.5" @@ -1040,12 +1025,21 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "wasm-bindgen", "web-sys", ] +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + [[package]] name = "is-docker" version = "0.2.0" @@ -1063,7 +1057,7 @@ checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" dependencies = [ "hermit-abi", "rustix", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1082,15 +1076,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - [[package]] name = "jpeg-decoder" version = "0.3.0" @@ -1118,6 +1103,16 @@ dependencies = [ "mutate_once", ] +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + [[package]] name = "khronos_api" version = "3.1.0" @@ -1130,7 +1125,7 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", ] [[package]] @@ -1139,6 +1134,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + [[package]] name = "lebe" version = "0.5.2" @@ -1198,12 +1199,12 @@ checksum = "2449c0cf51b69ae65edb12fa071063e5a51034a8b2347269b5a40aefe2071fcf" [[package]] name = "libloading" -version = "0.7.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" dependencies = [ - "cfg-if", - "winapi", + "cfg-if 1.0.0", + "winapi 0.3.9", ] [[package]] @@ -1212,8 +1213,8 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "cfg-if 1.0.0", + "windows-sys", ] [[package]] @@ -1255,9 +1256,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.10" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357" dependencies = [ "libc", ] @@ -1305,6 +1315,25 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + [[package]] name = "mio" version = "0.8.8" @@ -1314,7 +1343,31 @@ dependencies = [ "libc", "log", "wasi", - "windows-sys 0.48.0", + "windows-sys", +] + +[[package]] +name = "mio-extras" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +dependencies = [ + "lazycell", + "log", + "mio 0.6.23", + "slab", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", ] [[package]] @@ -1334,15 +1387,26 @@ dependencies = [ [[package]] name = "ndk" -version = "0.7.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73" +dependencies = [ + "jni-sys", + "ndk-sys", + "num_enum 0.4.3", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d868f654c72e75f8687572699cdabe755f03effbb62542768e995d5b8d699d" dependencies = [ "bitflags 1.3.2", "jni-sys", "ndk-sys", "num_enum 0.5.11", - "raw-window-handle 0.5.2", "thiserror", ] @@ -1354,18 +1418,44 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-glue" -version = "0.7.0" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdf399b8b7a39c6fb153c4ec32c72fd5fe789df24a647f229c239aa7adb15241" +dependencies = [ + "lazy_static", + "libc", + "log", + "ndk 0.2.1", + "ndk-macro 0.2.0", + "ndk-sys", +] + +[[package]] +name = "ndk-glue" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" +checksum = "c71bee8ea72d685477e28bd004cfe1bf99c754d688cd78cad139eae4089484d4" dependencies = [ + "lazy_static", "libc", "log", - "ndk", + "ndk 0.5.0", "ndk-context", - "ndk-macro", + "ndk-macro 0.3.0", "ndk-sys", - "once_cell", - "parking_lot", +] + +[[package]] +name = "ndk-macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" +dependencies = [ + "darling 0.10.2", + "proc-macro-crate 0.1.5", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -1374,8 +1464,8 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" dependencies = [ - "darling", - "proc-macro-crate", + "darling 0.13.4", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -1383,34 +1473,66 @@ dependencies = [ [[package]] name = "ndk-sys" -version = "0.4.1+23.1.7779620" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" + +[[package]] +name = "net2" +version = "0.2.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" dependencies = [ - "jni-sys", + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", ] [[package]] name = "nix" -version = "0.24.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if 0.1.10", + "libc", +] + +[[package]] +name = "nix" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if 1.0.0", + "libc", +] + +[[package]] +name = "nix" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" dependencies = [ "bitflags 1.3.2", - "cfg-if", + "cc", + "cfg-if 1.0.0", "libc", "memoffset 0.6.5", ] [[package]] name = "nix" -version = "0.25.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "autocfg", "bitflags 1.3.2", - "cfg-if", + "cfg-if 1.0.0", "libc", "memoffset 0.6.5", ] @@ -1467,29 +1589,30 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4" dependencies = [ - "num_enum_derive 0.5.11", + "derivative", + "num_enum_derive 0.4.3", ] [[package]] name = "num_enum" -version = "0.6.1" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive 0.6.1", + "num_enum_derive 0.5.11", ] [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn 1.0.109", @@ -1497,14 +1620,14 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.6.1" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.23", + "syn 1.0.109", ] [[package]] @@ -1527,32 +1650,6 @@ dependencies = [ "objc_id", ] -[[package]] -name = "objc-sys" -version = "0.2.0-beta.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" - -[[package]] -name = "objc2" -version = "0.3.0-beta.3.patch-leaks.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" -dependencies = [ - "block2", - "objc-sys", - "objc2-encode", -] - -[[package]] -name = "objc2-encode" -version = "2.0.0-pre.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" -dependencies = [ - "objc-sys", -] - [[package]] name = "objc_id" version = "0.1.1" @@ -1579,24 +1676,15 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "open" -version = "5.0.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" +checksum = "3a083c0c7e5e4a8ec4176346cf61f67ac674e8bfb059d9226e1c54a96b377c12" dependencies = [ "is-wsl", "libc", "pathdiff", ] -[[package]] -name = "orbclient" -version = "0.3.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1" -dependencies = [ - "redox_syscall 0.3.5", -] - [[package]] name = "osmesa-sys" version = "0.1.2" @@ -1608,11 +1696,22 @@ dependencies = [ [[package]] name = "owned_ttf_parser" -version = "0.19.0" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb" +dependencies = [ + "ttf-parser 0.15.2", +] + +[[package]] +name = "parking_lot" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ - "ttf-parser 0.19.1", + "instant", + "lock_api", + "parking_lot_core 0.8.6", ] [[package]] @@ -1622,7 +1721,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core", + "parking_lot_core 0.9.8", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi 0.3.9", ] [[package]] @@ -1631,7 +1744,7 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall 0.3.5", "smallvec", @@ -1701,6 +1814,15 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "proc-macro-crate" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml 0.5.11", +] + [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -1770,18 +1892,22 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.4.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" +checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" dependencies = [ - "cty", + "libc", + "raw-window-handle 0.4.3", ] [[package]] name = "raw-window-handle" -version = "0.5.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" +checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" +dependencies = [ + "cty", +] [[package]] name = "rayon" @@ -1908,7 +2034,17 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys", +] + +[[package]] +name = "rusttype" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ff8374aa04134254b7995b63ad3dc41c7f7236f69528b28553da7d72efaa967" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", ] [[package]] @@ -1928,12 +2064,12 @@ dependencies = [ ] [[package]] -name = "safe_arch" -version = "0.5.2" +name = "same-file" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" dependencies = [ - "bytemuck", + "winapi-util", ] [[package]] @@ -1948,31 +2084,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sctk-adwaita" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339" -dependencies = [ - "crossfont", - "log", - "smithay-client-toolkit", - "tiny-skia 0.7.0", -] - -[[package]] -name = "sctk-adwaita" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09" -dependencies = [ - "ab_glyph", - "log", - "memmap2 0.5.10", - "smithay-client-toolkit", - "tiny-skia 0.8.4", -] - [[package]] name = "serde" version = "1.0.166" @@ -2002,27 +2113,6 @@ dependencies = [ "serde", ] -[[package]] -name = "servo-fontconfig" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" -dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", -] - [[package]] name = "shared_library" version = "0.1.9" @@ -2054,6 +2144,15 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + [[package]] name = "slotmap" version = "1.0.6" @@ -2071,21 +2170,40 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smithay-client-toolkit" -version = "0.16.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" +checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80" dependencies = [ + "andrew", "bitflags 1.3.2", - "calloop", - "dlib", + "calloop 0.6.5", + "dlib 0.4.2", "lazy_static", "log", - "memmap2 0.5.10", - "nix 0.24.3", + "memmap2 0.1.0", + "nix 0.18.0", + "wayland-client 0.28.6", + "wayland-cursor 0.28.6", + "wayland-protocols 0.28.6", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a28f16a97fa0e8ce563b2774d1e732dd5d4025d2772c5dba0a41a0f90a29da3" +dependencies = [ + "bitflags 1.3.2", + "calloop 0.9.3", + "dlib 0.5.2", + "lazy_static", + "log", + "memmap2 0.3.1", + "nix 0.22.3", "pkg-config", - "wayland-client", - "wayland-cursor", - "wayland-protocols", + "wayland-client 0.29.5", + "wayland-cursor 0.29.5", + "wayland-protocols 0.29.5", ] [[package]] @@ -2112,6 +2230,12 @@ dependencies = [ "float-cmp", ] +[[package]] +name = "strsim" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" + [[package]] name = "strsim" version = "0.10.0" @@ -2208,31 +2332,17 @@ dependencies = [ [[package]] name = "tiny-skia" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "bytemuck", - "cfg-if", - "png", - "safe_arch", - "tiny-skia-path 0.7.0", -] - -[[package]] -name = "tiny-skia" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" +checksum = "ce2986c82f77818c7b9144c70818fdde98db15308e329ae2f7204d767808fd3c" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec", "bytemuck", - "cfg-if", + "cfg-if 1.0.0", + "log", "png", - "tiny-skia-path 0.8.4", + "tiny-skia-path 0.9.0", ] [[package]] @@ -2242,9 +2352,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec", "bytemuck", - "cfg-if", + "cfg-if 1.0.0", "log", "png", "tiny-skia-path 0.10.0", @@ -2252,19 +2362,9 @@ dependencies = [ [[package]] name = "tiny-skia-path" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c" -dependencies = [ - "arrayref", - "bytemuck", -] - -[[package]] -name = "tiny-skia-path" -version = "0.8.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c" +checksum = "f7acb0ccda1ac91084353a56d0b69b0e29c311fd809d2088b1ed2f9ae1841c47" dependencies = [ "arrayref", "bytemuck", @@ -2355,6 +2455,12 @@ dependencies = [ "windows", ] +[[package]] +name = "ttf-parser" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" + [[package]] name = "ttf-parser" version = "0.18.1" @@ -2363,9 +2469,9 @@ checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" [[package]] name = "ttf-parser" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" [[package]] name = "typed-builder" @@ -2501,18 +2607,22 @@ dependencies = [ "tiny-skia-path 0.10.0", ] -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2525,7 +2635,7 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] @@ -2573,6 +2683,22 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +[[package]] +name = "wayland-client" +version = "0.28.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355" +dependencies = [ + "bitflags 1.3.2", + "downcast-rs", + "libc", + "nix 0.20.0", + "scoped-tls", + "wayland-commons 0.28.6", + "wayland-scanner 0.28.6", + "wayland-sys 0.28.6", +] + [[package]] name = "wayland-client" version = "0.29.5" @@ -2584,9 +2710,21 @@ dependencies = [ "libc", "nix 0.24.3", "scoped-tls", - "wayland-commons", - "wayland-scanner", - "wayland-sys", + "wayland-commons 0.29.5", + "wayland-scanner 0.29.5", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-commons" +version = "0.28.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda" +dependencies = [ + "nix 0.20.0", + "once_cell", + "smallvec", + "wayland-sys 0.28.6", ] [[package]] @@ -2598,7 +2736,18 @@ dependencies = [ "nix 0.24.3", "once_cell", "smallvec", - "wayland-sys", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-cursor" +version = "0.28.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a" +dependencies = [ + "nix 0.20.0", + "wayland-client 0.28.6", + "xcursor", ] [[package]] @@ -2608,18 +2757,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" dependencies = [ "nix 0.24.3", - "wayland-client", + "wayland-client 0.29.5", "xcursor", ] [[package]] name = "wayland-egl" -version = "0.29.5" +version = "0.28.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99ba1ab1e18756b23982d36f08856d521d7df45015f404a2d7c4f0b2d2f66956" +dependencies = [ + "wayland-client 0.28.6", + "wayland-sys 0.28.6", +] + +[[package]] +name = "wayland-protocols" +version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402de949f81a012926d821a2d659f930694257e76dd92b6e0042ceb27be4107d" +checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f" dependencies = [ - "wayland-client", - "wayland-sys", + "bitflags 1.3.2", + "wayland-client 0.28.6", + "wayland-commons 0.28.6", + "wayland-scanner 0.28.6", ] [[package]] @@ -2629,9 +2790,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" dependencies = [ "bitflags 1.3.2", - "wayland-client", - "wayland-commons", - "wayland-scanner", + "wayland-client 0.29.5", + "wayland-commons 0.29.5", + "wayland-scanner 0.29.5", +] + +[[package]] +name = "wayland-scanner" +version = "0.28.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", ] [[package]] @@ -2645,13 +2817,24 @@ dependencies = [ "xml-rs", ] +[[package]] +name = "wayland-sys" +version = "0.28.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8" +dependencies = [ + "dlib 0.5.2", + "lazy_static", + "pkg-config", +] + [[package]] name = "wayland-sys" version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" dependencies = [ - "dlib", + "dlib 0.5.2", "lazy_static", "pkg-config", ] @@ -2672,6 +2855,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + [[package]] name = "winapi" version = "0.3.9" @@ -2682,6 +2871,12 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -2694,7 +2889,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -2703,7 +2898,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -2721,28 +2916,6 @@ dependencies = [ "windows-targets 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -2794,12 +2967,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -2812,12 +2979,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -2830,12 +2991,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -2848,12 +3003,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -2878,12 +3027,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -2898,69 +3041,65 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winit" -version = "0.27.5" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" +checksum = "da4eda6fce0eb84bd0a33e3c8794eb902e1033d0a1d5a31bc4f19b1b4bbff597" dependencies = [ "bitflags 1.3.2", - "cocoa", - "core-foundation", - "core-graphics", + "cocoa 0.24.1", + "core-foundation 0.9.3", + "core-graphics 0.22.3", + "core-video-sys", "dispatch", "instant", + "lazy_static", "libc", "log", - "mio", - "ndk", - "ndk-glue", + "mio 0.6.23", + "mio-extras", + "ndk 0.2.1", + "ndk-glue 0.2.1", + "ndk-sys", "objc", - "once_cell", - "parking_lot", + "parking_lot 0.11.2", "percent-encoding", - "raw-window-handle 0.4.3", - "raw-window-handle 0.5.2", - "sctk-adwaita 0.4.3", - "smithay-client-toolkit", - "wasm-bindgen", - "wayland-client", - "wayland-protocols", - "web-sys", - "windows-sys 0.36.1", + "raw-window-handle 0.3.4", + "smithay-client-toolkit 0.12.3", + "wayland-client 0.28.6", + "winapi 0.3.9", "x11-dl", ] [[package]] name = "winit" -version = "0.28.6" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196" +checksum = "9b43cc931d58b99461188607efd7acb2a093e65fc621f54cad78517a6063e73a" dependencies = [ - "android-activity", "bitflags 1.3.2", - "cfg_aliases", - "core-foundation", - "core-graphics", + "cocoa 0.24.1", + "core-foundation 0.9.3", + "core-graphics 0.22.3", + "core-video-sys", "dispatch", "instant", + "lazy_static", "libc", "log", - "mio", - "ndk", - "objc2", - "once_cell", - "orbclient", + "mio 0.8.8", + "ndk 0.5.0", + "ndk-glue 0.5.2", + "ndk-sys", + "objc", + "parking_lot 0.11.2", "percent-encoding", - "raw-window-handle 0.5.2", - "redox_syscall 0.3.5", - "sctk-adwaita 0.5.4", - "smithay-client-toolkit", + "raw-window-handle 0.4.3", + "smithay-client-toolkit 0.15.4", "wasm-bindgen", - "wayland-client", - "wayland-commons", - "wayland-protocols", - "wayland-scanner", + "wayland-client 0.29.5", + "wayland-protocols 0.29.5", "web-sys", - "windows-sys 0.45.0", + "winapi 0.3.9", "x11-dl", ] @@ -2983,12 +3122,13 @@ dependencies = [ ] [[package]] -name = "wio" -version = "0.2.2" +name = "ws2_32-sys" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" dependencies = [ - "winapi", + "winapi 0.2.8", + "winapi-build", ] [[package]] @@ -3010,7 +3150,7 @@ checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" dependencies = [ "gethostname", "nix 0.24.3", - "winapi", + "winapi 0.3.9", "winapi-wsapoll", "x11rb-protocol", ] @@ -3033,6 +3173,12 @@ dependencies = [ "nom", ] +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + [[package]] name = "xml-rs" version = "0.8.15" diff --git a/Cargo.toml b/Cargo.toml index 0e0584e1..33a204f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,82 @@ -[workspace] -members = [ - "alloy", - "gelatin", +[package] +name = "alloy" +version = "1.0.0" +description = "A fast and minimalistic image viewer based on emulsion" +repository = "https://github.com/ardaku/alloy" +license = "MIT" +readme = "README.md" +edition = "2021" +build = "build.rs" + +[package.metadata.bundle] +name = "Emulsion" +identifier = "org.ardaku.alloy" +icon = ["resource_dev/emulsion.png"] +resources = ["LICENSE.txt"] +short_description = "A lightweight and minimalistic image viewer based on emulsion" +copyright = "Copyright (c) 2020 The Emulsion Contributors, Copyright (c) 2022 The Alloy Contributors" +linux_exec_args = "%f" +linux_mime_types = [ + "image/jpeg", + "image/jpg", + "image/pjpeg", + "image/png", + "image/apng", + "image/gif", + "image/webp", + "image/tiff", + "image/bmp", + "image/avif", + "image/svg+xml", + "image/svg", + "image/x-png", + "image/x-tga", + "image/x-targa", + "image/x-bmp", + "image/x-icon", + "image/vnd.microsoft.icon", + "image/vnd.radiance", + "image/x‑portable‑bitmap", + "image/x‑portable‑graymap", + "image/x‑portable‑pixmap", + "image/x‑portable‑anymap" ] -[profile.dev.package."*"] -opt-level = 1 -[profile.dev.build-override] -opt-level = 1 -[profile.release] -lto = "thin" +[features] +default = [] +avif = ["libavif-image"] + +[target.'cfg(windows)'.build-dependencies] +winres = "0.1" + +[dependencies] +arboard = "3.2" +backtrace = "0.3" +cgmath = "0.18" +directories-next = "2.0" +env_logger = "0.10" +glium = "0.29" +image = "0.24" +kamadak-exif = "0.5" +lazy_static = "1.4" +lexical-sort = "0.3" +log = "0.4" +open = "4.1" +pico-args = "0.5" +rand = "0.8" +resvg = "0.35" +serde = { version = "1.0.159", features = ["derive"] } +sys-info = "0.9" +thiserror = "1.0" +tiny-skia = "0.9" +toml = "0.7" +trash = { version = "3.0", default-features = false } +typed-builder = "0.14" +usvg = "0.35" +winit = "0.26" + +[dependencies.libavif-image] +version = "0.10" +default-features = false +features = ["codec-dav1d"] +optional = true diff --git a/LICENSE.txt b/LICENSE.txt index dfaa2b59..64376077 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,7 @@ MIT License Copyright (c) 2020 The Emulsion Contributors +Copyright (c) 2020 Artúr Barnabás Kovács Copyright (c) 2022-2023 The Alloy Contributors Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/alloy/Cargo.toml b/alloy/Cargo.toml deleted file mode 100644 index 14380366..00000000 --- a/alloy/Cargo.toml +++ /dev/null @@ -1,75 +0,0 @@ -[package] -name = "alloy" -version = "1.0.0" -description = "A fast and minimalistic image viewer based on emulsion" -repository = "https://github.com/ardaku/alloy" -license = "MIT" -readme = "README.md" -edition = "2021" -build = "build.rs" - -[package.metadata.bundle] -name = "Emulsion" -identifier = "org.ardaku.alloy" -icon = ["resource_dev/emulsion.png"] -resources = ["LICENSE.txt"] -short_description = "A lightweight and minimalistic image viewer based on emulsion" -copyright = "Copyright (c) 2020 The Emulsion Contributors, Copyright (c) 2022 The Alloy Contributors" -linux_exec_args = "%f" -linux_mime_types = [ - "image/jpeg", - "image/jpg", - "image/pjpeg", - "image/png", - "image/apng", - "image/gif", - "image/webp", - "image/tiff", - "image/bmp", - "image/avif", - "image/svg+xml", - "image/svg", - "image/x-png", - "image/x-tga", - "image/x-targa", - "image/x-bmp", - "image/x-icon", - "image/vnd.microsoft.icon", - "image/vnd.radiance", - "image/x‑portable‑bitmap", - "image/x‑portable‑graymap", - "image/x‑portable‑pixmap", - "image/x‑portable‑anymap" -] - -[features] -avif = ["libavif-image"] - -[target.'cfg(windows)'.build-dependencies] -winres = "0.1" - -[dependencies] -gelatin = { path = "../gelatin", version = "0.7" } -lazy_static = "1.4" -directories-next = "2.0" -open = "5.0" -sys-info = "0.9" -backtrace = "0.3" -serde = { version = "1.0.159", features = ["derive"] } -toml = "0.7" -rand = "0.8" -lexical-sort = "0.3" -trash = { version = "3.0", default-features = false } -kamadak-exif = "0.5" -arboard = "3.2" -resvg = "0.35" -log = "0.4" -env_logger = "0.10" -pico-args = "0.5" -thiserror = "1.0" - -[dependencies.libavif-image] -version = "0.10" -default-features = false -features = ["codec-dav1d"] -optional = true diff --git a/alloy/build.rs b/build.rs similarity index 100% rename from alloy/build.rs rename to build.rs diff --git a/gelatin/examples/hello.rs b/examples/hello.rs similarity index 100% rename from gelatin/examples/hello.rs rename to examples/hello.rs diff --git a/alloy/resource/cogs.png b/examples/resource/cogs.png similarity index 100% rename from alloy/resource/cogs.png rename to examples/resource/cogs.png diff --git a/gelatin/.gitignore b/gelatin/.gitignore deleted file mode 100644 index 69369904..00000000 --- a/gelatin/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -**/*.rs.bk -Cargo.lock diff --git a/gelatin/.vscode/launch.json b/gelatin/.vscode/launch.json deleted file mode 100644 index ed32e553..00000000 --- a/gelatin/.vscode/launch.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "(Windows) Launch", - "type": "cppvsdbg", - "request": "launch", - "program": "${workspaceFolder}/target/debug/examples/hello.exe", - "args": [], - "stopAtEntry": false, - "cwd": "${workspaceFolder}", - "environment": [], - "externalConsole": false, - "preLaunchTask": "cargo build hello" - } - ] -} \ No newline at end of file diff --git a/gelatin/.vscode/tasks.json b/gelatin/.vscode/tasks.json deleted file mode 100644 index c051bd6e..00000000 --- a/gelatin/.vscode/tasks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "cargo build", - "type": "cargo", - "subcommand": "build", - "problemMatcher": [ - "$rustc" - ], - "group": "build" - }, - { - "label": "cargo build hello", - "type": "shell", - "command": "cargo build --example hello", - "group": "build", - } - ] -} \ No newline at end of file diff --git a/gelatin/Cargo.toml b/gelatin/Cargo.toml deleted file mode 100644 index e807f439..00000000 --- a/gelatin/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "gelatin" -version = "0.7.0" -description = "A basic UI framework" -repository = "https://github.com/ArturKovacs/emulsion" -authors = ["Artur Barnabas "] -license = "MIT" -readme = "README.md" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -cgmath = "0.18" -typed-builder = "0.14" -image = "0.24" -glium = "0.32" -winit = "0.28" diff --git a/gelatin/LICENSE.txt b/gelatin/LICENSE.txt deleted file mode 100644 index 9c5c265c..00000000 --- a/gelatin/LICENSE.txt +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020 Artúr Barnabás Kovács - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/gelatin/README.md b/gelatin/README.md deleted file mode 100644 index d223789b..00000000 --- a/gelatin/README.md +++ /dev/null @@ -1 +0,0 @@ -This crate is a minimal UI framework that was built to be used by the [Emulsion](https://github.com/ArturKovacs/emulsion) program. diff --git a/alloy/resource/1-light.png b/resource/1-light.png similarity index 100% rename from alloy/resource/1-light.png rename to resource/1-light.png diff --git a/alloy/resource/1.png b/resource/1.png similarity index 100% rename from alloy/resource/1.png rename to resource/1.png diff --git a/gelatin/examples/resource/cogs.png b/resource/cogs.png similarity index 100% rename from gelatin/examples/resource/cogs.png rename to resource/cogs.png diff --git a/alloy/resource/copy-failed.png b/resource/copy-failed.png similarity index 100% rename from alloy/resource/copy-failed.png rename to resource/copy-failed.png diff --git a/alloy/resource/copy-ready.png b/resource/copy-ready.png similarity index 100% rename from alloy/resource/copy-ready.png rename to resource/copy-ready.png diff --git a/alloy/resource/copy-started.png b/resource/copy-started.png similarity index 100% rename from alloy/resource/copy-started.png rename to resource/copy-started.png diff --git a/alloy/resource/emulsion48.png b/resource/emulsion48.png similarity index 100% rename from alloy/resource/emulsion48.png rename to resource/emulsion48.png diff --git a/alloy/resource/fit-min-light.png b/resource/fit-min-light.png similarity index 100% rename from alloy/resource/fit-min-light.png rename to resource/fit-min-light.png diff --git a/alloy/resource/fit-min.png b/resource/fit-min.png similarity index 100% rename from alloy/resource/fit-min.png rename to resource/fit-min.png diff --git a/alloy/resource/fit-stretch-light.png b/resource/fit-stretch-light.png similarity index 100% rename from alloy/resource/fit-stretch-light.png rename to resource/fit-stretch-light.png diff --git a/alloy/resource/fit-stretch.png b/resource/fit-stretch.png similarity index 100% rename from alloy/resource/fit-stretch.png rename to resource/fit-stretch.png diff --git a/alloy/resource/light-old.png b/resource/light-old.png similarity index 100% rename from alloy/resource/light-old.png rename to resource/light-old.png diff --git a/alloy/resource/light.png b/resource/light.png similarity index 100% rename from alloy/resource/light.png rename to resource/light.png diff --git a/alloy/resource/moon.png b/resource/moon.png similarity index 100% rename from alloy/resource/moon.png rename to resource/moon.png diff --git a/alloy/resource/question_button.png b/resource/question_button.png similarity index 100% rename from alloy/resource/question_button.png rename to resource/question_button.png diff --git a/alloy/resource/question_button_light.png b/resource/question_button_light.png similarity index 100% rename from alloy/resource/question_button_light.png rename to resource/question_button_light.png diff --git a/alloy/resource/usage.png b/resource/usage.png similarity index 100% rename from alloy/resource/usage.png rename to resource/usage.png diff --git a/alloy/resource/use-left-to-pan.png b/resource/use-left-to-pan.png similarity index 100% rename from alloy/resource/use-left-to-pan.png rename to resource/use-left-to-pan.png diff --git a/alloy/resource_dev/Usage Panel/DejaVuSans.ttf b/resource_dev/Usage Panel/DejaVuSans.ttf similarity index 100% rename from alloy/resource_dev/Usage Panel/DejaVuSans.ttf rename to resource_dev/Usage Panel/DejaVuSans.ttf diff --git a/alloy/resource_dev/Usage Panel/Emulsion Usage.odt b/resource_dev/Usage Panel/Emulsion Usage.odt similarity index 100% rename from alloy/resource_dev/Usage Panel/Emulsion Usage.odt rename to resource_dev/Usage Panel/Emulsion Usage.odt diff --git a/alloy/resource_dev/Usage Panel/FiraSans-Regular.ttf b/resource_dev/Usage Panel/FiraSans-Regular.ttf similarity index 100% rename from alloy/resource_dev/Usage Panel/FiraSans-Regular.ttf rename to resource_dev/Usage Panel/FiraSans-Regular.ttf diff --git a/alloy/resource_dev/Usage Panel/HOW TO EDIT.txt b/resource_dev/Usage Panel/HOW TO EDIT.txt similarity index 100% rename from alloy/resource_dev/Usage Panel/HOW TO EDIT.txt rename to resource_dev/Usage Panel/HOW TO EDIT.txt diff --git a/alloy/resource_dev/copy.xcf b/resource_dev/copy.xcf similarity index 100% rename from alloy/resource_dev/copy.xcf rename to resource_dev/copy.xcf diff --git a/alloy/resource_dev/emulsion.icns b/resource_dev/emulsion.icns similarity index 100% rename from alloy/resource_dev/emulsion.icns rename to resource_dev/emulsion.icns diff --git a/alloy/resource_dev/emulsion.ico b/resource_dev/emulsion.ico similarity index 100% rename from alloy/resource_dev/emulsion.ico rename to resource_dev/emulsion.ico diff --git a/alloy/resource_dev/emulsion.png b/resource_dev/emulsion.png similarity index 100% rename from alloy/resource_dev/emulsion.png rename to resource_dev/emulsion.png diff --git a/alloy/resource_dev/emulsion.svg b/resource_dev/emulsion.svg similarity index 100% rename from alloy/resource_dev/emulsion.svg rename to resource_dev/emulsion.svg diff --git a/alloy/resource_dev/light.png b/resource_dev/light.png similarity index 100% rename from alloy/resource_dev/light.png rename to resource_dev/light.png diff --git a/alloy/resource_dev/moon.png b/resource_dev/moon.png similarity index 100% rename from alloy/resource_dev/moon.png rename to resource_dev/moon.png diff --git a/alloy/resource_dev/use-left-to-pan.xcf b/resource_dev/use-left-to-pan.xcf similarity index 100% rename from alloy/resource_dev/use-left-to-pan.xcf rename to resource_dev/use-left-to-pan.xcf diff --git a/alloy/src/clipboard_handler.rs b/src/clipboard_handler.rs similarity index 99% rename from alloy/src/clipboard_handler.rs rename to src/clipboard_handler.rs index bd9df7ee..4545ddaa 100644 --- a/alloy/src/clipboard_handler.rs +++ b/src/clipboard_handler.rs @@ -6,7 +6,7 @@ use std::{ }, }; -use gelatin::image::imageops::{ +use image::imageops::{ flip_horizontal_in_place, flip_vertical_in_place, rotate180_in_place, rotate270, rotate90, }; diff --git a/alloy/src/cmd_line.rs b/src/cmd_line.rs similarity index 100% rename from alloy/src/cmd_line.rs rename to src/cmd_line.rs diff --git a/alloy/src/configuration.rs b/src/configuration.rs similarity index 100% rename from alloy/src/configuration.rs rename to src/configuration.rs diff --git a/gelatin/src/application.rs b/src/gelatin/application.rs similarity index 99% rename from gelatin/src/application.rs rename to src/gelatin/application.rs index 197288db..2302273b 100644 --- a/gelatin/src/application.rs +++ b/src/gelatin/application.rs @@ -11,7 +11,7 @@ use glium::glutin::{ window::WindowId, }; -use crate::{window::Window, NextUpdate}; +use crate::gelatin::{window::Window, NextUpdate}; const MAX_SLEEP_DURATION: std::time::Duration = std::time::Duration::from_millis(4); diff --git a/gelatin/src/button.rs b/src/gelatin/button.rs similarity index 99% rename from gelatin/src/button.rs rename to src/gelatin/button.rs index 1c127beb..a680ed6e 100644 --- a/gelatin/src/button.rs +++ b/src/gelatin/button.rs @@ -6,8 +6,8 @@ use glium::{ uniform, Frame, Surface, }; -use crate::{ - add_common_widget_functions, +use crate::add_common_widget_functions; +use crate::gelatin::{ misc::{Alignment, Length, LogicalRect, LogicalVector, WidgetPlacement}, picture::Picture, window::RenderValidity, diff --git a/gelatin/src/label.rs b/src/gelatin/label.rs similarity index 98% rename from gelatin/src/label.rs rename to src/gelatin/label.rs index 7179d94f..e0a4a787 100644 --- a/gelatin/src/label.rs +++ b/src/gelatin/label.rs @@ -3,8 +3,8 @@ use std::{cell::RefCell, rc::Rc}; use cgmath::{Matrix4, Vector3}; use glium::{uniform, Frame, Surface}; -use crate::{ - add_common_widget_functions, +use crate::add_common_widget_functions; +use crate::gelatin::{ misc::{Alignment, Length, LogicalRect, LogicalVector, WidgetPlacement}, picture::Picture, window::RenderValidity, diff --git a/gelatin/src/line_layout_container.rs b/src/gelatin/line_layout_container.rs similarity index 99% rename from gelatin/src/line_layout_container.rs rename to src/gelatin/line_layout_container.rs index 1269d076..fe8e4057 100644 --- a/gelatin/src/line_layout_container.rs +++ b/src/gelatin/line_layout_container.rs @@ -2,8 +2,8 @@ use std::{cell::RefCell, rc::Rc}; use glium::Frame; -use crate::{ - add_common_widget_functions, +use crate::add_common_widget_functions; +use crate::gelatin::{ misc::{ Alignment, HorDim, Length, LogicalRect, LogicalVector, PickDimension, VerDim, WidgetPlacement, diff --git a/gelatin/src/misc.rs b/src/gelatin/misc.rs similarity index 100% rename from gelatin/src/misc.rs rename to src/gelatin/misc.rs diff --git a/gelatin/src/lib.rs b/src/gelatin/mod.rs similarity index 100% rename from gelatin/src/lib.rs rename to src/gelatin/mod.rs diff --git a/gelatin/src/picture.rs b/src/gelatin/picture.rs similarity index 95% rename from gelatin/src/picture.rs rename to src/gelatin/picture.rs index e656ac76..020e2a72 100644 --- a/gelatin/src/picture.rs +++ b/src/gelatin/picture.rs @@ -4,7 +4,8 @@ use std::{ path, }; -use glium::texture::{RawImage2d, SrgbTexture2d}; +use glium::texture::{MipmapsOption, RawImage2d, SrgbTexture2d}; +use glium::Display; use image::{error::ImageError, RgbaImage}; pub struct PictureTextureRef<'a> { @@ -95,7 +96,7 @@ impl Picture { pub fn texture( &self, - display: &glium::Display, + display: &Display, ) -> Result { self.upload_to_texture(display)?; if let PictureData::Gpu(_) = &*self.data.borrow() { @@ -109,7 +110,7 @@ impl Picture { fn upload_to_texture( &self, - display: &glium::Display, + display: &Display, ) -> Result<(), ImageError> { let mut borrowed = self.data.borrow_mut(); let mut tmp_picture = PictureData::Path("".into()); @@ -142,14 +143,14 @@ impl Picture { fn cpu_to_texture( img: RgbaImage, - display: &glium::Display, + display: &Display, ) -> SrgbTexture2d { let image_dimensions = img.dimensions(); let image = RawImage2d::from_raw_rgba(img.into_raw(), image_dimensions); SrgbTexture2d::with_mipmaps( display, image, - glium::texture::MipmapsOption::AutoGeneratedMipmaps, + MipmapsOption::AutoGeneratedMipmaps, ) .unwrap() } diff --git a/gelatin/src/shaders.rs b/src/gelatin/shaders.rs similarity index 100% rename from gelatin/src/shaders.rs rename to src/gelatin/shaders.rs diff --git a/gelatin/src/shaders/color_f_110.glsl b/src/gelatin/shaders/color_f_110.glsl similarity index 100% rename from gelatin/src/shaders/color_f_110.glsl rename to src/gelatin/shaders/color_f_110.glsl diff --git a/gelatin/src/shaders/color_f_140.glsl b/src/gelatin/shaders/color_f_140.glsl similarity index 100% rename from gelatin/src/shaders/color_f_140.glsl rename to src/gelatin/shaders/color_f_140.glsl diff --git a/gelatin/src/shaders/color_shadow_f_110.glsl b/src/gelatin/shaders/color_shadow_f_110.glsl similarity index 100% rename from gelatin/src/shaders/color_shadow_f_110.glsl rename to src/gelatin/shaders/color_shadow_f_110.glsl diff --git a/gelatin/src/shaders/color_shadow_f_140.glsl b/src/gelatin/shaders/color_shadow_f_140.glsl similarity index 100% rename from gelatin/src/shaders/color_shadow_f_140.glsl rename to src/gelatin/shaders/color_shadow_f_140.glsl diff --git a/gelatin/src/shaders/texture_shadow_f_110.glsl b/src/gelatin/shaders/texture_shadow_f_110.glsl similarity index 100% rename from gelatin/src/shaders/texture_shadow_f_110.glsl rename to src/gelatin/shaders/texture_shadow_f_110.glsl diff --git a/gelatin/src/shaders/texture_shadow_f_140.glsl b/src/gelatin/shaders/texture_shadow_f_140.glsl similarity index 100% rename from gelatin/src/shaders/texture_shadow_f_140.glsl rename to src/gelatin/shaders/texture_shadow_f_140.glsl diff --git a/alloy/src/shaders/vertex_110.glsl b/src/gelatin/shaders/vertex_110.glsl similarity index 100% rename from alloy/src/shaders/vertex_110.glsl rename to src/gelatin/shaders/vertex_110.glsl diff --git a/alloy/src/shaders/vertex_140.glsl b/src/gelatin/shaders/vertex_140.glsl similarity index 100% rename from alloy/src/shaders/vertex_140.glsl rename to src/gelatin/shaders/vertex_140.glsl diff --git a/gelatin/src/slider.rs b/src/gelatin/slider.rs similarity index 98% rename from gelatin/src/slider.rs rename to src/gelatin/slider.rs index b4d51ed0..a4a61632 100644 --- a/gelatin/src/slider.rs +++ b/src/gelatin/slider.rs @@ -1,17 +1,18 @@ use std::{cell::RefCell, rc::Rc}; use cgmath::{Matrix4, Vector3}; -use glium::{ - glutin::event::{ElementState, MouseButton}, - uniform, Frame, Surface, -}; - -use crate::{ - add_common_widget_functions, +use crate::add_common_widget_functions; +use crate::gelatin::{ misc::{Alignment, Length, LogicalRect, LogicalVector, WidgetPlacement}, window::RenderValidity, DrawContext, Event, EventKind, NextUpdate, Widget, WidgetData, WidgetError, }; +use glium::{ + glutin::event::{ElementState, MouseButton}, + DrawParameters, + Blend, BlendingFunction, LinearBlendingFactor, + uniform, Frame, Surface, +}; struct SliderData { placement: WidgetPlacement, @@ -112,7 +113,6 @@ impl Widget for Slider { target: &mut Frame, context: &DrawContext, ) -> Result { - use glium::{Blend, BlendingFunction, LinearBlendingFactor}; { let borrowed = self.data.borrow(); if !borrowed.visible { @@ -126,7 +126,7 @@ impl Widget for Slider { //let width = borrowed.drawn_bounds.size.vec.x; //let height = borrowed.drawn_bounds.size.vec.y; - let image_draw_params = glium::DrawParameters { + let image_draw_params = DrawParameters { viewport: Some(*context.viewport), blend: Blend { color: BlendingFunction::Addition { diff --git a/gelatin/src/window.rs b/src/gelatin/window.rs similarity index 97% rename from gelatin/src/window.rs rename to src/gelatin/window.rs index 0843567a..90b2449c 100644 --- a/gelatin/src/window.rs +++ b/src/gelatin/window.rs @@ -8,18 +8,20 @@ use std::{ use cgmath::{ortho, Matrix4, Vector3}; use glium::{ + index::PrimitiveType, glutin::{ self, dpi::{PhysicalPosition, PhysicalSize}, event::WindowEvent, window::{CursorIcon, Icon, WindowId}, }, - program, uniform, Blend, BlendingFunction, Display, Frame, IndexBuffer, + program, uniform, Blend, BlendingFunction, Display, DrawParameters, Frame, IndexBuffer, Program, Rect, Surface, VertexBuffer, }; use typed_builder::TypedBuilder; -use crate::{ +use crate::VerticalLayoutContainer; +use crate::gelatin::{ application::Application, misc::{FromPhysical, LogicalRect, LogicalVector}, shaders, DrawContext, Event, EventKind, NextUpdate, Vertex, Widget, @@ -84,7 +86,7 @@ pub struct WindowDescriptor { type WindowGlobalEventHandler = Box; struct WindowData { - display: glium::Display, + display: Display, size_before_fullscreen: PhysicalSize, fullscreen: bool, last_mouse_move_update_time: std::time::Instant, @@ -144,7 +146,7 @@ impl Window { .with_gl_profile(glutin::GlProfile::Core) .with_vsync(true); let display = - glium::Display::new(window, context, &application.event_loop) + Display::new(window, context, &application.event_loop) .unwrap(); if let Some(pos) = desc.position { @@ -158,7 +160,6 @@ impl Window { .set_cursor_icon(CursorIcon::Default); // All the draw stuff - use glium::index::PrimitiveType; let vertex_buffer = { VertexBuffer::new( &display, @@ -243,8 +244,7 @@ impl Window { validity: Rc::new(Cell::new(false)), }, root_widget: Rc::new( - crate::line_layout_container::VerticalLayoutContainer::new( - ), + VerticalLayoutContainer::new(), ), bg_color: [0.85, 0.85, 0.85, 1.0], @@ -473,7 +473,7 @@ impl Window { /// WARNING The window may not be changed during the drawing phase. /// This means that trying to borrow the window *mutably* in a widget's /// draw function will fail. - pub fn redraw(&self) -> crate::NextUpdate { + pub fn redraw(&self) -> NextUpdate { // Using a scope to only borrow the data mutable for the very beggining. { let mut borrowed = self.data.borrow_mut(); @@ -596,7 +596,7 @@ impl Window { let transform = Matrix4::from_translation(Vector3::new(-1.0, -1.0, 0.0)) * transform; - let image_draw_params = glium::DrawParameters { + let image_draw_params = DrawParameters { blend: Blend { color: BlendingFunction::Max, alpha: BlendingFunction::Max, diff --git a/alloy/src/handle_panic.rs b/src/handle_panic.rs similarity index 100% rename from alloy/src/handle_panic.rs rename to src/handle_panic.rs diff --git a/alloy/src/image_cache/directory.rs b/src/image_cache/directory.rs similarity index 100% rename from alloy/src/image_cache/directory.rs rename to src/image_cache/directory.rs diff --git a/alloy/src/image_cache/image_loader.rs b/src/image_cache/image_loader.rs similarity index 99% rename from alloy/src/image_cache/image_loader.rs rename to src/image_cache/image_loader.rs index d5170713..1c8637b6 100644 --- a/alloy/src/image_cache/image_loader.rs +++ b/src/image_cache/image_loader.rs @@ -10,7 +10,7 @@ use std::{ thread, }; -use gelatin::image::{ +use image::{ self, codecs::{gif::GifDecoder, png::PngDecoder}, AnimationDecoder, ImageFormat, @@ -23,9 +23,7 @@ use resvg::{ pub mod errors { use std::io; - - use gelatin::{glium::texture, image}; - use resvg::usvg; + use glium::texture; pub type Result = std::result::Result; diff --git a/alloy/src/image_cache/mod.rs b/src/image_cache/mod.rs similarity index 99% rename from alloy/src/image_cache/mod.rs rename to src/image_cache/mod.rs index e4cea807..f51210f1 100644 --- a/alloy/src/image_cache/mod.rs +++ b/src/image_cache/mod.rs @@ -13,13 +13,10 @@ use std::{ time::SystemTime, }; -use gelatin::{ - glium::{ - self, - texture::{MipmapsOption, RawImage2d, SrgbTexture2d}, - CapabilitiesSource, - }, - image, +use glium::{ + self, + texture::{MipmapsOption, RawImage2d, SrgbTexture2d}, + CapabilitiesSource, }; use log::trace; @@ -31,9 +28,7 @@ use self::{ pub mod errors { use std::io; - - use gelatin::{glium::texture, image}; - + use glium::texture; use crate::image_cache::image_loader; pub type Result = std::result::Result; diff --git a/alloy/src/image_cache/pending_requests.rs b/src/image_cache/pending_requests.rs similarity index 100% rename from alloy/src/image_cache/pending_requests.rs rename to src/image_cache/pending_requests.rs diff --git a/alloy/src/input_handling.rs b/src/input_handling.rs similarity index 99% rename from alloy/src/input_handling.rs rename to src/input_handling.rs index ed37558e..6ac0f28d 100644 --- a/alloy/src/input_handling.rs +++ b/src/input_handling.rs @@ -1,6 +1,6 @@ use std::{cell::RefCell, collections::HashMap, process::Command, rc::Rc}; -use gelatin::glium::glutin::event::ModifiersState; +use glium::glutin::event::ModifiersState; use lazy_static::lazy_static; use crate::configuration::Configuration; diff --git a/alloy/src/main.rs b/src/main.rs similarity index 97% rename from alloy/src/main.rs rename to src/main.rs index 54cf7bdb..ede10262 100644 --- a/alloy/src/main.rs +++ b/src/main.rs @@ -9,25 +9,25 @@ use std::{ }; use directories_next::ProjectDirs; -use gelatin::{ - application::*, - glium::glutin::{ - dpi::{PhysicalPosition, PhysicalSize}, - event::WindowEvent, - window::Icon, - }, - image, - label::*, - line_layout_container::*, - misc::*, - picture::*, - window::{Window, WindowDescriptor}, -}; use lazy_static::lazy_static; use log::trace; use crate::{ configuration::{Cache, ConfigWindowSection, Configuration, Theme}, + gelatin::{ + application::*, + glium::glutin::{ + dpi::{PhysicalPosition, PhysicalSize}, + event::WindowEvent, + window::Icon, + }, + image, + label::*, + line_layout_container::*, + misc::*, + picture::*, + window::{Window, WindowDescriptor}, + }, widgets::{ bottom_bar::BottomBar, copy_notification::CopyNotifications, help_screen::*, picture_widget::*, @@ -37,6 +37,7 @@ use crate::{ mod clipboard_handler; mod cmd_line; mod configuration; +mod gelatin; mod handle_panic; mod image_cache; mod input_handling; diff --git a/alloy/src/parallel_action.rs b/src/parallel_action.rs similarity index 100% rename from alloy/src/parallel_action.rs rename to src/parallel_action.rs diff --git a/alloy/src/playback_manager.rs b/src/playback_manager.rs similarity index 96% rename from alloy/src/playback_manager.rs rename to src/playback_manager.rs index 0d01f28f..839842cc 100644 --- a/alloy/src/playback_manager.rs +++ b/src/playback_manager.rs @@ -7,7 +7,7 @@ use std::{ time::{Duration, Instant}, }; -use gelatin::{glium::Display, window::Window}; +use crate::gelatin::{NextUpdate, glium::Display, window::Window}; use log::{debug, trace}; use rand::{seq::SliceRandom, thread_rng}; @@ -272,7 +272,7 @@ impl PlaybackManager { &self.folder_player.file_path } - pub fn update_image(&mut self, window: &Window) -> gelatin::NextUpdate { + pub fn update_image(&mut self, window: &Window) -> NextUpdate { let display = window.display_mut(); let prev_file = self.folder_player.image_texture(); let next_update = self @@ -379,7 +379,7 @@ impl ImgSequencePlayer

{ &mut self, display: &Display, image_cache: &mut ImageCache, - ) -> gelatin::NextUpdate { + ) -> NextUpdate { trace!( "Begin `update_image`. Curr image is: {:?}. Load request is {:?}", self.file_path, @@ -388,7 +388,7 @@ impl ImgSequencePlayer

{ let is_paused = matches!(self.playback_state, PlaybackState::Paused); let no_request = matches!(self.load_request, LoadRequest::None); if self.file_path.is_none() && no_request && is_paused { - return gelatin::NextUpdate::Latest; + return NextUpdate::Latest; } let now = Instant::now(); let few_millisecs_from_now = @@ -416,11 +416,11 @@ impl ImgSequencePlayer

{ LoadRequest::Jump(0) => { // Waiting on current image to be loaded. next_update = - gelatin::NextUpdate::WaitUntil(few_millisecs_from_now); + NextUpdate::WaitUntil(few_millisecs_from_now); } _ => { image_cache.prefetch_neighbors(); - next_update = gelatin::NextUpdate::Latest; + next_update = NextUpdate::Latest; } } } else if load_request == LoadRequest::None { @@ -432,7 +432,7 @@ impl ImgSequencePlayer

{ let nanos_til_next = frame_delta_time_nanos - elapsed_nanos; let millis_til_next = nanos_til_next / 1_000_000; - next_update = gelatin::NextUpdate::WaitUntil( + next_update = NextUpdate::WaitUntil( now.checked_add(Duration::from_millis( (millis_til_next / 2).max(1) as u64, )) @@ -484,7 +484,7 @@ impl ImgSequencePlayer

{ as i64 { // Just buisy wait if we are getting very close to the next frame swap - next_update = gelatin::NextUpdate::Soonest; + next_update = NextUpdate::Soonest; } else { match self.playback_state { PlaybackState::RandomPresent => { @@ -500,13 +500,13 @@ impl ImgSequencePlayer

{ } } else { next_update = - gelatin::NextUpdate::WaitUntil(few_millisecs_from_now); + NextUpdate::WaitUntil(few_millisecs_from_now); } match load_request { LoadRequest::None | LoadRequest::FilePath(..) => (), _ => { if image_cache.current_dir_len() == Some(0) { - return gelatin::NextUpdate::Latest; + return NextUpdate::Latest; } } } @@ -539,7 +539,7 @@ impl ImgSequencePlayer

{ // next time we attempt to load this again. self.load_request = LoadRequest::Jump(0); next_update = - gelatin::NextUpdate::WaitUntil(few_millisecs_from_now); + NextUpdate::WaitUntil(few_millisecs_from_now); } Err(err) => { self.image_texture = None; diff --git a/alloy/src/shaders.rs b/src/shaders.rs similarity index 100% rename from alloy/src/shaders.rs rename to src/shaders.rs diff --git a/alloy/src/shaders/fragment_110.glsl b/src/shaders/fragment_110.glsl similarity index 100% rename from alloy/src/shaders/fragment_110.glsl rename to src/shaders/fragment_110.glsl diff --git a/alloy/src/shaders/fragment_140.glsl b/src/shaders/fragment_140.glsl similarity index 100% rename from alloy/src/shaders/fragment_140.glsl rename to src/shaders/fragment_140.glsl diff --git a/gelatin/src/shaders/vertex_110.glsl b/src/shaders/vertex_110.glsl similarity index 100% rename from gelatin/src/shaders/vertex_110.glsl rename to src/shaders/vertex_110.glsl diff --git a/gelatin/src/shaders/vertex_140.glsl b/src/shaders/vertex_140.glsl similarity index 100% rename from gelatin/src/shaders/vertex_140.glsl rename to src/shaders/vertex_140.glsl diff --git a/alloy/src/utils.rs b/src/utils.rs similarity index 99% rename from alloy/src/utils.rs rename to src/utils.rs index 25d75f35..d448cde6 100644 --- a/alloy/src/utils.rs +++ b/src/utils.rs @@ -1,4 +1,4 @@ -use gelatin::glium::glutin::event::VirtualKeyCode; +use crate::gelatin::glium::glutin::event::VirtualKeyCode; pub fn virtual_keycode_is_char(vk: VirtualKeyCode) -> bool { #[allow(clippy::match_like_matches_macro)] diff --git a/alloy/src/version.rs b/src/version.rs similarity index 100% rename from alloy/src/version.rs rename to src/version.rs diff --git a/alloy/src/widgets/bottom_bar.rs b/src/widgets/bottom_bar.rs similarity index 99% rename from alloy/src/widgets/bottom_bar.rs rename to src/widgets/bottom_bar.rs index 4762a193..2a5dddad 100644 --- a/alloy/src/widgets/bottom_bar.rs +++ b/src/widgets/bottom_bar.rs @@ -1,6 +1,6 @@ use std::{f32, rc::Rc}; -use gelatin::{ +use crate::gelatin::{ button::Button, line_layout_container::HorizontalLayoutContainer, misc::{Alignment, Length}, diff --git a/alloy/src/widgets/copy_notification.rs b/src/widgets/copy_notification.rs similarity index 96% rename from alloy/src/widgets/copy_notification.rs rename to src/widgets/copy_notification.rs index 1df31f49..5f323da0 100644 --- a/alloy/src/widgets/copy_notification.rs +++ b/src/widgets/copy_notification.rs @@ -3,7 +3,7 @@ use std::{ time::{Duration, Instant}, }; -use gelatin::{label::Label, misc::*, picture::Picture, NextUpdate, Widget}; +use crate::gelatin::{label::Label, misc::*, picture::Picture, NextUpdate, Widget}; static COPY_STARTED: &[u8] = include_bytes!("../../resource/copy-started.png"); static COPY_READY: &[u8] = include_bytes!("../../resource/copy-ready.png"); diff --git a/alloy/src/widgets/help_screen.rs b/src/widgets/help_screen.rs similarity index 94% rename from alloy/src/widgets/help_screen.rs rename to src/widgets/help_screen.rs index afb10904..1b8972dc 100644 --- a/alloy/src/widgets/help_screen.rs +++ b/src/widgets/help_screen.rs @@ -1,7 +1,8 @@ use std::{cell::RefCell, rc::Rc}; -use gelatin::{ - add_common_widget_functions, +use crate::add_common_widget_functions; +use crate::gelatin::{ + glium, cgmath::{Matrix4, Vector3}, glium::{uniform, Frame, Surface}, misc::{Alignment, Length, LogicalRect, LogicalVector, WidgetPlacement}, @@ -70,7 +71,7 @@ impl Widget for HelpScreen { target: &mut Frame, context: &DrawContext, ) -> Result { - use gelatin::glium::{Blend, BlendingFunction, LinearBlendingFactor}; + use glium::{Blend, BlendingFunction, LinearBlendingFactor}; { let borrowed = self.data.borrow(); if !borrowed.visible { @@ -86,7 +87,7 @@ impl Widget for HelpScreen { Matrix4::from_translation(pos.extend(0.0)) * transform; // Projection let transform = context.projection_transform * transform; - let image_draw_params = gelatin::glium::DrawParameters { + let image_draw_params = glium::DrawParameters { viewport: Some(*context.viewport), blend: Blend { color: BlendingFunction::Addition { @@ -133,13 +134,13 @@ impl Widget for HelpScreen { let sampler = texture .sampled() .wrap_function( - gelatin::glium::uniforms::SamplerWrapFunction::Clamp, + glium::uniforms::SamplerWrapFunction::Clamp, ) .minify_filter( - gelatin::glium::uniforms::MinifySamplerFilter::Linear, + glium::uniforms::MinifySamplerFilter::Linear, ) .magnify_filter( - gelatin::glium::uniforms::MagnifySamplerFilter::Linear, + glium::uniforms::MagnifySamplerFilter::Linear, ); let uniforms = uniform! { matrix: Into::<[[f32; 4]; 4]>::into(transform), diff --git a/alloy/src/widgets/mod.rs b/src/widgets/mod.rs similarity index 100% rename from alloy/src/widgets/mod.rs rename to src/widgets/mod.rs diff --git a/alloy/src/widgets/picture_widget.rs b/src/widgets/picture_widget.rs similarity index 99% rename from alloy/src/widgets/picture_widget.rs rename to src/widgets/picture_widget.rs index a1fe57da..5064100d 100644 --- a/alloy/src/widgets/picture_widget.rs +++ b/src/widgets/picture_widget.rs @@ -6,11 +6,12 @@ use std::{ time::{Duration, Instant}, }; -use gelatin::{ - add_common_widget_functions, +use crate::gelatin::{ application::request_exit, + cgmath, cgmath::{Matrix4, Vector2, Vector3}, glium::{ + self, glutin::event::{ElementState, ModifiersState, MouseButton}, program, uniform, uniforms::MagnifySamplerFilter, @@ -26,6 +27,7 @@ use super::{ help_screen::HelpScreen, }; use crate::{ + add_common_widget_functions, clipboard_handler::ClipboardHandler, configuration::{Antialias, Cache, Configuration}, image_cache::{image_loader::Orientation, AnimationFrameTexture}, @@ -1087,10 +1089,10 @@ fn draw_tex_grid( ) { let size = data.drawn_bounds.size.vec; let projection_transform = - gelatin::cgmath::ortho(0.0, size.x, size.y, 0.0, -1.0, 1.0); + cgmath::ortho(0.0, size.x, size.y, 0.0, -1.0, 1.0); let viewport_rect = context.logical_rect_to_viewport(&data.drawn_bounds); - let image_draw_params = gelatin::glium::DrawParameters { + let image_draw_params = glium::DrawParameters { viewport: Some(viewport_rect), ..Default::default() }; @@ -1177,8 +1179,8 @@ fn draw_tex_grid( let sampler = cell_tex .tex .sampled() - .minify_filter(gelatin::glium::uniforms::MinifySamplerFilter::LinearMipmapLinear) - .wrap_function(gelatin::glium::uniforms::SamplerWrapFunction::Clamp); + .minify_filter(glium::uniforms::MinifySamplerFilter::LinearMipmapLinear) + .wrap_function(glium::uniforms::SamplerWrapFunction::Clamp); let filter = match data.antialiasing { Antialias::Auto From 6d2affdebcf28434fc4dbe56d7e9b7282f8828ce Mon Sep 17 00:00:00 2001 From: Doug Lau Date: Sat, 28 Oct 2023 12:26:33 -0500 Subject: [PATCH 2/5] Restore winit to 0.28; glium to 0.32 --- Cargo.lock | 1193 +++++++++++++++++++++++----------------------------- Cargo.toml | 4 +- 2 files changed, 536 insertions(+), 661 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a5ca7a7a..f06bdc00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,16 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "ab_glyph" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1061f3ff92c2f65800df1f12fc7b4ff44ee14783104187dd04dfee6f11b0fd2" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + [[package]] name = "ab_glyph_rasterizer" version = "0.1.8" @@ -60,28 +70,33 @@ dependencies = [ "trash", "typed-builder", "usvg", - "winit 0.26.1", + "winit 0.28.7", "winres", ] [[package]] -name = "andrew" -version = "0.3.1" +name = "android-activity" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" dependencies = [ + "android-properties", "bitflags 1.3.2", - "rusttype", - "walkdir", - "xdg", - "xml-rs", + "cc", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum 0.6.1", ] [[package]] -name = "android_glue" -version = "0.2.3" +name = "android-properties" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" [[package]] name = "any_ascii" @@ -105,16 +120,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" dependencies = [ "clipboard-win", - "core-graphics 0.22.3", + "core-graphics", "image", "log", "objc", "objc-foundation", "objc_id", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "thiserror", - "winapi 0.3.9", + "winapi", "x11rb", ] @@ -124,6 +139,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + [[package]] name = "arrayvec" version = "0.7.4" @@ -144,7 +165,7 @@ checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -181,6 +202,25 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" +[[package]] +name = "block-sys" +version = "0.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +dependencies = [ + "block-sys", + "objc2-encode", +] + [[package]] name = "bumpalo" version = "3.13.0" @@ -201,22 +241,16 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "calloop" -version = "0.6.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c" -dependencies = [ - "log", - "nix 0.18.0", -] - -[[package]] -name = "calloop" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf2eec61efe56aa1e813f5126959296933cf0700030e4314786c48779a66ab82" +checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" dependencies = [ + "bitflags 1.3.2", "log", - "nix 0.22.3", + "nix 0.25.1", + "slotmap", + "thiserror", + "vec_map", ] [[package]] @@ -224,18 +258,21 @@ name = "cc" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] [[package]] name = "cfg-if" -version = "0.1.10" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "cfg-if" -version = "1.0.0" +name = "cfg_aliases" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "cgl" @@ -264,7 +301,7 @@ checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" dependencies = [ "error-code", "str-buf", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -276,22 +313,6 @@ dependencies = [ "cc", ] -[[package]] -name = "cocoa" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54201c07dcf3a5ca33fececb8042aed767ee4bfd5a0235a8ceabcda956044b2" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation 0.9.3", - "core-graphics 0.22.3", - "foreign-types", - "libc", - "objc", -] - [[package]] name = "cocoa" version = "0.24.1" @@ -301,9 +322,9 @@ dependencies = [ "bitflags 1.3.2", "block", "cocoa-foundation", - "core-foundation 0.9.3", - "core-graphics 0.22.3", - "foreign-types", + "core-foundation", + "core-graphics", + "foreign-types 0.3.2", "libc", "objc", ] @@ -316,9 +337,9 @@ checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ "bitflags 1.3.2", "block", - "core-foundation 0.9.3", + "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "libc", "objc", ] @@ -329,50 +350,22 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - [[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys 0.8.4", + "core-foundation-sys", "libc", ] -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - [[package]] name = "core-foundation-sys" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" -[[package]] -name = "core-graphics" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.7.0", - "foreign-types", - "libc", -] - [[package]] name = "core-graphics" version = "0.22.3" @@ -380,9 +373,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.3", + "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "libc", ] @@ -393,21 +386,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.3", + "core-foundation", "libc", ] [[package]] -name = "core-video-sys" -version = "0.1.4" +name = "core-text" +version = "19.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" +checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" dependencies = [ - "cfg-if 0.1.10", - "core-foundation-sys 0.7.0", - "core-graphics 0.19.2", + "core-foundation", + "core-graphics", + "foreign-types 0.3.2", "libc", - "objc", ] [[package]] @@ -416,7 +408,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -425,7 +417,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -435,7 +427,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -447,7 +439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "memoffset 0.9.0", "scopeguard", @@ -459,7 +451,30 @@ version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", +] + +[[package]] +name = "crossfont" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21fd3add36ea31aba1520aa5288714dd63be506106753226d0eb387a93bc9c45" +dependencies = [ + "cocoa", + "core-foundation", + "core-foundation-sys", + "core-graphics", + "core-text", + "dwrote", + "foreign-types 0.5.0", + "freetype-rs", + "libc", + "log", + "objc", + "once_cell", + "pkg-config", + "servo-fontconfig", + "winapi", ] [[package]] @@ -474,38 +489,14 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "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_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn 1.0.109", + "darling_core", + "darling_macro", ] [[package]] @@ -518,18 +509,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", + "strsim", "syn 1.0.109", ] @@ -539,7 +519,7 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "darling_core 0.13.4", + "darling_core", "quote", "syn 1.0.109", ] @@ -550,24 +530,13 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "directories-next" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -579,7 +548,7 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -588,15 +557,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" -[[package]] -name = "dlib" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76" -dependencies = [ - "libloading 0.6.7", -] - [[package]] name = "dlib" version = "0.5.2" @@ -612,6 +572,20 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +[[package]] +name = "dwrote" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +dependencies = [ + "lazy_static", + "libc", + "serde", + "serde_derive", + "winapi", + "wio", +] + [[package]] name = "either" version = "1.8.1" @@ -645,7 +619,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -668,6 +642,16 @@ dependencies = [ "str-buf", ] +[[package]] +name = "expat-sys" +version = "2.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" +dependencies = [ + "cmake", + "pkg-config", +] + [[package]] name = "exr" version = "1.6.5" @@ -757,7 +741,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.23", ] [[package]] @@ -766,6 +771,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" version = "1.2.0" @@ -776,20 +787,26 @@ dependencies = [ ] [[package]] -name = "fuchsia-zircon" -version = "0.3.3" +name = "freetype-rs" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" dependencies = [ "bitflags 1.3.2", - "fuchsia-zircon-sys", + "freetype-sys", + "libc", ] [[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" +name = "freetype-sys" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" +dependencies = [ + "cmake", + "libc", + "pkg-config", +] [[package]] name = "futures-core" @@ -810,7 +827,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -819,7 +836,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi", @@ -855,9 +872,9 @@ dependencies = [ [[package]] name = "glium" -version = "0.29.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a58e115545ab8ce2238630c06a60f30a835271e3aff861db08d81561643d7a9" +checksum = "d2766728ecb86014b91d3d687614b32d65aacbbdc887f424a7b03cba3ab593bf" dependencies = [ "backtrace", "fnv", @@ -871,29 +888,28 @@ dependencies = [ [[package]] name = "glutin" -version = "0.26.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ae1cbb9176b9151c4ce03f012e3cd1c6c18c4be79edeaeb3d99f5d8085c5fa3" +checksum = "444c9ad294fdcaf20ccf6726b78f380b5450275540c9b68ab62f49726ad1c713" dependencies = [ - "android_glue", "cgl", - "cocoa 0.23.0", - "core-foundation 0.9.3", + "cocoa", + "core-foundation", "glutin_egl_sys", - "glutin_emscripten_sys", "glutin_gles2_sys", "glutin_glx_sys", "glutin_wgl_sys", - "lazy_static", - "libloading 0.6.7", + "libloading 0.7.4", "log", "objc", + "once_cell", "osmesa-sys", - "parking_lot 0.11.2", - "wayland-client 0.28.6", + "parking_lot", + "raw-window-handle 0.5.2", + "wayland-client", "wayland-egl", - "winapi 0.3.9", - "winit 0.24.0", + "winapi", + "winit 0.27.5", ] [[package]] @@ -903,15 +919,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68900f84b471f31ea1d1355567eb865a2cf446294f06cef8d653ed7bcf5f013d" dependencies = [ "gl_generator", - "winapi 0.3.9", + "winapi", ] -[[package]] -name = "glutin_emscripten_sys" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80de4146df76e8a6c32b03007bc764ff3249dcaeb4f675d68a06caf1bac363f1" - [[package]] name = "glutin_gles2_sys" version = "0.1.5" @@ -1025,21 +1035,12 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", ] -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - [[package]] name = "is-docker" version = "0.2.0" @@ -1057,7 +1058,7 @@ checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" dependencies = [ "hermit-abi", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1076,6 +1077,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + [[package]] name = "jpeg-decoder" version = "0.3.0" @@ -1103,16 +1113,6 @@ dependencies = [ "mutate_once", ] -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "khronos_api" version = "3.1.0" @@ -1125,7 +1125,7 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ - "arrayvec", + "arrayvec 0.7.4", ] [[package]] @@ -1134,12 +1134,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "lebe" version = "0.5.2" @@ -1199,12 +1193,12 @@ checksum = "2449c0cf51b69ae65edb12fa071063e5a51034a8b2347269b5a40aefe2071fcf" [[package]] name = "libloading" -version = "0.6.7" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", + "cfg-if", + "winapi", ] [[package]] @@ -1213,8 +1207,8 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" dependencies = [ - "cfg-if 1.0.0", - "windows-sys", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] @@ -1256,18 +1250,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.1.0" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ "libc", ] @@ -1315,25 +1300,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - [[package]] name = "mio" version = "0.8.8" @@ -1343,31 +1309,7 @@ dependencies = [ "libc", "log", "wasi", - "windows-sys", -] - -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio 0.6.23", - "slab", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1387,26 +1329,15 @@ dependencies = [ [[package]] name = "ndk" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73" -dependencies = [ - "jni-sys", - "ndk-sys", - "num_enum 0.4.3", - "thiserror", -] - -[[package]] -name = "ndk" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d868f654c72e75f8687572699cdabe755f03effbb62542768e995d5b8d699d" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ "bitflags 1.3.2", "jni-sys", "ndk-sys", "num_enum 0.5.11", + "raw-window-handle 0.5.2", "thiserror", ] @@ -1418,44 +1349,18 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-glue" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf399b8b7a39c6fb153c4ec32c72fd5fe789df24a647f229c239aa7adb15241" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk 0.2.1", - "ndk-macro 0.2.0", - "ndk-sys", -] - -[[package]] -name = "ndk-glue" -version = "0.5.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71bee8ea72d685477e28bd004cfe1bf99c754d688cd78cad139eae4089484d4" +checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" dependencies = [ - "lazy_static", "libc", "log", - "ndk 0.5.0", + "ndk", "ndk-context", - "ndk-macro 0.3.0", + "ndk-macro", "ndk-sys", -] - -[[package]] -name = "ndk-macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" -dependencies = [ - "darling 0.10.2", - "proc-macro-crate 0.1.5", - "proc-macro2", - "quote", - "syn 1.0.109", + "once_cell", + "parking_lot", ] [[package]] @@ -1464,8 +1369,8 @@ 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.3.1", + "darling", + "proc-macro-crate", "proc-macro2", "quote", "syn 1.0.109", @@ -1473,66 +1378,34 @@ dependencies = [ [[package]] name = "ndk-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" - -[[package]] -name = "net2" -version = "0.2.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "nix" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if 0.1.10", - "libc", -] - -[[package]] -name = "nix" -version = "0.20.0" +version = "0.4.1+23.1.7779620" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if 1.0.0", - "libc", + "jni-sys", ] [[package]] name = "nix" -version = "0.22.3" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags 1.3.2", - "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset 0.6.5", ] [[package]] name = "nix" -version = "0.24.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ + "autocfg", "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset 0.6.5", ] @@ -1589,30 +1462,29 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.4.3" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "derivative", - "num_enum_derive 0.4.3", + "num_enum_derive 0.5.11", ] [[package]] name = "num_enum" -version = "0.5.11" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" dependencies = [ - "num_enum_derive 0.5.11", + "num_enum_derive 0.6.1", ] [[package]] name = "num_enum_derive" -version = "0.4.3" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate 0.1.5", + "proc-macro-crate", "proc-macro2", "quote", "syn 1.0.109", @@ -1620,14 +1492,14 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.23", ] [[package]] @@ -1650,6 +1522,32 @@ dependencies = [ "objc_id", ] +[[package]] +name = "objc-sys" +version = "0.2.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" + +[[package]] +name = "objc2" +version = "0.3.0-beta.3.patch-leaks.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +dependencies = [ + "block2", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys", +] + [[package]] name = "objc_id" version = "0.1.1" @@ -1686,32 +1584,30 @@ dependencies = [ ] [[package]] -name = "osmesa-sys" -version = "0.1.2" +name = "orbclient" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" dependencies = [ - "shared_library", + "redox_syscall 0.3.5", ] [[package]] -name = "owned_ttf_parser" -version = "0.15.2" +name = "osmesa-sys" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb" +checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" dependencies = [ - "ttf-parser 0.15.2", + "shared_library", ] [[package]] -name = "parking_lot" -version = "0.11.2" +name = "owned_ttf_parser" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", + "ttf-parser 0.19.2", ] [[package]] @@ -1721,21 +1617,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi 0.3.9", + "parking_lot_core", ] [[package]] @@ -1744,7 +1626,7 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall 0.3.5", "smallvec", @@ -1814,15 +1696,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml 0.5.11", -] - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -1892,22 +1765,18 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" +checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" dependencies = [ - "libc", - "raw-window-handle 0.4.3", + "cty", ] [[package]] name = "raw-window-handle" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" @@ -2034,17 +1903,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "rusttype" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff8374aa04134254b7995b63ad3dc41c7f7236f69528b28553da7d72efaa967" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", + "windows-sys 0.48.0", ] [[package]] @@ -2064,12 +1923,12 @@ dependencies = [ ] [[package]] -name = "same-file" -version = "1.0.6" +name = "safe_arch" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" dependencies = [ - "winapi-util", + "bytemuck", ] [[package]] @@ -2084,6 +1943,31 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sctk-adwaita" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339" +dependencies = [ + "crossfont", + "log", + "smithay-client-toolkit", + "tiny-skia 0.7.0", +] + +[[package]] +name = "sctk-adwaita" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09" +dependencies = [ + "ab_glyph", + "log", + "memmap2 0.5.10", + "smithay-client-toolkit", + "tiny-skia 0.8.4", +] + [[package]] name = "serde" version = "1.0.166" @@ -2113,6 +1997,27 @@ dependencies = [ "serde", ] +[[package]] +name = "servo-fontconfig" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" +dependencies = [ + "libc", + "servo-fontconfig-sys", +] + +[[package]] +name = "servo-fontconfig-sys" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" +dependencies = [ + "expat-sys", + "freetype-sys", + "pkg-config", +] + [[package]] name = "shared_library" version = "0.1.9" @@ -2144,15 +2049,6 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - [[package]] name = "slotmap" version = "1.0.6" @@ -2170,40 +2066,21 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smithay-client-toolkit" -version = "0.12.3" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80" +checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" dependencies = [ - "andrew", "bitflags 1.3.2", - "calloop 0.6.5", - "dlib 0.4.2", + "calloop", + "dlib", "lazy_static", "log", - "memmap2 0.1.0", - "nix 0.18.0", - "wayland-client 0.28.6", - "wayland-cursor 0.28.6", - "wayland-protocols 0.28.6", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a28f16a97fa0e8ce563b2774d1e732dd5d4025d2772c5dba0a41a0f90a29da3" -dependencies = [ - "bitflags 1.3.2", - "calloop 0.9.3", - "dlib 0.5.2", - "lazy_static", - "log", - "memmap2 0.3.1", - "nix 0.22.3", + "memmap2 0.5.10", + "nix 0.24.3", "pkg-config", - "wayland-client 0.29.5", - "wayland-cursor 0.29.5", - "wayland-protocols 0.29.5", + "wayland-client", + "wayland-cursor", + "wayland-protocols", ] [[package]] @@ -2230,12 +2107,6 @@ dependencies = [ "float-cmp", ] -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "strsim" version = "0.10.0" @@ -2330,6 +2201,35 @@ dependencies = [ "weezl", ] +[[package]] +name = "tiny-skia" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "bytemuck", + "cfg-if", + "png", + "safe_arch", + "tiny-skia-path 0.7.0", +] + +[[package]] +name = "tiny-skia" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "bytemuck", + "cfg-if", + "png", + "tiny-skia-path 0.8.4", +] + [[package]] name = "tiny-skia" version = "0.9.1" @@ -2337,9 +2237,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce2986c82f77818c7b9144c70818fdde98db15308e329ae2f7204d767808fd3c" dependencies = [ "arrayref", - "arrayvec", + "arrayvec 0.7.4", "bytemuck", - "cfg-if 1.0.0", + "cfg-if", "log", "png", "tiny-skia-path 0.9.0", @@ -2352,14 +2252,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" dependencies = [ "arrayref", - "arrayvec", + "arrayvec 0.7.4", "bytemuck", - "cfg-if 1.0.0", + "cfg-if", "log", "png", "tiny-skia-path 0.10.0", ] +[[package]] +name = "tiny-skia-path" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c" +dependencies = [ + "arrayref", + "bytemuck", +] + +[[package]] +name = "tiny-skia-path" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + [[package]] name = "tiny-skia-path" version = "0.9.0" @@ -2455,12 +2376,6 @@ dependencies = [ "windows", ] -[[package]] -name = "ttf-parser" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" - [[package]] name = "ttf-parser" version = "0.18.1" @@ -2608,20 +2523,16 @@ dependencies = [ ] [[package]] -name = "version_check" -version = "0.9.4" +name = "vec_map" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] -name = "walkdir" -version = "2.4.0" +name = "version_check" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasi" @@ -2635,7 +2546,7 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -2683,22 +2594,6 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" -[[package]] -name = "wayland-client" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix 0.20.0", - "scoped-tls", - "wayland-commons 0.28.6", - "wayland-scanner 0.28.6", - "wayland-sys 0.28.6", -] - [[package]] name = "wayland-client" version = "0.29.5" @@ -2710,21 +2605,9 @@ dependencies = [ "libc", "nix 0.24.3", "scoped-tls", - "wayland-commons 0.29.5", - "wayland-scanner 0.29.5", - "wayland-sys 0.29.5", -] - -[[package]] -name = "wayland-commons" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda" -dependencies = [ - "nix 0.20.0", - "once_cell", - "smallvec", - "wayland-sys 0.28.6", + "wayland-commons", + "wayland-scanner", + "wayland-sys", ] [[package]] @@ -2736,18 +2619,7 @@ dependencies = [ "nix 0.24.3", "once_cell", "smallvec", - "wayland-sys 0.29.5", -] - -[[package]] -name = "wayland-cursor" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a" -dependencies = [ - "nix 0.20.0", - "wayland-client 0.28.6", - "xcursor", + "wayland-sys", ] [[package]] @@ -2757,30 +2629,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" dependencies = [ "nix 0.24.3", - "wayland-client 0.29.5", + "wayland-client", "xcursor", ] [[package]] name = "wayland-egl" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ba1ab1e18756b23982d36f08856d521d7df45015f404a2d7c4f0b2d2f66956" -dependencies = [ - "wayland-client 0.28.6", - "wayland-sys 0.28.6", -] - -[[package]] -name = "wayland-protocols" -version = "0.28.6" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f" +checksum = "402de949f81a012926d821a2d659f930694257e76dd92b6e0042ceb27be4107d" dependencies = [ - "bitflags 1.3.2", - "wayland-client 0.28.6", - "wayland-commons 0.28.6", - "wayland-scanner 0.28.6", + "wayland-client", + "wayland-sys", ] [[package]] @@ -2790,20 +2650,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" dependencies = [ "bitflags 1.3.2", - "wayland-client 0.29.5", - "wayland-commons 0.29.5", - "wayland-scanner 0.29.5", -] - -[[package]] -name = "wayland-scanner" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", + "wayland-client", + "wayland-commons", + "wayland-scanner", ] [[package]] @@ -2817,24 +2666,13 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "wayland-sys" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8" -dependencies = [ - "dlib 0.5.2", - "lazy_static", - "pkg-config", -] - [[package]] name = "wayland-sys" version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" dependencies = [ - "dlib 0.5.2", + "dlib", "lazy_static", "pkg-config", ] @@ -2855,12 +2693,6 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -2871,12 +2703,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -2889,7 +2715,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2898,7 +2724,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2916,6 +2742,28 @@ dependencies = [ "windows-targets 0.42.2", ] +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -2967,6 +2815,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -2979,6 +2833,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -2991,6 +2851,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -3003,6 +2869,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -3027,6 +2899,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -3041,65 +2919,69 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winit" -version = "0.24.0" +version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4eda6fce0eb84bd0a33e3c8794eb902e1033d0a1d5a31bc4f19b1b4bbff597" +checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" dependencies = [ "bitflags 1.3.2", - "cocoa 0.24.1", - "core-foundation 0.9.3", - "core-graphics 0.22.3", - "core-video-sys", + "cocoa", + "core-foundation", + "core-graphics", "dispatch", "instant", - "lazy_static", "libc", "log", - "mio 0.6.23", - "mio-extras", - "ndk 0.2.1", - "ndk-glue 0.2.1", - "ndk-sys", + "mio", + "ndk", + "ndk-glue", "objc", - "parking_lot 0.11.2", + "once_cell", + "parking_lot", "percent-encoding", - "raw-window-handle 0.3.4", - "smithay-client-toolkit 0.12.3", - "wayland-client 0.28.6", - "winapi 0.3.9", + "raw-window-handle 0.4.3", + "raw-window-handle 0.5.2", + "sctk-adwaita 0.4.3", + "smithay-client-toolkit", + "wasm-bindgen", + "wayland-client", + "wayland-protocols", + "web-sys", + "windows-sys 0.36.1", "x11-dl", ] [[package]] name = "winit" -version = "0.26.1" +version = "0.28.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b43cc931d58b99461188607efd7acb2a093e65fc621f54cad78517a6063e73a" +checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" dependencies = [ + "android-activity", "bitflags 1.3.2", - "cocoa 0.24.1", - "core-foundation 0.9.3", - "core-graphics 0.22.3", - "core-video-sys", + "cfg_aliases", + "core-foundation", + "core-graphics", "dispatch", "instant", - "lazy_static", "libc", "log", - "mio 0.8.8", - "ndk 0.5.0", - "ndk-glue 0.5.2", - "ndk-sys", - "objc", - "parking_lot 0.11.2", + "mio", + "ndk", + "objc2", + "once_cell", + "orbclient", "percent-encoding", - "raw-window-handle 0.4.3", - "smithay-client-toolkit 0.15.4", + "raw-window-handle 0.5.2", + "redox_syscall 0.3.5", + "sctk-adwaita 0.5.4", + "smithay-client-toolkit", "wasm-bindgen", - "wayland-client 0.29.5", - "wayland-protocols 0.29.5", + "wayland-client", + "wayland-commons", + "wayland-protocols", + "wayland-scanner", "web-sys", - "winapi 0.3.9", + "windows-sys 0.45.0", "x11-dl", ] @@ -3122,13 +3004,12 @@ dependencies = [ ] [[package]] -name = "ws2_32-sys" -version = "0.2.1" +name = "wio" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "winapi", ] [[package]] @@ -3150,7 +3031,7 @@ checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" dependencies = [ "gethostname", "nix 0.24.3", - "winapi 0.3.9", + "winapi", "winapi-wsapoll", "x11rb-protocol", ] @@ -3173,12 +3054,6 @@ dependencies = [ "nom", ] -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - [[package]] name = "xml-rs" version = "0.8.15" diff --git a/Cargo.toml b/Cargo.toml index 33a204f5..84bc3785 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,7 @@ backtrace = "0.3" cgmath = "0.18" directories-next = "2.0" env_logger = "0.10" -glium = "0.29" +glium = "0.32" image = "0.24" kamadak-exif = "0.5" lazy_static = "1.4" @@ -73,7 +73,7 @@ toml = "0.7" trash = { version = "3.0", default-features = false } typed-builder = "0.14" usvg = "0.35" -winit = "0.26" +winit = "0.28" [dependencies.libavif-image] version = "0.10" From a9b74f5b91ddfa9f67bc7ad1c3387ae8f42ad0d8 Mon Sep 17 00:00:00 2001 From: Doug Lau Date: Sat, 28 Oct 2023 13:07:13 -0500 Subject: [PATCH 3/5] Update tiny-skia to 0.10 --- Cargo.lock | 28 +--------------------------- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f06bdc00..1cdf6330 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,7 +65,7 @@ dependencies = [ "serde", "sys-info", "thiserror", - "tiny-skia 0.9.1", + "tiny-skia 0.10.0", "toml 0.7.5", "trash", "typed-builder", @@ -2230,21 +2230,6 @@ dependencies = [ "tiny-skia-path 0.8.4", ] -[[package]] -name = "tiny-skia" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2986c82f77818c7b9144c70818fdde98db15308e329ae2f7204d767808fd3c" -dependencies = [ - "arrayref", - "arrayvec 0.7.4", - "bytemuck", - "cfg-if", - "log", - "png", - "tiny-skia-path 0.9.0", -] - [[package]] name = "tiny-skia" version = "0.10.0" @@ -2281,17 +2266,6 @@ dependencies = [ "strict-num", ] -[[package]] -name = "tiny-skia-path" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7acb0ccda1ac91084353a56d0b69b0e29c311fd809d2088b1ed2f9ae1841c47" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - [[package]] name = "tiny-skia-path" version = "0.10.0" diff --git a/Cargo.toml b/Cargo.toml index 84bc3785..3843ab0b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,7 +68,7 @@ resvg = "0.35" serde = { version = "1.0.159", features = ["derive"] } sys-info = "0.9" thiserror = "1.0" -tiny-skia = "0.9" +tiny-skia = "0.10" toml = "0.7" trash = { version = "3.0", default-features = false } typed-builder = "0.14" From dc8b3d0a576c5abe552687eeb70cbbe427863d8b Mon Sep 17 00:00:00 2001 From: Doug Lau Date: Sat, 28 Oct 2023 13:10:24 -0500 Subject: [PATCH 4/5] Remove default features --- Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3843ab0b..31828e9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,6 @@ linux_mime_types = [ ] [features] -default = [] avif = ["libavif-image"] [target.'cfg(windows)'.build-dependencies] From afa6718d333da5b2c87baa827723a85a2d1e7b9f Mon Sep 17 00:00:00 2001 From: Doug Lau Date: Sat, 28 Oct 2023 13:11:19 -0500 Subject: [PATCH 5/5] Restore open to 5.0 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1cdf6330..3d3c38fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1574,9 +1574,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "open" -version = "4.2.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a083c0c7e5e4a8ec4176346cf61f67ac674e8bfb059d9226e1c54a96b377c12" +checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" dependencies = [ "is-wsl", "libc", diff --git a/Cargo.toml b/Cargo.toml index 31828e9e..7c282edf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,7 +60,7 @@ kamadak-exif = "0.5" lazy_static = "1.4" lexical-sort = "0.3" log = "0.4" -open = "4.1" +open = "5.0" pico-args = "0.5" rand = "0.8" resvg = "0.35"