From 2bfb78e22c9620b4cec1a0c14ee87584bd6e61c2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 7 Aug 2022 11:04:15 +0800 Subject: [PATCH 1/2] netease-cloud-music-gtk: 1.2.2 -> 2.0.1 --- .../netease-cloud-music-gtk/cargo-lock.patch | 1686 +++++++++-------- .../audio/netease-cloud-music-gtk/default.nix | 75 +- .../update-cargo-lock.sh | 2 +- 3 files changed, 960 insertions(+), 803 deletions(-) diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch b/pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch index 7fc21c11ff7c..2820506c519e 100644 --- a/pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch +++ b/pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch @@ -1,14 +1,26 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..41d41a5 +index 0000000..7171b64 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,2001 @@ +@@ -0,0 +1,2145 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] ++name = "adler" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" ++ ++[[package]] ++name = "adler32" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" ++ ++[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -18,19 +30,10 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "ansi_term" -+version = "0.12.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] +name = "anyhow" -+version = "1.0.45" ++version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7" ++checksum = "c794e162a5eff65c72ef524dfe393eb923c354e350bb78b9c7383df13f3bc142" + +[[package]] +name = "async-channel" @@ -44,153 +47,10 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "async-executor" -+version = "1.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" -+dependencies = [ -+ "async-task", -+ "concurrent-queue", -+ "fastrand", -+ "futures-lite", -+ "once_cell", -+ "slab", -+] -+ -+[[package]] -+name = "async-global-executor" -+version = "2.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6" -+dependencies = [ -+ "async-channel", -+ "async-executor", -+ "async-io", -+ "async-mutex", -+ "blocking", -+ "futures-lite", -+ "num_cpus", -+ "once_cell", -+] -+ -+[[package]] -+name = "async-io" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" -+dependencies = [ -+ "concurrent-queue", -+ "futures-lite", -+ "libc", -+ "log", -+ "once_cell", -+ "parking", -+ "polling", -+ "slab", -+ "socket2", -+ "waker-fn", -+ "winapi", -+] -+ -+[[package]] -+name = "async-lock" -+version = "2.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" -+dependencies = [ -+ "event-listener", -+] -+ -+[[package]] -+name = "async-mutex" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -+dependencies = [ -+ "event-listener", -+] -+ -+[[package]] -+name = "async-std" -+version = "1.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952" -+dependencies = [ -+ "async-channel", -+ "async-global-executor", -+ "async-io", -+ "async-lock", -+ "crossbeam-utils", -+ "futures-channel", -+ "futures-core", -+ "futures-io", -+ "futures-lite", -+ "gloo-timers", -+ "kv-log-macro", -+ "log", -+ "memchr", -+ "num_cpus", -+ "once_cell", -+ "pin-project-lite", -+ "pin-utils", -+ "slab", -+ "wasm-bindgen-futures", -+] -+ -+[[package]] -+name = "async-task" -+version = "4.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" -+ -+[[package]] -+name = "atk" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "812b4911e210bd51b24596244523c856ca749e6223c50a7fbbba3f89ee37c426" -+dependencies = [ -+ "atk-sys", -+ "bitflags", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+] -+ -+[[package]] -+name = "atk-sys" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f530e4af131d94cc4fa15c5c9d0348f0ef28bac64ba660b6b2a1cf2605dedfce" -+dependencies = [ -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "system-deps", -+] -+ -+[[package]] -+name = "atomic-waker" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+ "winapi", -+] -+ -+[[package]] +name = "autocfg" -+version = "1.0.1" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" @@ -199,13 +59,10 @@ index 0000000..41d41a5 +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + +[[package]] -+name = "bincode" -+version = "1.3.3" ++name = "bit_field" ++version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -+dependencies = [ -+ "serde", -+] ++checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" + +[[package]] +name = "bitflags" @@ -214,57 +71,59 @@ index 0000000..41d41a5 +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] -+name = "blocking" -+version = "1.0.2" ++name = "block" ++version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" -+dependencies = [ -+ "async-channel", -+ "async-task", -+ "atomic-waker", -+ "fastrand", -+ "futures-lite", -+ "once_cell", -+] ++checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "bumpalo" -+version = "3.8.0" ++version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" ++checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" ++ ++[[package]] ++name = "bytemuck" ++version = "1.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a5377c8865e74a160d21f29c2d40669f53286db6eab59b88540cbb12ffc8b835" ++ ++[[package]] ++name = "byteorder" ++version = "1.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" -+version = "1.1.0" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" ++checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" + +[[package]] +name = "cache-padded" -+version = "1.1.1" ++version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" ++checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" + +[[package]] +name = "cairo-rs" -+version = "0.9.1" ++version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c5c0f2e047e8ca53d0ff249c54ae047931d7a6ebe05d00af73e0ffeb6e34bdb8" ++checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags", + "cairo-sys-rs", + "glib", -+ "glib-sys", -+ "gobject-sys", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" -+version = "0.10.0" ++version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ed2639b9ad5f1d6efa76de95558e11339e7318426d84ac4890b86c03e828ca7" ++checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", @@ -273,15 +132,24 @@ index 0000000..41d41a5 + +[[package]] +name = "castaway" -+version = "0.1.1" ++version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ed247d1586918e46f2bbe0f13b06498db8dab5a8c1093f156652e9f2e0a73fc3" ++checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" + +[[package]] +name = "cc" -+version = "1.0.71" ++version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" ++checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" ++ ++[[package]] ++name = "cfg-expr" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db" ++dependencies = [ ++ "smallvec", ++] + +[[package]] +name = "cfg-if" @@ -290,52 +158,79 @@ index 0000000..41d41a5 +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] -+name = "chrono" -+version = "0.4.19" ++name = "color_quant" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -+dependencies = [ -+ "libc", -+ "num-integer", -+ "num-traits", -+ "time", -+ "winapi", -+] ++checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "concurrent-queue" -+version = "1.2.2" ++version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" ++checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" +dependencies = [ + "cache-padded", +] + +[[package]] -+name = "crossbeam-utils" -+version = "0.8.5" ++name = "crc32fast" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" ++checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", -+ "lazy_static", +] + +[[package]] -+name = "ctor" -+version = "0.1.21" ++name = "crossbeam-channel" ++version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" ++checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ -+ "quote", -+ "syn", ++ "cfg-if", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" ++dependencies = [ ++ "cfg-if", ++ "crossbeam-epoch", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.9.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" ++dependencies = [ ++ "autocfg", ++ "cfg-if", ++ "crossbeam-utils", ++ "memoffset", ++ "once_cell", ++ "scopeguard", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" ++dependencies = [ ++ "cfg-if", ++ "once_cell", +] + +[[package]] +name = "curl" -+version = "0.4.40" ++version = "0.4.44" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "877cc2f9b8367e32b6dabb9d581557e651cb3aa693a37f8679091bbf42687d5d" ++checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +dependencies = [ + "curl-sys", + "libc", @@ -348,9 +243,9 @@ index 0000000..41d41a5 + +[[package]] +name = "curl-sys" -+version = "0.4.50+curl-7.79.1" ++version = "0.4.56+curl-7.83.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4856b76919dd599f31236bb18db5f5bd36e2ce131e64f857ca5c259665b76171" ++checksum = "6093e169dd4de29e468fa649fbae11cdcd5551c81fe5bf1b0677adad7ef3d26f" +dependencies = [ + "cc", + "libc", @@ -363,12 +258,6 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "custom_error" -+version = "1.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f8a51dd197fa6ba5b4dc98a990a43cc13693c23eb0089ebb0fcc1f04152bca6" -+ -+[[package]] +name = "dbus" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -379,65 +268,94 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "dirs" -+version = "3.0.2" ++name = "deflate" ++version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" ++checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" +dependencies = [ -+ "dirs-sys", -+] -+ -+[[package]] -+name = "dirs" -+version = "4.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -+dependencies = [ -+ "dirs-sys", -+] -+ -+[[package]] -+name = "dirs-sys" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" -+dependencies = [ -+ "libc", -+ "redox_users", -+ "winapi", ++ "adler32", +] + +[[package]] +name = "either" -+version = "1.6.1" ++version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" + +[[package]] +name = "encoding_rs" -+version = "0.8.29" ++version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" ++checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "event-listener" -+version = "2.5.1" ++version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" ++checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" ++ ++[[package]] ++name = "exr" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14cc0e06fb5f67e5d6beadf3a382fec9baca1aa751c6d5368fdeee7e5932c215" ++dependencies = [ ++ "bit_field", ++ "deflate", ++ "flume", ++ "half", ++ "inflate", ++ "lebe", ++ "smallvec", ++ "threadpool", ++] + +[[package]] +name = "fastrand" -+version = "1.5.0" ++version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" ++checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] ++name = "field-offset" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" ++dependencies = [ ++ "memoffset", ++ "rustc_version", ++] ++ ++[[package]] ++name = "flate2" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" ++dependencies = [ ++ "crc32fast", ++ "miniz_oxide", ++] ++ ++[[package]] ++name = "flume" ++version = "0.10.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" ++dependencies = [ ++ "futures-core", ++ "futures-sink", ++ "nanorand", ++ "pin-project", ++ "spin", ++] ++ ++[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -470,46 +388,30 @@ index 0000000..41d41a5 + +[[package]] +name = "fragile" -+version = "1.0.0" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" -+ -+[[package]] -+name = "futures" -+version = "0.3.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-executor", -+ "futures-io", -+ "futures-sink", -+ "futures-task", -+ "futures-util", -+] ++checksum = "85dcb89d2b10c5f6133de2efd8c11959ce9dbb46a2f7a4cab208c4eeda6ce1ab" + +[[package]] +name = "futures-channel" -+version = "0.3.17" ++version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" ++checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +dependencies = [ + "futures-core", -+ "futures-sink", +] + +[[package]] +name = "futures-core" -+version = "0.3.17" ++version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" ++checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" + +[[package]] +name = "futures-executor" -+version = "0.3.17" ++version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" ++checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +dependencies = [ + "futures-core", + "futures-task", @@ -518,9 +420,9 @@ index 0000000..41d41a5 + +[[package]] +name = "futures-io" -+version = "0.3.17" ++version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" ++checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" + +[[package]] +name = "futures-lite" @@ -538,91 +440,48 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "futures-macro" -+version = "0.3.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" -+dependencies = [ -+ "autocfg", -+ "proc-macro-hack", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] +name = "futures-sink" -+version = "0.3.17" ++version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" ++checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" + +[[package]] +name = "futures-task" -+version = "0.3.17" ++version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" ++checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" + +[[package]] +name = "futures-util" -+version = "0.3.17" ++version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" ++checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +dependencies = [ -+ "autocfg", -+ "futures-channel", + "futures-core", -+ "futures-io", -+ "futures-macro", -+ "futures-sink", + "futures-task", -+ "memchr", + "pin-project-lite", + "pin-utils", -+ "proc-macro-hack", -+ "proc-macro-nested", + "slab", +] + +[[package]] -+name = "gdk" -+version = "0.13.2" ++name = "gdk-pixbuf" ++version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db00839b2a68a7a10af3fa28dfb3febaba3a20c3a9ac2425a33b7df1f84a6b7d" ++checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags", -+ "cairo-rs", -+ "cairo-sys-rs", -+ "gdk-pixbuf", -+ "gdk-sys", -+ "gio", -+ "gio-sys", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "pango", -+] -+ -+[[package]] -+name = "gdk-pixbuf" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f6dae3cb99dd49b758b88f0132f8d401108e63ae8edd45f432d42cdff99998a" -+dependencies = [ + "gdk-pixbuf-sys", + "gio", -+ "gio-sys", + "glib", -+ "glib-sys", -+ "gobject-sys", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" -+version = "0.10.0" ++version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3bfe468a7f43e97b8d193a762b6c5cf67a7d36cacbc0b9291dbcae24bfea1e8f" ++checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", @@ -632,10 +491,26 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "gdk-sys" -+version = "0.10.0" ++name = "gdk4" ++version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a9653cfc500fd268015b1ac055ddbc3df7a5c9ea3f4ccef147b3957bd140d69" ++checksum = "4fabb7cf843c26b085a5d68abb95d0c0bf27a9ae2eeff9c4adb503a1eb580876" ++dependencies = [ ++ "bitflags", ++ "cairo-rs", ++ "gdk-pixbuf", ++ "gdk4-sys", ++ "gio", ++ "glib", ++ "libc", ++ "pango", ++] ++ ++[[package]] ++name = "gdk4-sys" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "efe7dcb44f5c00aeabff3f69abfc5673de46559070f89bd3fbb7b66485d9cef2" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", @@ -650,31 +525,59 @@ index 0000000..41d41a5 + +[[package]] +name = "getrandom" -+version = "0.2.3" ++version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" ++checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +dependencies = [ + "cfg-if", ++ "js-sys", + "libc", + "wasi", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "gettext-rs" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" ++dependencies = [ ++ "gettext-sys", ++ "locale_config", ++] ++ ++[[package]] ++name = "gettext-sys" ++version = "0.21.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" ++dependencies = [ ++ "cc", ++ "temp-dir", ++] ++ ++[[package]] ++name = "gif" ++version = "0.11.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" ++dependencies = [ ++ "color_quant", ++ "weezl", +] + +[[package]] +name = "gio" -+version = "0.9.1" ++version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1fb60242bfff700772dae5d9e3a1f7aa2e4ebccf18b89662a16acb2822568561" ++checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags", -+ "futures", + "futures-channel", + "futures-core", + "futures-io", -+ "futures-util", + "gio-sys", + "glib", -+ "glib-sys", -+ "gobject-sys", + "libc", + "once_cell", + "thiserror", @@ -682,9 +585,9 @@ index 0000000..41d41a5 + +[[package]] +name = "gio-sys" -+version = "0.10.1" ++version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e24fb752f8f5d2cf6bbc2c606fd2bc989c81c5e2fe321ab974d54f8b6344eac" ++checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys", + "gobject-sys", @@ -695,32 +598,32 @@ index 0000000..41d41a5 + +[[package]] +name = "glib" -+version = "0.10.3" ++version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" ++checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", -+ "futures-util", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", ++ "smallvec", ++ "thiserror", +] + +[[package]] +name = "glib-macros" -+version = "0.10.1" ++version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" ++checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" +dependencies = [ + "anyhow", + "heck", -+ "itertools", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", @@ -730,32 +633,19 @@ index 0000000..41d41a5 + +[[package]] +name = "glib-sys" -+version = "0.10.1" ++version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" ++checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] -+name = "gloo-timers" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] +name = "gobject-sys" -+version = "0.10.0" ++version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c" ++checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", @@ -763,10 +653,65 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "gstreamer" -+version = "0.16.7" ++name = "graphene-rs" ++version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ff5d0f7ff308ae37e6eb47b6ded17785bdea06e438a708cd09e0288c1862f33" ++checksum = "7c54f9fbbeefdb62c99f892dfca35f83991e2cb5b46a8dc2a715e58612f85570" ++dependencies = [ ++ "glib", ++ "graphene-sys", ++ "libc", ++] ++ ++[[package]] ++name = "graphene-sys" ++version = "0.15.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa691fc7337ba1df599afb55c3bcb85c04f1b3f17362570e9bb0ff0d1bc3028a" ++dependencies = [ ++ "glib-sys", ++ "libc", ++ "pkg-config", ++ "system-deps", ++] ++ ++[[package]] ++name = "gsk4" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05e9020d333280b3aa38d496495bfa9b50712eebf1ad63f0ec5bcddb5eb61be4" ++dependencies = [ ++ "bitflags", ++ "cairo-rs", ++ "gdk4", ++ "glib", ++ "graphene-rs", ++ "gsk4-sys", ++ "libc", ++ "pango", ++] ++ ++[[package]] ++name = "gsk4-sys" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7add39ccf60078508c838643a2dcc91f045c46ed63b5ea6ab701b2e25bda3fea" ++dependencies = [ ++ "cairo-sys-rs", ++ "gdk4-sys", ++ "glib-sys", ++ "gobject-sys", ++ "graphene-sys", ++ "libc", ++ "pango-sys", ++ "system-deps", ++] ++ ++[[package]] ++name = "gstreamer" ++version = "0.18.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d66363bacf5e4f6eb281564adc2902e44c52ae5c45082423e7439e9012b75456" +dependencies = [ + "bitflags", + "cfg-if", @@ -774,13 +719,13 @@ index 0000000..41d41a5 + "futures-core", + "futures-util", + "glib", -+ "glib-sys", -+ "gobject-sys", + "gstreamer-sys", + "libc", + "muldiv", -+ "num-rational 0.3.2", ++ "num-integer", ++ "num-rational", + "once_cell", ++ "option-operations", + "paste", + "pretty-hex", + "thiserror", @@ -788,25 +733,23 @@ index 0000000..41d41a5 + +[[package]] +name = "gstreamer-base" -+version = "0.16.5" ++version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bafd01c56f59cb10f4b5a10f97bb4bdf8c2b2784ae5b04da7e2d400cf6e6afcf" ++checksum = "224f35f36582407caf58ded74854526beeecc23d0cf64b8d1c3e00584ed6863f" +dependencies = [ + "bitflags", ++ "cfg-if", + "glib", -+ "glib-sys", -+ "gobject-sys", + "gstreamer", + "gstreamer-base-sys", -+ "gstreamer-sys", + "libc", +] + +[[package]] +name = "gstreamer-base-sys" -+version = "0.9.1" ++version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4b7b6dc2d6e160a1ae28612f602bd500b3fa474ce90bf6bb2f08072682beef5" ++checksum = "a083493c3c340e71fa7c66eebda016e9fafc03eb1b4804cf9b2bad61994b078e" +dependencies = [ + "glib-sys", + "gobject-sys", @@ -817,26 +760,24 @@ index 0000000..41d41a5 + +[[package]] +name = "gstreamer-player" -+version = "0.16.5" ++version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34edf65e48e0d29c18101d77a2e004488a61f81a852a75e19d9c73e03d35cb77" ++checksum = "5f14ee02352ba73cadebe640bfb33f12fe8d03cbcad816a102d55a0251fb99bb" +dependencies = [ + "bitflags", + "glib", -+ "glib-sys", -+ "gobject-sys", + "gstreamer", + "gstreamer-player-sys", -+ "gstreamer-sys", + "gstreamer-video", + "libc", ++ "once_cell", +] + +[[package]] +name = "gstreamer-player-sys" -+version = "0.9.1" ++version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "53aaf79503e691a32266670bc631edb6c52bdb854984da76a0ce2756f49584a2" ++checksum = "1f9b674b39a4d0e18710f6e3d2b109f1793d8028ee4e39da3909b55b4529d399" +dependencies = [ + "glib-sys", + "gobject-sys", @@ -848,9 +789,9 @@ index 0000000..41d41a5 + +[[package]] +name = "gstreamer-sys" -+version = "0.9.1" ++version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc1f154082d01af5718c5f8a8eb4f565a4ea5586ad8833a8fc2c2aa6844b601d" ++checksum = "e3517a65d3c2e6f8905b456eba5d53bda158d664863aef960b44f651cb7d33e2" +dependencies = [ + "glib-sys", + "gobject-sys", @@ -860,20 +801,16 @@ index 0000000..41d41a5 + +[[package]] +name = "gstreamer-video" -+version = "0.16.7" ++version = "0.18.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7bbb1485d87469849ec45c08e03c2f280d3ea20ff3c439d03185be54e3ce98e" ++checksum = "9418adfc72dafa1ad9eb106527ce4804887d101027c4528ec28c7d29cc899519" +dependencies = [ + "bitflags", ++ "cfg-if", + "futures-channel", -+ "futures-util", + "glib", -+ "glib-sys", -+ "gobject-sys", + "gstreamer", + "gstreamer-base", -+ "gstreamer-base-sys", -+ "gstreamer-sys", + "gstreamer-video-sys", + "libc", + "once_cell", @@ -881,9 +818,9 @@ index 0000000..41d41a5 + +[[package]] +name = "gstreamer-video-sys" -+version = "0.9.1" ++version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "92347e46438007d6a2386302125f62cb9df6769cdacb931af5c0f12c1ee21de4" ++checksum = "33331b1675e73b5b000c796354278eca7fdde9327015971d9f41afe28b96e0dc" +dependencies = [ + "glib-sys", + "gobject-sys", @@ -894,59 +831,73 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "gtk" -+version = "0.9.2" ++name = "gtk4" ++version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2f022f2054072b3af07666341984562c8e626a79daa8be27b955d12d06a5ad6a" ++checksum = "c64f0c2a3d80e899dc3febddad5bac193ffcf74a0fd7e31037f30dd34d6f7396" +dependencies = [ -+ "atk", + "bitflags", + "cairo-rs", -+ "cairo-sys-rs", -+ "cc", -+ "gdk", ++ "field-offset", ++ "futures-channel", + "gdk-pixbuf", -+ "gdk-pixbuf-sys", -+ "gdk-sys", ++ "gdk4", + "gio", -+ "gio-sys", + "glib", -+ "glib-sys", -+ "gobject-sys", -+ "gtk-sys", ++ "graphene-rs", ++ "gsk4", ++ "gtk4-macros", ++ "gtk4-sys", + "libc", + "once_cell", + "pango", -+ "pango-sys", -+ "pkg-config", +] + +[[package]] -+name = "gtk-sys" -+version = "0.10.0" ++name = "gtk4-macros" ++version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "89acda6f084863307d948ba64a4b1ef674e8527dddab147ee4cdcc194c880457" ++checksum = "fafbcc920af4eb677d7d164853e7040b9de5a22379c596f570190c675d45f7a7" ++dependencies = [ ++ "anyhow", ++ "proc-macro-crate", ++ "proc-macro-error", ++ "proc-macro2", ++ "quick-xml", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "gtk4-sys" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5bc8006eea634b7c72da3ff79e24606e45f21b3b832a3c5a1f543f5f97eb0f63" +dependencies = [ -+ "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", -+ "gdk-sys", ++ "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", ++ "graphene-sys", ++ "gsk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] -+name = "heck" -+version = "0.3.3" ++name = "half" ++version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -+dependencies = [ -+ "unicode-segmentation", -+] ++checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" ++ ++[[package]] ++name = "heck" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" @@ -964,10 +915,19 @@ index 0000000..41d41a5 +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] -+name = "http" -+version = "0.2.5" ++name = "html-escape" ++version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" ++checksum = "b8e7479fa1ef38eb49fb6a42c426be515df2d063f06cb8efd3e50af073dbc26c" ++dependencies = [ ++ "utf8-width", ++] ++ ++[[package]] ++name = "http" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "fnv", @@ -975,6 +935,12 @@ index 0000000..41d41a5 +] + +[[package]] ++name = "httpdate" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" ++ ++[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -986,6 +952,34 @@ index 0000000..41d41a5 +] + +[[package]] ++name = "image" ++version = "0.24.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e30ca2ecf7666107ff827a8e481de6a132a9b687ed3bb20bb1c144a36c00964" ++dependencies = [ ++ "bytemuck", ++ "byteorder", ++ "color_quant", ++ "exr", ++ "gif", ++ "jpeg-decoder", ++ "num-rational", ++ "num-traits", ++ "png", ++ "scoped_threadpool", ++ "tiff", ++] ++ ++[[package]] ++name = "inflate" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" ++dependencies = [ ++ "adler32", ++] ++ ++[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -996,13 +990,12 @@ index 0000000..41d41a5 + +[[package]] +name = "isahc" -+version = "1.5.1" ++version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "40ef5402b1791c9fc479ef9871601a2f10e4cc0f14414a5c9c6e043fb51e5a56" ++checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" +dependencies = [ + "async-channel", + "castaway", -+ "chrono", + "crossbeam-utils", + "curl", + "curl-sys", @@ -1010,6 +1003,7 @@ index 0000000..41d41a5 + "event-listener", + "futures-lite", + "http", ++ "httpdate", + "log", + "mime", + "once_cell", @@ -1023,49 +1017,78 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "itertools" -+version = "0.9.0" ++name = "itoa" ++version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -+dependencies = [ -+ "either", -+] ++checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" + +[[package]] -+name = "itoa" -+version = "0.4.8" ++name = "jpeg-decoder" ++version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" ++checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" ++dependencies = [ ++ "rayon", ++] + +[[package]] +name = "js-sys" -+version = "0.3.55" ++version = "0.3.59" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" ++checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +dependencies = [ + "wasm-bindgen", +] + +[[package]] -+name = "kv-log-macro" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -+dependencies = [ -+ "log", -+] -+ -+[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] -+name = "libc" -+version = "0.2.107" ++name = "lebe" ++version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" ++checksum = "7efd1d698db0759e6ef11a7cd44407407399a910c774dd804c64c032da7826ff" ++ ++[[package]] ++name = "libadwaita" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2ae453d28e3b91f03749f02b1531e8cfe315a1d0762b77a61797d2ab80bb87d" ++dependencies = [ ++ "gdk-pixbuf", ++ "gdk4", ++ "gio", ++ "glib", ++ "gtk4", ++ "libadwaita-sys", ++ "libc", ++ "once_cell", ++ "pango", ++] ++ ++[[package]] ++name = "libadwaita-sys" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f18b6ac4cadd252a89f5cba0a5a4e99836131795d6fad37b859ac79e8cb7d2c8" ++dependencies = [ ++ "gdk4-sys", ++ "gio-sys", ++ "glib-sys", ++ "gobject-sys", ++ "gtk4-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.127" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b" + +[[package]] +name = "libdbus-sys" @@ -1088,9 +1111,9 @@ index 0000000..41d41a5 + +[[package]] +name = "libz-sys" -+version = "1.1.3" ++version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" ++checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +dependencies = [ + "cc", + "libc", @@ -1099,24 +1122,44 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "log" -+version = "0.4.14" ++name = "locale_config" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" ++checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ -+ "cfg-if", -+ "value-bag", ++ "lazy_static", ++ "objc", ++ "objc-foundation", ++ "regex", ++ "winapi", +] + +[[package]] -+name = "loggerv" -+version = "0.7.2" ++name = "lock_api" ++version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "60d8de15ae71e760bce7f05447f85f73624fe0d3b1e4c5a63ba5d4cb0748d374" ++checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +dependencies = [ -+ "ansi_term", -+ "atty", -+ "log", ++ "autocfg", ++ "scopeguard", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "malloc_buf" ++version = "0.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" ++dependencies = [ ++ "libc", +] + +[[package]] @@ -1127,9 +1170,18 @@ index 0000000..41d41a5 + +[[package]] +name = "memchr" -+version = "2.4.1" ++version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" ++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" ++ ++[[package]] ++name = "memoffset" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" ++dependencies = [ ++ "autocfg", ++] + +[[package]] +name = "mime" @@ -1138,26 +1190,19 @@ index 0000000..41d41a5 +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] -+name = "mp4ameta" -+version = "0.9.1" ++name = "miniz_oxide" ++version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "619f6fe86b8690efad1c53d2cc8b9c1af2a5f8b93247e0ba05ece1b7639b4e66" ++checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +dependencies = [ -+ "lazy_static", -+ "mp4ameta_proc", ++ "adler", +] + +[[package]] -+name = "mp4ameta_proc" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4975ce203cd69e96a89f803d87b7b53d1950a6e93668a666d177c28aebd15c8a" -+ -+[[package]] +name = "mpris-player" -+version = "0.6.1" ++version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f6badd6ebe31be46eb2e2975cf3b34b183bace5f8a8db1d609fefc4d46fbb07" ++checksum = "be832ec9171fdaf43609d02bb552f4129ba6eacd184bb25186e2906dbd3cf098" +dependencies = [ + "dbus", + "glib", @@ -1165,108 +1210,71 @@ index 0000000..41d41a5 + +[[package]] +name = "muldiv" -+version = "0.2.1" ++version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" ++checksum = "b5136edda114182728ccdedb9f5eda882781f35fa6e80cc360af12a8932507f3" + +[[package]] -+name = "netease-cloud-music-gtk" -+version = "1.2.2" ++name = "nanorand" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ -+ "async-std", ++ "getrandom", ++] ++ ++[[package]] ++name = "netease-cloud-music-api" ++version = "1.0.0" ++source = "git+https://github.com/gmg137/netease-cloud-music-api.git#56c64c6d96ee36c716ac02f145a635456746ad54" ++dependencies = [ ++ "anyhow", + "base64", -+ "bincode", -+ "cairo-rs", -+ "chrono", -+ "custom_error", -+ "dirs 4.0.0", -+ "fragile", -+ "futures", -+ "gdk", -+ "gdk-pixbuf", -+ "gio", -+ "glib", -+ "gstreamer", -+ "gstreamer-player", -+ "gtk", + "hex", + "isahc", + "lazy_static", -+ "log", -+ "loggerv", -+ "mp4ameta", -+ "mpris-player", -+ "num", + "openssl", -+ "pango", + "rand", + "regex", + "serde", + "serde_json", + "urlqstring", -+ "xdg", +] + +[[package]] -+name = "num" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" ++name = "netease-cloud-music-gtk4" ++version = "2.0.1" +dependencies = [ -+ "num-bigint", -+ "num-complex", -+ "num-integer", -+ "num-iter", -+ "num-rational 0.4.0", -+ "num-traits", -+] -+ -+[[package]] -+name = "num-bigint" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -+dependencies = [ -+ "autocfg", -+ "num-integer", -+ "num-traits", -+] -+ -+[[package]] -+name = "num-complex" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" -+dependencies = [ -+ "num-traits", ++ "anyhow", ++ "fastrand", ++ "fragile", ++ "gettext-rs", ++ "gstreamer", ++ "gstreamer-player", ++ "gtk4", ++ "libadwaita", ++ "mpris-player", ++ "netease-cloud-music-api", ++ "once_cell", ++ "qrcode-generator", ++ "regex", +] + +[[package]] +name = "num-integer" -+version = "0.1.44" ++version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" ++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] -+name = "num-iter" -+version = "0.1.42" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" -+dependencies = [ -+ "autocfg", -+ "num-integer", -+ "num-traits", -+] -+ -+[[package]] +name = "num-rational" -+version = "0.3.2" ++version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" ++checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", @@ -1274,67 +1282,96 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "num-rational" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" -+dependencies = [ -+ "autocfg", -+ "num-bigint", -+ "num-integer", -+ "num-traits", -+] -+ -+[[package]] +name = "num-traits" -+version = "0.2.14" ++version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" -+version = "1.13.0" ++version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] -+name = "once_cell" -+version = "1.8.0" ++name = "objc" ++version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" ++checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" ++dependencies = [ ++ "malloc_buf", ++] ++ ++[[package]] ++name = "objc-foundation" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" ++dependencies = [ ++ "block", ++ "objc", ++ "objc_id", ++] ++ ++[[package]] ++name = "objc_id" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" ++dependencies = [ ++ "objc", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" + +[[package]] +name = "openssl" -+version = "0.10.38" ++version = "0.10.41" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" ++checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", ++ "openssl-macros", + "openssl-sys", +] + +[[package]] -+name = "openssl-probe" -+version = "0.1.4" ++name = "openssl-macros" ++version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" ++checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" -+version = "0.9.70" ++version = "0.9.75" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c6517987b3f8226b5da3661dad65ff7f300cc59fb5ea8333ca191fc65fde3edf" ++checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" +dependencies = [ + "autocfg", + "cc", @@ -1344,15 +1381,22 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "pango" -+version = "0.9.1" ++name = "option-operations" ++version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9937068580bebd8ced19975938573803273ccbcbd598c58d4906efd4ac87c438" ++checksum = "42b01597916c91a493b1e8a2fde64fec1764be3259abc1f06efc99c274f150a2" ++dependencies = [ ++ "paste", ++] ++ ++[[package]] ++name = "pango" ++version = "0.15.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags", + "glib", -+ "glib-sys", -+ "gobject-sys", + "libc", + "once_cell", + "pango-sys", @@ -1360,9 +1404,9 @@ index 0000000..41d41a5 + +[[package]] +name = "pango-sys" -+version = "0.10.0" ++version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24d2650c8b62d116c020abd0cea26a4ed96526afda89b1c4ea567131fdefc890" ++checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", @@ -1378,9 +1422,9 @@ index 0000000..41d41a5 + +[[package]] +name = "paste" -+version = "1.0.6" ++version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" ++checksum = "9423e2b32f7a043629287a536f21951e8c6a82482d0acb1eeebfc90bc2225b22" + +[[package]] +name = "percent-encoding" @@ -1389,19 +1433,29 @@ index 0000000..41d41a5 +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] -+name = "pin-project" -+version = "1.0.8" ++name = "pest" ++version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" ++checksum = "69486e2b8c2d2aeb9762db7b4e00b0331156393555cff467f4163ff06821eef8" ++dependencies = [ ++ "thiserror", ++ "ucd-trie", ++] ++ ++[[package]] ++name = "pin-project" ++version = "1.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" -+version = "1.0.8" ++version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" ++checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" +dependencies = [ + "proc-macro2", + "quote", @@ -1410,9 +1464,9 @@ index 0000000..41d41a5 + +[[package]] +name = "pin-project-lite" -+version = "0.2.7" ++version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" ++checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" @@ -1422,15 +1476,27 @@ index 0000000..41d41a5 + +[[package]] +name = "pkg-config" -+version = "0.3.22" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" ++checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" ++ ++[[package]] ++name = "png" ++version = "0.17.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba" ++dependencies = [ ++ "bitflags", ++ "crc32fast", ++ "deflate", ++ "miniz_oxide", ++] + +[[package]] +name = "polling" -+version = "2.1.0" ++version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "92341d779fa34ea8437ef4d82d440d5e1ce3f3ff7f824aa64424cd481f9a1f25" ++checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" +dependencies = [ + "cfg-if", + "libc", @@ -1441,22 +1507,24 @@ index 0000000..41d41a5 + +[[package]] +name = "ppv-lite86" -+version = "0.2.15" ++version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" ++checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + +[[package]] +name = "pretty-hex" -+version = "0.2.1" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" ++checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" + +[[package]] +name = "proc-macro-crate" -+version = "0.1.5" ++version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" ++checksum = "26d50bfb8c23f23915855a00d98b5a35ef2e0b871bb52937bacadb798fbb66c8" +dependencies = [ ++ "once_cell", ++ "thiserror", + "toml", +] + @@ -1485,45 +1553,58 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "proc-macro-hack" -+version = "0.5.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" -+ -+[[package]] -+name = "proc-macro-nested" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" -+ -+[[package]] +name = "proc-macro2" -+version = "1.0.32" ++version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" ++checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +dependencies = [ -+ "unicode-xid", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "qrcode-generator" ++version = "4.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "501c33c9127afb867693646b38817bf63a9a756d4b66aefbc5c0d7e5e8c3125a" ++dependencies = [ ++ "html-escape", ++ "image", ++ "qrcodegen", ++] ++ ++[[package]] ++name = "qrcodegen" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" ++ ++[[package]] ++name = "quick-xml" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b" ++dependencies = [ ++ "memchr", +] + +[[package]] +name = "quote" -+version = "1.0.10" ++version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" ++checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" -+version = "0.8.4" ++version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" ++checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", -+ "rand_hc", +] + +[[package]] @@ -1546,38 +1627,34 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "rand_hc" -+version = "0.3.1" ++name = "rayon" ++version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" ++checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +dependencies = [ -+ "rand_core", ++ "autocfg", ++ "crossbeam-deque", ++ "either", ++ "rayon-core", +] + +[[package]] -+name = "redox_syscall" -+version = "0.2.10" ++name = "rayon-core" ++version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" ++checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +dependencies = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "redox_users" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -+dependencies = [ -+ "getrandom", -+ "redox_syscall", ++ "crossbeam-channel", ++ "crossbeam-deque", ++ "crossbeam-utils", ++ "num_cpus", +] + +[[package]] +name = "regex" -+version = "1.5.4" ++version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" ++checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +dependencies = [ + "aho-corasick", + "memchr", @@ -1586,40 +1663,79 @@ index 0000000..41d41a5 + +[[package]] +name = "regex-syntax" -+version = "0.6.25" ++version = "0.6.27" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" ++checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" ++ ++[[package]] ++name = "rustc_version" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" ++dependencies = [ ++ "semver", ++] + +[[package]] +name = "ryu" -+version = "1.0.5" ++version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[package]] +name = "schannel" -+version = "0.1.19" ++version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" ++checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static", -+ "winapi", ++ "windows-sys", ++] ++ ++[[package]] ++name = "scoped_threadpool" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "semver" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" ++dependencies = [ ++ "semver-parser", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" ++dependencies = [ ++ "pest", +] + +[[package]] +name = "serde" -+version = "1.0.130" ++version = "1.0.142" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" ++checksum = "e590c437916fb6b221e1d00df6e3294f3fccd70ca7e92541c475d6ed6ef5fee2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.130" ++version = "1.0.142" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" ++checksum = "34b5b8d809babe02f538c2cfec6f2c1ed10804c0e5a6a041a049a4f5588ccc2e" +dependencies = [ + "proc-macro2", + "quote", @@ -1628,9 +1744,9 @@ index 0000000..41d41a5 + +[[package]] +name = "serde_json" -+version = "1.0.69" ++version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e466864e431129c7e0d3476b92f20458e5879919a0596c6472738d9fa2d342f8" ++checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" +dependencies = [ + "itoa", + "ryu", @@ -1639,9 +1755,12 @@ index 0000000..41d41a5 + +[[package]] +name = "slab" -+version = "0.4.5" ++version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" ++checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" ++dependencies = [ ++ "autocfg", ++] + +[[package]] +name = "sluice" @@ -1655,73 +1774,74 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "socket2" -+version = "0.4.2" ++name = "smallvec" ++version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" ++checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" ++ ++[[package]] ++name = "socket2" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +dependencies = [ + "libc", + "winapi", +] + +[[package]] -+name = "strum" -+version = "0.18.0" ++name = "spin" ++version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" -+ -+[[package]] -+name = "strum_macros" -+version = "0.18.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" ++checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +dependencies = [ -+ "heck", -+ "proc-macro2", -+ "quote", -+ "syn", ++ "lock_api", +] + +[[package]] +name = "syn" -+version = "1.0.81" ++version = "1.0.99" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" ++checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +dependencies = [ + "proc-macro2", + "quote", -+ "unicode-xid", ++ "unicode-ident", +] + +[[package]] +name = "system-deps" -+version = "1.3.2" ++version = "6.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" ++checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" +dependencies = [ ++ "cfg-expr", + "heck", + "pkg-config", -+ "strum", -+ "strum_macros", -+ "thiserror", + "toml", + "version-compare", +] + +[[package]] -+name = "thiserror" -+version = "1.0.30" ++name = "temp-dir" ++version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" ++checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" ++ ++[[package]] ++name = "thiserror" ++version = "1.0.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.30" ++version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" ++checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" +dependencies = [ + "proc-macro2", + "quote", @@ -1729,20 +1849,30 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "time" -+version = "0.1.43" ++name = "threadpool" ++version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" ++checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ -+ "libc", -+ "winapi", ++ "num_cpus", ++] ++ ++[[package]] ++name = "tiff" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7259662e32d1e219321eb309d5f9d898b779769d81b76e762c07c8e5d38fcb65" ++dependencies = [ ++ "flate2", ++ "jpeg-decoder", ++ "weezl", +] + +[[package]] +name = "tinyvec" -+version = "1.5.1" ++version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" ++checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] @@ -1755,18 +1885,18 @@ index 0000000..41d41a5 + +[[package]] +name = "toml" -+version = "0.5.8" ++version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" ++checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + +[[package]] +name = "tracing" -+version = "0.1.29" ++version = "0.1.36" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" ++checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +dependencies = [ + "cfg-if", + "log", @@ -1777,9 +1907,9 @@ index 0000000..41d41a5 + +[[package]] +name = "tracing-attributes" -+version = "0.1.18" ++version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" ++checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +dependencies = [ + "proc-macro2", + "quote", @@ -1788,11 +1918,11 @@ index 0000000..41d41a5 + +[[package]] +name = "tracing-core" -+version = "0.1.21" ++version = "0.1.29" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" ++checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" +dependencies = [ -+ "lazy_static", ++ "once_cell", +] + +[[package]] @@ -1806,33 +1936,33 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "unicode-bidi" -+version = "0.3.7" ++name = "ucd-trie" ++version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" ++checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c" ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" + +[[package]] +name = "unicode-normalization" -+version = "0.1.19" ++version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" ++checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +dependencies = [ + "tinyvec", +] + +[[package]] -+name = "unicode-segmentation" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -+ -+[[package]] +name = "url" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1851,14 +1981,10 @@ index 0000000..41d41a5 +checksum = "25ef3473a06a065718d8ec7cd7acc6a35fc20f836dee7661ad3b64ea3cc2e0cc" + +[[package]] -+name = "value-bag" -+version = "1.0.0-alpha.8" ++name = "utf8-width" ++version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" -+dependencies = [ -+ "ctor", -+ "version_check", -+] ++checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" + +[[package]] +name = "vcpkg" @@ -1868,15 +1994,15 @@ index 0000000..41d41a5 + +[[package]] +name = "version-compare" -+version = "0.0.10" ++version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" ++checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" + +[[package]] +name = "version_check" -+version = "0.9.3" ++version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" ++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" @@ -1886,15 +2012,15 @@ index 0000000..41d41a5 + +[[package]] +name = "wasi" -+version = "0.10.2+wasi-snapshot-preview1" ++version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" -+version = "0.2.78" ++version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" ++checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", @@ -1902,13 +2028,13 @@ index 0000000..41d41a5 + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.78" ++version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" ++checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +dependencies = [ + "bumpalo", -+ "lazy_static", + "log", ++ "once_cell", + "proc-macro2", + "quote", + "syn", @@ -1916,22 +2042,10 @@ index 0000000..41d41a5 +] + +[[package]] -+name = "wasm-bindgen-futures" -+version = "0.4.28" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" -+dependencies = [ -+ "cfg-if", -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.78" ++version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" ++checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", @@ -1939,9 +2053,9 @@ index 0000000..41d41a5 + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.78" ++version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" ++checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +dependencies = [ + "proc-macro2", + "quote", @@ -1952,19 +2066,15 @@ index 0000000..41d41a5 + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.78" ++version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" ++checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" + +[[package]] -+name = "web-sys" -+version = "0.3.55" ++name = "weezl" ++version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+] ++checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "wepoll-ffi" @@ -1998,10 +2108,44 @@ index 0000000..41d41a5 +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] -+name = "xdg" -+version = "2.4.0" ++name = "windows-sys" ++version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3a23fe958c70412687039c86f578938b4a0bb50ec788e96bce4d6ab00ddd5803" ++checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ -+ "dirs 3.0.2", ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_msvc", +] ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" ++ ++[[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_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" ++ ++[[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_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix index 72027fe922b8..9fa1f76aec6e 100644 --- a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix +++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -1,43 +1,60 @@ { lib , stdenv -, glib -, gtk3 -, curl -, dbus -, openssl -, gst_all_1 -, pkg-config -, rustPlatform -, wrapGAppsHook -, fetchurl , fetchFromGitHub +, rustPlatform +, meson +, ninja +, pkg-config +, glib +, gtk4 +, appstream-glib +, desktop-file-utils +, libxml2 +, wrapGAppsHook4 +, openssl +, dbus +, libadwaita +, gst_all_1 }: -rustPlatform.buildRustPackage rec { + +stdenv.mkDerivation rec { pname = "netease-cloud-music-gtk"; - version = "1.2.2"; + version = "2.0.1"; + src = fetchFromGitHub { owner = "gmg137"; - repo = "netease-cloud-music-gtk"; + repo = pname; rev = version; - sha256 = "sha256-42MaylfG5LY+TiYHWQMoh9CiVLShKXSBpMrxdWhujow="; + hash = "sha256-dlJZvmfw9+cavAysxVzCekgPdygg5zbU3ZR5BOjPk08="; + }; + + patches = [ ./cargo-lock.patch ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src patches; + hash = "sha256-mJyjWEBsLhHwJCeZyRdby/K/jse0F9UBwfQxkNtZito="; }; - cargoSha256 = "sha256-A9wIcESdaJwLY4g/QlOxMU5PBB9wjvIzaXBSqeiRJBM="; - cargoPatches = [ ./cargo-lock.patch ]; nativeBuildInputs = [ - glib - gtk3 - dbus + meson + ninja pkg-config - wrapGAppsHook - ]; + glib # glib-compile-resources + gtk4 # gtk4-update-icon-cache + appstream-glib # appstream-util + desktop-file-utils # update-desktop-database + libxml2 # xmllint + wrapGAppsHook4 + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); buildInputs = [ - glib - gtk3 - curl - dbus openssl + dbus + libadwaita ] ++ (with gst_all_1; [ gstreamer gst-plugins-base @@ -46,15 +63,11 @@ rustPlatform.buildRustPackage rec { gst-plugins-ugly ]); - postPatch = '' - install -D netease-cloud-music-gtk.desktop $out/share/applications/netease-cloud-music-gtk.desktop - install -D icons/netease-cloud-music-gtk.svg $out/share/icons/hicolor/scalable/apps/netease-cloud-music-gtk.svg - ''; - meta = with lib; { - description = "netease-cloud-music-gtk is a Rust + GTK based netease cloud music player"; + description = "A Rust + GTK based netease cloud music player"; homepage = "https://github.com/gmg137/netease-cloud-music-gtk"; license = licenses.gpl3Plus; maintainers = with maintainers; [ diffumist ]; + mainProgram = "netease-cloud-music-gtk4"; }; } diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh b/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh index 75b04d1e77ca..ef5b1dcbbc39 100755 --- a/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh +++ b/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh @@ -6,7 +6,7 @@ set -eu -vx here=$PWD -version=$(cat default.nix | rg '^ version = "' | cut -d '"' -f 2) +version=$(rg '^ version = "' default.nix | cut -d '"' -f 2) checkout=$(mktemp -d) git clone -b "$version" --depth=1 https://github.com/gmg137/netease-cloud-music-gtk "$checkout" From 272ac2866315080e2a11648b18a39c3e4ee8959f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 16 Aug 2022 17:28:45 +0800 Subject: [PATCH 2/2] netease-cloud-music-gtk: fix darwin build --- .../applications/audio/netease-cloud-music-gtk/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix index 9fa1f76aec6e..b854ebb8ce8d 100644 --- a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix +++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -15,6 +15,8 @@ , dbus , libadwaita , gst_all_1 +, Foundation +, SystemConfiguration }: stdenv.mkDerivation rec { @@ -61,7 +63,10 @@ stdenv.mkDerivation rec { gst-plugins-good gst-plugins-bad gst-plugins-ugly - ]); + ]) ++ lib.optionals stdenv.isDarwin [ + Foundation + SystemConfiguration + ]; meta = with lib; { description = "A Rust + GTK based netease cloud music player"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e2c1fd01cc6..469d4704b665 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25302,7 +25302,9 @@ with pkgs; netease-music-tui = callPackage ../applications/audio/netease-music-tui { }; - netease-cloud-music-gtk = callPackage ../applications/audio/netease-cloud-music-gtk { }; + netease-cloud-music-gtk = callPackage ../applications/audio/netease-cloud-music-gtk { + inherit (darwin.apple_sdk.frameworks) Foundation SystemConfiguration; + }; nordic = callPackage ../data/themes/nordic { };