From 57263e77c7ac45843bc00c6aaec396a4d198e403 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Fri, 21 Jan 2022 16:38:58 -0500 Subject: [PATCH] upgrade gtkrs --- Cargo.lock | 336 ++++++++++++++---------------------- Cargo.toml | 10 +- src/application.rs | 2 +- src/main.rs | 4 +- src/mpris_player.rs | 14 +- src/notification_popover.rs | 2 +- src/notification_widget.rs | 4 +- src/notifications.rs | 10 +- src/popover_container.rs | 11 +- src/status_menu.rs | 2 +- src/time_button.rs | 4 +- src/window.rs | 14 +- 12 files changed, 159 insertions(+), 254 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e0bfd6ac..9b824f04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -195,9 +195,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blocking" @@ -239,9 +239,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "cairo-rs" -version = "0.14.9" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482" +checksum = "b869e97a87170f96762f9f178eae8c461147e722ba21dd8814105bf5716bf14a" dependencies = [ "bitflags", "cairo-sys-rs", @@ -252,13 +252,13 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.14.9" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 3.2.0", + "system-deps", ] [[package]] @@ -273,15 +273,6 @@ version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" -[[package]] -name = "cfg-expr" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e" -dependencies = [ - "smallvec", -] - [[package]] name = "cfg-expr" version = "0.9.0" @@ -446,12 +437,6 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946" -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - [[package]] name = "enumflags2" version = "0.7.3" @@ -631,10 +616,11 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f" +checksum = "172dfe1d9dfb62936bf7ad3ede2913a1b21b1e3db56990e46e00789201de9070" dependencies = [ + "bitflags", "gdk-pixbuf-sys", "gio", "glib", @@ -643,22 +629,22 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590" +checksum = "413424d9818621fa3cfc8a3a915cdb89a7c3c507d56761b4ec83a9a98e587171" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps 3.2.0", + "system-deps", ] [[package]] name = "gdk4" -version = "0.3.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f97a162c17214d1bf981af3f683156a0b1667dd1927057c4f0a68513251ecf0f" +checksum = "319c74160dbe3e29cc1bf36ae4a08b9072f352b751e9e3e5501b3aa3ca633f66" dependencies = [ "bitflags", "cairo-rs", @@ -672,26 +658,26 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9498f4e06969fb96a4e4234dfe1d308a3ac6b120b3c6d93e3ec5c77fe88bc6d5" +checksum = "48a39e34abe35ee2cf54a1e29dd983accecd113ad30bdead5050418fa92f2a1b" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gio-sys", "glib-sys", "gobject-sys", - "graphene-sys", "libc", "pango-sys", - "system-deps 5.0.0", + "pkg-config", + "system-deps", ] [[package]] name = "gdk4-wayland" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c930875d2f466207eae96d0110a3233c22744c16087cd0035f73da507f1a1bf5" +checksum = "12e6dcdd75e7fa114869d89c03a00081a3f54d7b5300f7d02a82bd3a97026c40" dependencies = [ "gdk4", "gdk4-wayland-sys", @@ -703,20 +689,20 @@ dependencies = [ [[package]] name = "gdk4-wayland-sys" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89c321379df46fc983d2a6aa0b639832e22ea0f85d64222a10e985b4378565ac" +checksum = "22cbf7fa3fc7714c72902d82229677f9291f7cceb33855c5cef868f177356c30" dependencies = [ "glib-sys", "libc", - "system-deps 5.0.0", + "system-deps", ] [[package]] name = "gdk4-x11" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb34d456170b6293d8d195090e3fd2fa0cb6f44d46b27bb7b729ada679cfa742" +checksum = "f2a54a4f3405461afa18ddc2b5fbeaecc2558fcd8b132ed0c9c7c4ffa2f9ae22" dependencies = [ "gdk4", "gdk4-x11-sys", @@ -728,15 +714,14 @@ dependencies = [ [[package]] name = "gdk4-x11-sys" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3e38c047b930780e687774a050f65e10cc1186494b36ef0e8ec09271a19fa4" +checksum = "1eb40aebb4f15b270df2ac2c463bf7f6d82211d9c5df1d13b84541a63a3139d7" dependencies = [ "gdk4-sys", "glib-sys", "libc", - "system-deps 5.0.0", - "x11", + "system-deps", ] [[package]] @@ -748,16 +733,6 @@ dependencies = [ "futures", ] -[[package]] -name = "gethostname" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "getrandom" version = "0.2.3" @@ -771,9 +746,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.14.8" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711c3632b3ebd095578a9c091418d10fed492da9443f58ebc8f45efbeb215cb0" +checksum = "5e14e0166f772d6295cfda361d227a63194497641a42da81b9e531c9f5a4d77f" dependencies = [ "bitflags", "futures-channel", @@ -788,22 +763,22 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa" +checksum = "04b57719ccaacf2a0d9c79f151be629f3a3ef3991658ee2af0bb66287e4ea86c" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 3.2.0", + "system-deps", "winapi", ] [[package]] name = "glib" -version = "0.14.8" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4" +checksum = "30a3e6b2e5ef2ecfb10c1e083074a81160b8f6408fcc08195c872e9de37a361b" dependencies = [ "bitflags", "futures-channel", @@ -816,16 +791,17 @@ dependencies = [ "libc", "once_cell", "smallvec", + "thiserror", ] [[package]] name = "glib-macros" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518" +checksum = "54c0c7194ee4c597b334e3ce84d22d929405e94497828e1c54da762cbe8e3d93" dependencies = [ "anyhow", - "heck", + "heck 0.4.0", "proc-macro-crate", "proc-macro-error", "proc-macro2", @@ -835,30 +811,30 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae" +checksum = "c668102c6e15e0a7f6b99b59f602c2e806967bb86414f617b77e19b1de5b3fac" dependencies = [ "libc", - "system-deps 3.2.0", + "system-deps", ] [[package]] name = "gobject-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5" +checksum = "6edb1f0b3e4c08e2a0a490d1082ba9e902cdff8ff07091e85c6caec60d17e2ab" dependencies = [ "glib-sys", "libc", - "system-deps 3.2.0", + "system-deps", ] [[package]] name = "graphene-rs" -version = "0.14.8" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3380f132530ef9eb9e0a2bac180e30390aa5e49892d20294f822a974117a563" +checksum = "7c54f9fbbeefdb62c99f892dfca35f83991e2cb5b46a8dc2a715e58612f85570" dependencies = [ "glib", "graphene-sys", @@ -867,21 +843,21 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.14.8" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9ac7450b3aa80792513a3c029920a2ede419de13fb5169a4e51b07a5685332" +checksum = "03f311acb023cf7af5537f35de028e03706136eead7f25a31e8fd26f5011e0b3" dependencies = [ "glib-sys", "libc", "pkg-config", - "system-deps 3.2.0", + "system-deps", ] [[package]] name = "gsk4" -version = "0.3.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff59ca46c4fc5087fd7a0c3770a71ea4b6e94f8c24c12e2c2e8538f9f6fd764" +checksum = "0672c63e4101e19d5e9cb4a0aed8b3278e9573529bd0b6a86d9c748c71bd9882" dependencies = [ "bitflags", "cairo-rs", @@ -895,9 +871,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aa53ce70234da02f9954339d988d5ab853d746a8f47a4ae17735ff873545b5" +checksum = "e31d21d7ce02ba261bb24c50c4ab238a10b41a2c97c32afffae29471b7cca69b" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -906,14 +882,14 @@ dependencies = [ "graphene-sys", "libc", "pango-sys", - "system-deps 5.0.0", + "system-deps", ] [[package]] name = "gtk4" -version = "0.3.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58a04f421d1485ba4739e723199f5828bca05ab4e622ed39a96a342b6b1a6a3d" +checksum = "b5020aeb559e0431930d66d85b8f16fc453fc0863466b13b7e1e1b800cf1a47b" dependencies = [ "bitflags", "cairo-rs", @@ -934,13 +910,11 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.3.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5068d4354af02454f44687adc613100aa98ae11e273cdcac84f89dc08be2b4a1" +checksum = "573db42bb64973a4d5f718b73caa7204285a1a665308a23b11723d0ee56ec305" dependencies = [ "anyhow", - "heck", - "itertools", "proc-macro-crate", "proc-macro-error", "proc-macro2", @@ -950,9 +924,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e20a64c8f0ddcff8902ff04c130747f2fb7834a43530f75d03d6c71335733b49" +checksum = "1544614a8d44f38719a2fdfd608d644d5f385beab33e5852688f48a983a2b583" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -964,7 +938,7 @@ dependencies = [ "gsk4-sys", "libc", "pango-sys", - "system-deps 5.0.0", + "system-deps", ] [[package]] @@ -976,6 +950,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1006,15 +986,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "itertools" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.1" @@ -1036,7 +1007,7 @@ checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#6195ab2db956d1178c853fa4b5e07d4898e31cc4" +source = "git+https://github.com/pop-os/libcosmic?branch=layershell#02fb21bebada4db1b1bb86d2ea11124dd3c40ddb" dependencies = [ "cascade", "derivative", @@ -1046,18 +1017,21 @@ dependencies = [ "gdk4-wayland", "gdk4-x11", "gio", + "glib-sys", "gobject-sys", "gtk4", + "gtk4-sys", + "libloading", "once_cell", "pop-launcher", "pop-launcher-service", + "relm4-macros", "serde", "serde_json", "tokio", "wayland-client", "wayland-protocols", "x11", - "x11rb", "xdg", "zbus", "zvariant", @@ -1066,9 +1040,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52" +checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ "cfg-if", "winapi", @@ -1100,22 +1074,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.20.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945" -dependencies = [ - "bitflags", - "cc", - "cfg-if", - "libc", - "memoffset", -] - -[[package]] -name = "nix" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3bb9a13fa32bc5aeb64150cd3f32d6cf4c748f8f8a417cce5d2eb976a8370ba" +checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187" dependencies = [ "bitflags", "cc", @@ -1184,9 +1145,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.14.8" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581" +checksum = "79211eff430c29cc38c69e0ab54bc78fa1568121ca9737707eee7f92a8417a94" dependencies = [ "bitflags", "glib", @@ -1197,14 +1158,14 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe" +checksum = "7022c2fb88cd2d9d55e1a708a8c53a3ae8678234c4a54bf623400aeb7f31fac2" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 3.2.0", + "system-deps", ] [[package]] @@ -1518,6 +1479,16 @@ version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +[[package]] +name = "relm4-macros" +version = "0.4.1" +source = "git+https://github.com/AaronErhardt/Relm4#90c5a89a194d138e34a3eb214f4150e582ed5227" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "ron" version = "0.7.0" @@ -1576,18 +1547,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" +checksum = "96b3c34c1690edf8174f5b289a336ab03f568a4460d8c6df75f2f3a692b3bc6a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" +checksum = "784ed1fbfa13fe191077537b0d70ec8ad1e903cfe04831da608aa36457cb653d" dependencies = [ "proc-macro2", "quote", @@ -1596,9 +1567,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.74" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" +checksum = "c059c05b48c5c0067d4b4b2b4f0732dd65feb52daf7e0ea09cd87e7dadc1af79" dependencies = [ "itoa", "ryu", @@ -1725,24 +1696,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "strum" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" - -[[package]] -name = "strum_macros" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "syn" version = "1.0.84" @@ -1756,30 +1709,12 @@ dependencies = [ [[package]] name = "system-deps" -version = "3.2.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6" +checksum = "7b1487aaddaacbc5d60a2a507ba1617c5ca66c57dd0dd07d0c5efd5b693841d4" dependencies = [ - "anyhow", - "cfg-expr 0.8.1", - "heck", - "itertools", - "pkg-config", - "strum", - "strum_macros", - "thiserror", - "toml", - "version-compare", -] - -[[package]] -name = "system-deps" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" -dependencies = [ - "cfg-expr 0.9.0", - "heck", + "cfg-expr", + "heck 0.3.3", "pkg-config", "toml", "version-compare", @@ -1919,9 +1854,9 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "version-compare" -version = "0.0.11" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" +checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" [[package]] name = "version_check" @@ -1943,14 +1878,14 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wayland-client" -version = "0.28.6" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355" +checksum = "91223460e73257f697d9e23d401279123d36039a3f7a449e983f123292d4458f" dependencies = [ "bitflags", "downcast-rs", "libc", - "nix 0.20.2", + "nix 0.22.0", "scoped-tls", "wayland-commons", "wayland-scanner", @@ -1959,11 +1894,11 @@ dependencies = [ [[package]] name = "wayland-commons" -version = "0.28.6" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda" +checksum = "94f6e5e340d7c13490eca867898c4cec5af56c27a5ffe5c80c6fc4708e22d33e" dependencies = [ - "nix 0.20.2", + "nix 0.22.0", "once_cell", "smallvec", "wayland-sys", @@ -1971,9 +1906,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.28.6" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f" +checksum = "60147ae23303402e41fe034f74fb2c35ad0780ee88a1c40ac09a3be1e7465741" dependencies = [ "bitflags", "wayland-client", @@ -1983,9 +1918,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.28.6" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1" +checksum = "39a1ed3143f7a143187156a2ab52742e89dac33245ba505c17224df48939f9e0" dependencies = [ "proc-macro2", "quote", @@ -1994,9 +1929,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.28.6" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8" +checksum = "d9341df79a8975679188e37dab3889bfa57c44ac2cb6da166f519a81cbe452d4" dependencies = [ "dlib", "pkg-config", @@ -2027,15 +1962,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -2052,18 +1978,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "x11rb" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a" -dependencies = [ - "gethostname", - "nix 0.22.2", - "winapi", - "winapi-wsapoll", -] - [[package]] name = "xdg" version = "2.4.0" @@ -2081,9 +1995,9 @@ checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" [[package]] name = "zbus" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b6202696b4dc8ee26ff92939c79a0307e7cd683374fdf500902d74d914fef6" +checksum = "2ac8424f5aa1f239d2d7ecb32f9d5ffc6fcf5fb9298d2d524a7e7c8b258c3f80" dependencies = [ "async-broadcast", "async-channel", @@ -2116,9 +2030,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd2ea67f43e8abd245eabc480e597990340d9870b585d40bf4350d742acb2219" +checksum = "3e03af45fc15e2c977161c5ffea56c43c41f425a963affd7074bf91b5bf5a8cf" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2140,9 +2054,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a946c049b2eac1a253f98e9267a8ce7a3d93be274ea146e6dd7a0965232a911" +checksum = "bbb31b009e0b0c4f2c1283c9c23129e4f76020da4b3c4dfa032abfbfe30a2c02" dependencies = [ "byteorder", "enumflags2", @@ -2154,9 +2068,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fce5afb8d639bff79b1e8cdb258a3ca22d458f4603b23d794b4cb4e878c990" +checksum = "5295bdc2688c7239423889191d730ad071f814dc36c48edf7cda23f38dd28b2a" dependencies = [ "proc-macro-crate", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 4007838a..b623bd6b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,11 +12,11 @@ derivative = "2" enumflags2 = "0.7" futures = "0.3" futures-channel = "0.3" -gdk4-x11 = "0.3" -gdk4-wayland = { version = "0.3", optional = true } -gtk4 = "0.3" -gobject-sys = "0.14.0" -libcosmic = { git = "https://github.com/pop-os/libcosmic" } +gdk4-x11 = { version = "0.4.2", features = [ "xlib" ] } +gdk4-wayland = { version = "0.4", optional = true } +gtk4 = "0.4" +gobject-sys = "0.15" +libcosmic = { git = "https://github.com/pop-os/libcosmic", branch = "layershell"} once_cell = "1" serde = "1" toml = "0.5" diff --git a/src/application.rs b/src/application.rs index 6fe8eeb4..a64f2d63 100644 --- a/src/application.rs +++ b/src/application.rs @@ -45,7 +45,7 @@ impl ApplicationImpl for PanelAppInner { self.activated.set(true); let display = gdk::Display::default().unwrap(); - let monitors = display.monitors().unwrap(); + let monitors = display.monitors(); for i in 0..monitors.n_items() { obj.add_window_for_monitor(monitors.item(i).unwrap().downcast().unwrap()); diff --git a/src/main.rs b/src/main.rs index cbf04e26..e7498ede 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,5 +19,7 @@ mod window; use application::PanelApp; fn main() { - glib::MainContext::default().with_thread_default(|| PanelApp::new().run()); + glib::MainContext::default() + .with_thread_default(|| PanelApp::new().run()) + .unwrap(); } diff --git a/src/mpris_player.rs b/src/mpris_player.rs index 45d69b38..940e0d4a 100644 --- a/src/mpris_player.rs +++ b/src/mpris_player.rs @@ -51,7 +51,7 @@ impl ObjectImpl for MprisPlayerInner { ..set_max_width_chars(20); ..set_attributes(Some(&cascade! { pango::AttrList::new(); - ..insert(pango::Attribute::new_weight(pango::Weight::Bold)); + ..insert(pango::AttrInt::new_weight(pango::Weight::Bold)); })); }; @@ -63,17 +63,17 @@ impl ObjectImpl for MprisPlayerInner { }; let backward_button = cascade! { - gtk4::Button::from_icon_name(Some("media-skip-backward-symbolic")); + gtk4::Button::from_icon_name("media-skip-backward-symbolic"); ..connect_clicked(clone!(@strong obj => move |_| obj.call("Previous"))); }; let play_pause_button = cascade! { - gtk4::Button::from_icon_name(Some("media-playback-start-symbolic")); + gtk4::Button::from_icon_name("media-playback-start-symbolic"); ..connect_clicked(clone!(@strong obj => move |_| obj.call("PlayPause"))); }; let forward_button = cascade! { - gtk4::Button::from_icon_name(Some("media-skip-forward-symbolic")); + gtk4::Button::from_icon_name("media-skip-forward-symbolic"); ..connect_clicked(clone!(@strong obj => move |_| obj.call("Next"))); }; @@ -168,10 +168,8 @@ impl MprisPlayer { let pixbuf = async { // TODO: Security? let file = gio::File::for_uri(&arturl?); - let stream = file.read_async_future(glib::PRIORITY_DEFAULT).await.ok()?; - gdk_pixbuf::Pixbuf::from_stream_async_future(&stream) - .await - .ok() + let stream = file.read_future(glib::PRIORITY_DEFAULT).await.ok()?; + gdk_pixbuf::Pixbuf::from_stream_future(&stream).await.ok() } .await; if let Some(pixbuf) = pixbuf { diff --git a/src/notification_popover.rs b/src/notification_popover.rs index 2fee186c..d5f3f1c2 100644 --- a/src/notification_popover.rs +++ b/src/notification_popover.rs @@ -117,7 +117,7 @@ impl NotificationPopover { fn stop_timer(&self) { if let Some(source) = self.inner().source.borrow_mut().take() { - glib::source_remove(source); + source.remove(); } } diff --git a/src/notification_widget.rs b/src/notification_widget.rs index 817b3b26..805b2260 100644 --- a/src/notification_widget.rs +++ b/src/notification_widget.rs @@ -38,7 +38,7 @@ impl ObjectImpl for NotificationWidgetInner { ..set_max_width_chars(20); ..set_attributes(Some(&cascade! { pango::AttrList::new(); - ..insert(pango::Attribute::new_weight(pango::Weight::Bold)); + ..insert(pango::AttrInt::new_weight(pango::Weight::Bold)); })); }; @@ -65,7 +65,7 @@ impl ObjectImpl for NotificationWidgetInner { ..style_context().add_class("flat"); ..set_valign(gtk4::Align::Start); ..set_child(Some(&cascade! { - gtk4::Image::from_icon_name(Some("window-close-symbolic")); + gtk4::Image::from_icon_name("window-close-symbolic"); ..set_pixel_size(8); })); ..connect_clicked(clone!(@weak obj => move |_| { diff --git a/src/notifications.rs b/src/notifications.rs index c3bf4f87..33a921d9 100644 --- a/src/notifications.rs +++ b/src/notifications.rs @@ -268,8 +268,8 @@ impl fmt::Debug for Hints { } #[repr(transparent)] -#[derive(Debug, Clone, Copy, Hash, glib::GBoxed, PartialEq, Eq)] -#[gboxed(type_name = "S76NotificationId")] +#[derive(Debug, Clone, Copy, Hash, glib::Boxed, PartialEq, Eq)] +#[boxed_type(name = "S76NotificationId")] pub struct NotificationId(NonZeroU32); impl Default for NotificationId { @@ -331,7 +331,7 @@ impl Notifications { if let Some(event) = receiver.next().await { match event { Event::NotificationReceived(id) => { - notifications.emit_by_name("notification-received", &[&id]).unwrap(); + notifications.emit_by_name::<()>("notification-received", &[&id]); } Event::CloseNotification(id) => { notifications.close_notification(id, CloseReason::Call).await @@ -356,7 +356,7 @@ impl Notifications { .unwrap() .remove(&id); - self.emit_by_name("notification-closed", &[&id]).unwrap(); + self.emit_by_name::<()>("notification-closed", &[&id]); if let Some(connection) = self.inner().connection.get() { let ctxt = SignalContext::new(connection, PATH).unwrap(); // XXX unwrap? @@ -401,7 +401,6 @@ impl Notifications { } None }) - .unwrap() } pub fn connect_notification_closed( @@ -413,6 +412,5 @@ impl Notifications { cb(id); None }) - .unwrap() } } diff --git a/src/popover_container.rs b/src/popover_container.rs index 6d9acba0..2e551294 100644 --- a/src/popover_container.rs +++ b/src/popover_container.rs @@ -44,15 +44,8 @@ impl WidgetImpl for PopoverContainerInner { } fn size_allocate(&self, _obj: &PopoverContainer, width: i32, height: i32, baseline: i32) { - self.child.size_allocate( - >k4::Allocation { - x: 0, - y: 0, - width, - height, - }, - baseline, - ); + self.child + .size_allocate(>k4::Allocation::new(0, 0, width, height), baseline); self.popover.present(); } diff --git a/src/status_menu.rs b/src/status_menu.rs index 2a233d57..7505ad17 100644 --- a/src/status_menu.rs +++ b/src/status_menu.rs @@ -209,7 +209,7 @@ impl StatusMenu { } glib::MainContext::default().spawn_local(clone!(@strong self_ => async move { let _ = self_.inner().dbus_menu.event(id, "clicked", &0.into(), 0).await; - })) + })); })); }; box_.append(&button); diff --git a/src/time_button.rs b/src/time_button.rs index 9b671dda..4a9b45ce 100644 --- a/src/time_button.rs +++ b/src/time_button.rs @@ -43,7 +43,7 @@ impl ObjectImpl for TimeButtonInner { gtk4::Label::new(None); ..set_attributes(Some(&cascade! { pango::AttrList::new(); - ..insert(pango::Attribute::new_weight(pango::Weight::Bold)); + ..insert(pango::AttrInt::new_weight(pango::Weight::Bold)); })); }; @@ -120,7 +120,7 @@ impl TimeButton { } fn opening(&self) { - let date = glib::DateTime::new_now(&glib::TimeZone::new_local()).unwrap(); + let date = glib::DateTime::now(&glib::TimeZone::local()).unwrap(); self.inner().calendar.clear_marks(); self.inner().calendar.select_day(&date); } diff --git a/src/window.rs b/src/window.rs index 419c4ce2..5b1655e6 100644 --- a/src/window.rs +++ b/src/window.rs @@ -67,7 +67,7 @@ fn button(text: &str) -> gtk4::Button { gtk4::Label::new(Some(text)); ..set_attributes(Some(&cascade! { pango::AttrList::new(); - ..insert(pango::Attribute::new_weight(pango::Weight::Bold)); + ..insert(pango::AttrInt::new_weight(pango::Weight::Bold)); })); }; @@ -118,7 +118,7 @@ impl WidgetImpl for PanelWindowInner { fn realize(&self, obj: &PanelWindow) { self.parent_realize(obj); - let surface = obj.surface().unwrap(); + let surface = obj.surface(); surface.connect_layout(clone!(@weak obj => move |_surface, width, height| { let size = Some((width, height)); if obj.inner().size.replace(size) != size { @@ -180,7 +180,7 @@ impl PanelWindow { monitor.connect_invalidate(clone!(@weak obj => move |_| obj.close())); - obj.set_size_request(monitor.geometry().width, 0); + obj.set_size_request(monitor.geometry().width(), 0); obj.inner().monitor.set(monitor); obj.inner() @@ -198,7 +198,7 @@ impl PanelWindow { fn monitor_geometry_changed(&self) { let geometry = self.inner().monitor.geometry(); - self.set_size_request(geometry.width, 0); + self.set_size_request(geometry.width(), 0); let height = if let Some((_width, height)) = self.inner().size.get() { height as x::c_ulong @@ -207,12 +207,12 @@ impl PanelWindow { }; if let Some((display, surface)) = x::get_window_x11(self) { - let start_x = geometry.x as x::c_ulong; - let end_x = start_x + geometry.width as x::c_ulong - 1; + let start_x = geometry.x() as x::c_ulong; + let end_x = start_x + geometry.width() as x::c_ulong - 1; unsafe { let y = if BOTTOM { - geometry.height as x::c_int - height as x::c_int + geometry.height() as x::c_int - height as x::c_int } else { 0 };