diff --git a/Cargo.lock b/Cargo.lock index 942467c..d4bd243 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -211,20 +211,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" -[[package]] -name = "cairo-rs" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" -dependencies = [ - "bitflags 2.5.0", - "cairo-sys-rs 0.18.2", - "glib 0.18.5", - "libc", - "once_cell", - "thiserror", -] - [[package]] name = "cairo-rs" version = "0.19.4" @@ -232,30 +218,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ "bitflags 2.5.0", - "cairo-sys-rs 0.19.2", - "glib 0.19.7", + "cairo-sys-rs", + "glib", "libc", "thiserror", ] -[[package]] -name = "cairo-sys-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" -dependencies = [ - "glib-sys 0.18.1", - "libc", - "system-deps", -] - [[package]] name = "cairo-sys-rs" version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" dependencies = [ - "glib-sys 0.19.5", + "glib-sys", "libc", "system-deps", ] @@ -904,35 +879,22 @@ dependencies = [ "futures-core", "futures-io", "futures-util", - "gio-sys 0.19.5", - "glib 0.19.7", + "gio-sys", + "glib", "libc", "pin-project-lite", "smallvec", "thiserror", ] -[[package]] -name = "gio-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" -dependencies = [ - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "system-deps", - "winapi", -] - [[package]] name = "gio-sys" version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" dependencies = [ - "glib-sys 0.19.5", - "gobject-sys 0.19.5", + "glib-sys", + "gobject-sys", "libc", "system-deps", "windows-sys 0.52.0", @@ -955,29 +917,6 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" -[[package]] -name = "glib" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" -dependencies = [ - "bitflags 2.5.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys 0.18.1", - "glib-macros 0.18.5", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "memchr", - "once_cell", - "smallvec", - "thiserror", -] - [[package]] name = "glib" version = "0.19.7" @@ -990,30 +929,16 @@ dependencies = [ "futures-executor", "futures-task", "futures-util", - "gio-sys 0.19.5", - "glib-macros 0.19.7", - "glib-sys 0.19.5", - "gobject-sys 0.19.5", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", "libc", "memchr", "smallvec", "thiserror", ] -[[package]] -name = "glib-macros" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" -dependencies = [ - "heck 0.4.1", - "proc-macro-crate 2.0.0", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.49", -] - [[package]] name = "glib-macros" version = "0.19.7" @@ -1021,22 +946,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e" dependencies = [ "heck 0.5.0", - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.49", ] -[[package]] -name = "glib-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" -dependencies = [ - "libc", - "system-deps", -] - [[package]] name = "glib-sys" version = "0.19.5" @@ -1080,24 +995,13 @@ dependencies = [ "wgpu", ] -[[package]] -name = "gobject-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" -dependencies = [ - "glib-sys 0.18.1", - "libc", - "system-deps", -] - [[package]] name = "gobject-sys" version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" dependencies = [ - "glib-sys 0.19.5", + "glib-sys", "libc", "system-deps", ] @@ -1768,7 +1672,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.49", @@ -1889,7 +1793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" dependencies = [ "gio", - "glib 0.19.7", + "glib", "libc", "pango-sys", ] @@ -1900,8 +1804,8 @@ version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" dependencies = [ - "glib-sys 0.19.5", - "gobject-sys 0.19.5", + "glib-sys", + "gobject-sys", "libc", "system-deps", ] @@ -1912,8 +1816,8 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6620c77967c62c7a84c6ca15ab855e8eecb248beb8ee43bc0eeaadd39123f687" dependencies = [ - "cairo-rs 0.19.4", - "glib 0.19.7", + "cairo-rs", + "glib", "libc", "pango", "pangocairo-sys", @@ -1925,8 +1829,8 @@ version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d680caf5094d735c37312ce9166127a1d759d86a3d632b83d4a5354ee7568659" dependencies = [ - "cairo-sys-rs 0.19.2", - "glib-sys 0.19.5", + "cairo-sys-rs", + "glib-sys", "libc", "pango-sys", "system-deps", @@ -2062,15 +1966,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" -[[package]] -name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.2", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -2080,30 +1975,6 @@ dependencies = [ "toml_edit 0.21.1", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" version = "1.0.78" @@ -2486,7 +2357,7 @@ name = "starcolorkeyboard" version = "0.2.0" dependencies = [ "bitflags 2.5.0", - "cairo-rs 0.18.5", + "cairo-rs", "layershellev", "memmap2 0.9.4", "pango", diff --git a/starcolorkeyboard/Cargo.toml b/starcolorkeyboard/Cargo.toml index d58ed2a..95c8834 100644 --- a/starcolorkeyboard/Cargo.toml +++ b/starcolorkeyboard/Cargo.toml @@ -13,7 +13,7 @@ tempfile.workspace = true xkbcommon = "0.7.0" -cairo-rs = "0.18.2" +cairo-rs = "0.19.4" pango = "0.19.5" pangocairo = "0.19.2"