diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 640654c..0e78b15 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,26 +27,20 @@ jobs: matrix: include: - platform: windows-latest - toolchain: "1.90" cargo-args: "" - platform: macos-latest - toolchain: "1.90" cargo-args: "" - platform: ubuntu-latest backend: (libappindicator) - toolchain: "1.90" cargo-args: "" - platform: ubuntu-latest backend: (ksni) - toolchain: "1.90" cargo-args: --no-default-features --features ksni - platform: ubuntu-latest backend: (ksni + gtk3) - toolchain: "1.90" cargo-args: --no-default-features --features ksni,muda-gtk3 - platform: ubuntu-latest backend: (ksni + gtk4) - toolchain: "1.92" cargo-args: --no-default-features --features ksni,muda-gtk4 runs-on: ${{ matrix.platform }} @@ -60,9 +54,8 @@ jobs: sudo apt-get update sudo apt-get install -y libgtk-3-dev libgtk-4-dev libxdo-dev libayatana-appindicator3-dev - - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ matrix.toolchain }} + - uses: dtolnay/rust-toolchain@1.92 + - run: cargo build ${{ matrix.cargo-args }} - uses: dtolnay/rust-toolchain@stable diff --git a/Cargo.lock b/Cargo.lock index bd8bedb..479ae0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -355,25 +355,25 @@ dependencies = [ [[package]] name = "atk" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b" +checksum = "780a62f5d3373a8461bdc9258527bd03fe9299779446681199005712b24cc1d7" dependencies = [ "atk-sys", - "glib 0.18.5", + "glib", "libc", ] [[package]] name = "atk-sys" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086" +checksum = "56fd0f13d1dedae306538653b8e42034a2260d1ac3ee920e7a5c31475d7184a5" dependencies = [ - "glib-sys 0.18.1", - "gobject-sys 0.18.0", + "glib-sys", + "gobject-sys", "libc", - "system-deps 6.2.2", + "system-deps 9.0.0", ] [[package]] @@ -559,20 +559,6 @@ version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" -[[package]] -name = "cairo-rs" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" -dependencies = [ - "bitflags 2.13.2", - "cairo-sys-rs 0.18.2", - "glib 0.18.5", - "libc", - "once_cell", - "thiserror 1.0.69", -] - [[package]] name = "cairo-rs" version = "0.22.9" @@ -580,29 +566,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df683f1d30b457964673a5541a4603208ef95ab6873d2a55871895cf310f3b56" dependencies = [ "bitflags 2.13.2", - "cairo-sys-rs 0.22.9", - "glib 0.22.9", + "cairo-sys-rs", + "glib", "libc", ] -[[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 6.2.2", -] - [[package]] name = "cairo-sys-rs" version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee548131103ad8f698c6725669647b9c757b3b66992dd6a026037596417bee21" dependencies = [ - "glib-sys 0.22.9", + "glib-sys", "libc", "system-deps 9.0.0", ] @@ -650,16 +625,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon 0.12.16", -] - [[package]] name = "cfg-expr" version = "0.20.9" @@ -667,7 +632,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe4ece8474b5f766c63426647e7b4b316b67431ade1036a8313cee24a03ae917" dependencies = [ "smallvec", - "target-lexicon 0.13.5", + "target-lexicon", ] [[package]] @@ -1365,30 +1330,17 @@ dependencies = [ [[package]] name = "gdk" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691" +checksum = "50b79a7fa8b0e9fe6c77118e48cc00a23eb41052c190434d9cda7746418efca6" dependencies = [ - "cairo-rs 0.18.5", - "gdk-pixbuf 0.18.5", + "cairo-rs", + "gdk-pixbuf", "gdk-sys", - "gio 0.18.4", - "glib 0.18.5", + "gio", + "glib", "libc", - "pango 0.18.3", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" -dependencies = [ - "gdk-pixbuf-sys 0.18.0", - "gio 0.18.4", - "glib 0.18.5", - "libc", - "once_cell", + "pango", ] [[package]] @@ -1397,53 +1349,40 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25f420376dbee041b2db374ce4573892a36222bb3f6c0c43e24f0d67eae9b646" dependencies = [ - "gdk-pixbuf-sys 0.22.9", - "gio 0.22.9", - "glib 0.22.9", + "gdk-pixbuf-sys", + "gio", + "glib", "libc", ] -[[package]] -name = "gdk-pixbuf-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" -dependencies = [ - "gio-sys 0.18.1", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "system-deps 6.2.2", -] - [[package]] name = "gdk-pixbuf-sys" version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5209294ba3775f9b650bf78bfadeba4332089f2329b3e2f6ce0a4957a45bff" dependencies = [ - "gio-sys 0.22.9", - "glib-sys 0.22.9", - "gobject-sys 0.22.9", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", "system-deps 9.0.0", ] [[package]] name = "gdk-sys" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7" +checksum = "463ac2e2f204918dcaeb3c34810bd7fe94448d2b8d4fa13a5ab45a4fc3e88e50" dependencies = [ - "cairo-sys-rs 0.18.2", - "gdk-pixbuf-sys 0.18.0", - "gio-sys 0.18.1", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", - "pango-sys 0.18.0", + "pango-sys", "pkg-config", - "system-deps 6.2.2", + "system-deps 9.0.0", ] [[package]] @@ -1452,13 +1391,13 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d81e2a6c6ecba2aab60633a98df1868b03fa0bfdce8105edc27c1bccf71f0e39" dependencies = [ - "cairo-rs 0.22.9", - "gdk-pixbuf 0.22.0", + "cairo-rs", + "gdk-pixbuf", "gdk4-sys", - "gio 0.22.9", - "glib 0.22.9", + "gio", + "glib", "libc", - "pango 0.22.9", + "pango", ] [[package]] @@ -1467,41 +1406,42 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d8f608d8d7d229975c4d0d026f5d3071598c4ddab3c5262b0a31840fec78d13" dependencies = [ - "cairo-sys-rs 0.22.9", - "gdk-pixbuf-sys 0.22.9", - "gio-sys 0.22.9", - "glib-sys 0.22.9", - "gobject-sys 0.22.9", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", - "pango-sys 0.22.9", + "pango-sys", "pkg-config", "system-deps 7.0.8", ] [[package]] name = "gdkwayland-sys" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140071d506d223f7572b9f09b5e155afbd77428cd5cc7af8f2694c41d98dfe69" +checksum = "82559ece0c0952519a3513ecd90638e5db59e00c851f1d3ea05ac7ff2a46942e" dependencies = [ "gdk-sys", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", + "glib-sys", + "gobject-sys", "libc", "pkg-config", - "system-deps 6.2.2", + "system-deps 9.0.0", ] [[package]] name = "gdkx11-sys" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e7445fe01ac26f11601db260dd8608fe172514eb63b3b5e261ea6b0f4428d" +checksum = "a103facf2056ce28125a49501f98beb01d1e3c9477257a8e05cfc5d3d677709e" dependencies = [ + "cairo-sys-rs", "gdk-sys", - "glib-sys 0.18.1", + "glib-sys", "libc", - "system-deps 6.2.2", + "system-deps 9.0.0", "x11", ] @@ -1536,25 +1476,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "gio" -version = "0.18.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys 0.18.1", - "glib 0.18.5", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror 1.0.69", -] - [[package]] name = "gio" version = "0.22.9" @@ -1565,34 +1486,21 @@ dependencies = [ "futures-core", "futures-io", "futures-util", - "gio-sys 0.22.9", - "glib 0.22.9", + "gio-sys", + "glib", "libc", "pin-project-lite", "smallvec", ] -[[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 6.2.2", - "winapi", -] - [[package]] name = "gio-sys" version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c28739f914c15b87a9856000bed9cbd5b3a8afbca5e982d9a299e1601422cb5" dependencies = [ - "glib-sys 0.22.9", - "gobject-sys 0.22.9", + "glib-sys", + "gobject-sys", "libc", "system-deps 9.0.0", "windows-sys 0.61.2", @@ -1609,29 +1517,6 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "glib" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" -dependencies = [ - "bitflags 2.13.2", - "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 1.0.69", -] - [[package]] name = "glib" version = "0.22.9" @@ -1644,51 +1529,27 @@ dependencies = [ "futures-executor", "futures-task", "futures-util", - "gio-sys 0.22.9", - "glib-macros 0.22.9", - "glib-sys 0.22.9", - "gobject-sys 0.22.9", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", "libc", "memchr", "smallvec", ] -[[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.96", -] - [[package]] name = "glib-macros" version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9597c68fa7bdf4154a3079642cd21c4dccac0b0bdd2897d82861523bf91e7b9" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn 3.0.4", ] -[[package]] -name = "glib-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" -dependencies = [ - "libc", - "system-deps 6.2.2", -] - [[package]] name = "glib-sys" version = "0.22.9" @@ -1777,24 +1638,13 @@ dependencies = [ "gl_generator", ] -[[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 6.2.2", -] - [[package]] name = "gobject-sys" version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07595c9ba696bd9819cb6a8df39f08078f3dd679508fe052dd558492c2053834" dependencies = [ - "glib-sys 0.22.9", + "glib-sys", "libc", "system-deps 9.0.0", ] @@ -1844,7 +1694,7 @@ version = "0.22.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb856b9c558971c3f13ab692358926da710b046932a4e087aedcc35b040d7dff" dependencies = [ - "glib 0.22.9", + "glib", "graphene-sys", ] @@ -1854,7 +1704,7 @@ version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97842c7543828f98aa5583aa54fcda28aa84fa2b0f8c556142177f7bbb638057" dependencies = [ - "glib-sys 0.22.9", + "glib-sys", "libc", "system-deps 9.0.0", ] @@ -1865,13 +1715,13 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b867be1c5f14dcb8f552c0eff6e9a9b1da5f8b43943e8efc3a63c889d84952ff" dependencies = [ - "cairo-rs 0.22.9", + "cairo-rs", "gdk4", - "glib 0.22.9", + "glib", "graphene-rs", "gsk4-sys", "libc", - "pango 0.22.9", + "pango", ] [[package]] @@ -1880,66 +1730,65 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b7c7eb2e681ee896646cfb8872b431f24d09f53ba9283289d9b10caa6707088" dependencies = [ - "cairo-sys-rs 0.22.9", + "cairo-sys-rs", "gdk4-sys", - "glib-sys 0.22.9", - "gobject-sys 0.22.9", + "glib-sys", + "gobject-sys", "graphene-sys", "libc", - "pango-sys 0.22.9", + "pango-sys", "system-deps 7.0.8", ] [[package]] name = "gtk" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a" +checksum = "a86cafafc177054a1d555a0b302044d2b5f82e1c1e23d152a7ba252dc6bfced0" dependencies = [ "atk", - "cairo-rs 0.18.5", + "cairo-rs", "field-offset", "futures-channel", "gdk", - "gdk-pixbuf 0.18.5", - "gio 0.18.4", - "glib 0.18.5", + "gdk-pixbuf", + "gio", + "glib", "gtk-sys", "gtk3-macros", "libc", - "pango 0.18.3", + "pango", "pkg-config", ] [[package]] name = "gtk-sys" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414" +checksum = "a0e6f055c4a2ce6598b32373595b0c9985f1c7cc448afe4f09fee33fb738b488" dependencies = [ "atk-sys", - "cairo-sys-rs 0.18.2", - "gdk-pixbuf-sys 0.18.0", + "cairo-sys-rs", + "gdk-pixbuf-sys", "gdk-sys", - "gio-sys 0.18.1", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", - "pango-sys 0.18.0", - "system-deps 6.2.2", + "pango-sys", + "system-deps 9.0.0", ] [[package]] name = "gtk3-macros" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d" +checksum = "5fcce21fcb0c4c4fc48bab8d4eee5aacdb361f85d234756430e6e793bd3d95cf" dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.96", + "syn 3.0.4", ] [[package]] @@ -1948,19 +1797,19 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98a0a0466484f64b07b5b8184d43fa46be78eb0b8e04ae4e179af31d770b76d9" dependencies = [ - "cairo-rs 0.22.9", + "cairo-rs", "field-offset", "futures-channel", - "gdk-pixbuf 0.22.0", + "gdk-pixbuf", "gdk4", - "gio 0.22.9", - "glib 0.22.9", + "gio", + "glib", "graphene-rs", "gsk4", "gtk4-macros", "gtk4-sys", "libc", - "pango 0.22.9", + "pango", ] [[package]] @@ -1969,7 +1818,7 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ac7179400a36a04de039c24206bb841c5596992b907b43b23ee8d5bdc40d00e" dependencies = [ - "proc-macro-crate 3.5.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.96", @@ -1981,16 +1830,16 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82b8f954786af0b1984425c4446b77f5ff6594346181316be3f850caab1c6f01" dependencies = [ - "cairo-sys-rs 0.22.9", - "gdk-pixbuf-sys 0.22.9", + "cairo-sys-rs", + "gdk-pixbuf-sys", "gdk4-sys", - "gio-sys 0.22.9", - "glib-sys 0.22.9", - "gobject-sys 0.22.9", + "gio-sys", + "glib-sys", + "gobject-sys", "graphene-sys", "gsk4-sys", "libc", - "pango-sys 0.22.9", + "pango-sys", "system-deps 7.0.8", ] @@ -2009,12 +1858,6 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -2360,12 +2203,9 @@ dependencies = [ [[package]] name = "libappindicator" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" +source = "git+https://github.com/tauri-apps/libappindicator-rs.git?branch=gtk-0.19#ced1022eaa9f1cc13d77e9b67e9b23d6a95251fe" dependencies = [ - "glib 0.18.5", "gtk", - "gtk-sys", "libappindicator-sys", "log", ] @@ -2373,12 +2213,10 @@ dependencies = [ [[package]] name = "libappindicator-sys" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" +source = "git+https://github.com/tauri-apps/libappindicator-rs.git?branch=gtk-0.19#ced1022eaa9f1cc13d77e9b67e9b23d6a95251fe" dependencies = [ "gtk-sys", - "libloading 0.7.4", - "once_cell", + "libloading 0.9.0", ] [[package]] @@ -2398,22 +2236,22 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.6", ] [[package]] name = "libloading" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +checksum = "754ca22de805bb5744484a5b151a9e1a8e837d5dc232c2d7d8c2e3492edc8b60" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -2547,8 +2385,7 @@ dependencies = [ [[package]] name = "muda" version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca139e57da4383727f189e43e66e84fa372347027fc996f9f1a007ec0a37996" +source = "git+https://github.com/tauri-apps/muda.git?branch=renovate%2Fgtk-0.x#6cfbefc29ecb6e511b31f57cf2aa804b44160834" dependencies = [ "crossbeam-channel", "dpi", @@ -2671,7 +2508,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.96", @@ -3102,40 +2939,15 @@ dependencies = [ "ttf-parser", ] -[[package]] -name = "pango" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" -dependencies = [ - "gio 0.18.4", - "glib 0.18.5", - "libc", - "once_cell", - "pango-sys 0.18.0", -] - [[package]] name = "pango" version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b2022dbbd82e1c42bd950a6f1df9b98c796e725dce5ec275e03cbf9772e4efa" dependencies = [ - "gio 0.22.9", - "glib 0.22.9", - "pango-sys 0.22.9", -] - -[[package]] -name = "pango-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" -dependencies = [ - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "system-deps 6.2.2", + "gio", + "glib", + "pango-sys", ] [[package]] @@ -3144,8 +2956,8 @@ version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca02d64761b74d56cdd4b437db6d73dc95e6c0d40f27e1c707952c0f09052948" dependencies = [ - "glib-sys 0.22.9", - "gobject-sys 0.22.9", + "glib-sys", + "gobject-sys", "libc", "system-deps 9.0.0", ] @@ -3296,56 +3108,13 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[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.7", -] - [[package]] name = "proc-macro-crate" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit 0.25.15+spec-1.1.0", -] - -[[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", + "toml_edit", ] [[package]] @@ -3608,15 +3377,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "serde_spanned" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" -dependencies = [ - "serde", -] - [[package]] name = "serde_spanned" version = "1.1.1" @@ -3785,23 +3545,13 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "rustversion", "syn 2.0.96", ] -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.96" @@ -3835,29 +3585,16 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr 0.15.8", - "heck 0.5.0", - "pkg-config", - "toml 0.8.19", - "version-compare", -] - [[package]] name = "system-deps" version = "7.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396a35feb67335377e0251fcbc1092fc85c484bd4e3a7a54319399da127796e7" dependencies = [ - "cfg-expr 0.20.9", - "heck 0.5.0", + "cfg-expr", + "heck", "pkg-config", - "toml 1.1.6+spec-1.1.0", + "toml", "version-compare", ] @@ -3867,19 +3604,19 @@ version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a0dae2cbca1f0ff93795713cfe0a4c02f760e3c0b8ae2ab4ec4045808ff429f" dependencies = [ - "cfg-expr 0.20.9", - "heck 0.5.0", + "cfg-expr", + "heck", "pkg-config", - "toml 1.1.6+spec-1.1.0", + "toml", "version-compare", ] [[package]] name = "tao" version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d12c8607b01516c5d4a37e471a9cfb40b4a25cebce8fecbc6a559e125e51b6b" +source = "git+https://github.com/tauri-apps/tao.git?branch=gtk-0.19#08660027c723e09a45b10badf60a73a661c94a95" dependencies = [ + "async-channel", "bitflags 2.13.2", "block2 0.6.2", "core-foundation 0.10.0", @@ -3918,20 +3655,13 @@ dependencies = [ [[package]] name = "tao-macros" version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7eeb6d99155545da6150a1795945f16ac9c178deb2a5f2e74d776107bd5849" +source = "git+https://github.com/tauri-apps/tao.git?branch=gtk-0.19#08660027c723e09a45b10badf60a73a661c94a95" dependencies = [ "proc-macro2", "quote", "syn 2.0.96", ] -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - [[package]] name = "target-lexicon" version = "0.13.5" @@ -4056,18 +3786,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "toml" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" -dependencies = [ - "serde", - "serde_spanned 0.6.8", - "toml_datetime 0.6.8", - "toml_edit 0.22.22", -] - [[package]] name = "toml" version = "1.1.6+spec-1.1.0" @@ -4076,20 +3794,11 @@ checksum = "920602543f0911ab71da12c50d59701da54c196d1a2bf5cb4b75667f137a406a" dependencies = [ "indexmap", "serde_core", - "serde_spanned 1.1.1", - "toml_datetime 1.1.1+spec-1.1.0", + "serde_spanned", + "toml_datetime", "toml_parser", "toml_writer", - "winnow 1.0.4", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", + "winnow", ] [[package]] @@ -4101,41 +3810,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime 0.6.8", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap", - "toml_datetime 0.6.8", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" -dependencies = [ - "indexmap", - "serde", - "serde_spanned 0.6.8", - "toml_datetime 0.6.8", - "winnow 0.6.25", -] - [[package]] name = "toml_edit" version = "0.25.15+spec-1.1.0" @@ -4143,9 +3817,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1340ea94a5856333492c9064b02c778b191dd2c853778d9609debdcdfea3a614" dependencies = [ "indexmap", - "toml_datetime 1.1.1+spec-1.1.0", + "toml_datetime", "toml_parser", - "winnow 1.0.4", + "winnow", ] [[package]] @@ -4154,7 +3828,7 @@ version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56" dependencies = [ - "winnow 1.0.4", + "winnow", ] [[package]] @@ -5153,24 +4827,6 @@ dependencies = [ "xkbcommon-dl", ] -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad699df48212c6cc6eb4435f35500ac6fd3b9913324f938aea302022ce19d310" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "1.0.4" @@ -5366,7 +5022,7 @@ dependencies = [ "uds_windows", "uuid", "windows-sys 0.61.2", - "winnow 1.0.4", + "winnow", "zbus_macros 5.19.0", "zbus_names 4.3.4", "zvariant 5.15.0", @@ -5402,7 +5058,7 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate 3.5.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.96", @@ -5415,7 +5071,7 @@ version = "5.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2990635d09ade6df1868f72f8cac69a876a90981e8bd3c40b1be413f8dc88f40" dependencies = [ - "proc-macro-crate 3.5.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 3.0.4", @@ -5442,7 +5098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8bf88b4a3ff53e883001e0e0115b297a9d53c31b9c1edd2bfdd853e3428624e" dependencies = [ "serde", - "winnow 1.0.4", + "winnow", "zvariant 5.15.0", ] @@ -5554,7 +5210,7 @@ dependencies = [ "endi", "enumflags2", "serde", - "winnow 1.0.4", + "winnow", "zcheapstr", "zvariant_derive 5.15.0", "zvariant_utils 4.2.0", @@ -5566,7 +5222,7 @@ version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 3.5.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.96", @@ -5579,7 +5235,7 @@ version = "5.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "864155e69b4352db0c7f374917bf45d1e0c8d17659c8b3dbf9795f3673f8c497" dependencies = [ - "proc-macro-crate 3.5.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 3.0.4", @@ -5607,5 +5263,5 @@ dependencies = [ "quote", "serde", "syn 3.0.4", - "winnow 1.0.4", + "winnow", ] diff --git a/Cargo.toml b/Cargo.toml index 65b0390..31671ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://github.com/tauri-apps/tray-icon" repository = "https://github.com/tauri-apps/tray-icon" license = "MIT OR Apache-2.0" categories = ["gui"] -rust-version = "1.90" +rust-version = "1.92" include = [ "README.md", "build.rs", @@ -56,7 +56,7 @@ ksni = { version = "0.3.6", default-features = false, features = [ ], optional = true } [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"netbsd\", target_os = \"openbsd\"))".dev-dependencies] -gtk = "0.18" +gtk = "0.19" [target."cfg(target_os = \"macos\")".dependencies] objc2 = "0.6" @@ -107,3 +107,8 @@ tao = "0.37" eframe = "0.31" image = { version = "0.25", default-features = false, features = ["png"] } serde_json = "1" + +[patch.crates-io] +libappindicator = { git = "https://github.com/tauri-apps/libappindicator-rs.git", branch = "gtk-0.19" } +tao = { git = "https://github.com/tauri-apps/tao.git", branch = "gtk-0.19" } +muda = { git = "https://github.com/tauri-apps/muda.git", branch = "renovate/gtk-0.x" }