From 00d47d474029ed78703b39ebed765ec1365b0fff Mon Sep 17 00:00:00 2001 From: Adam Killam Date: Mon, 13 Mar 2023 21:25:42 -0230 Subject: [PATCH] Fixes gettext errors --- Cargo.lock | 190 +++++++++++++++++----------------------------------- Cargo.toml | 2 +- src/main.rs | 2 +- 3 files changed, 63 insertions(+), 131 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9feee4e..9899c09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -327,7 +327,7 @@ checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" dependencies = [ "glib-sys 0.16.3", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -418,12 +418,22 @@ dependencies = [ [[package]] name = "dbus" -version = "0.6.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" dependencies = [ "libc", "libdbus-sys", + "winapi", +] + +[[package]] +name = "dbus-tree" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f456e698ae8e54575e19ddb1f9b7bce2298568524f215496b248eb9498b4f508" +dependencies = [ + "dbus", ] [[package]] @@ -473,12 +483,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.5" @@ -674,7 +678,7 @@ dependencies = [ "glib-sys 0.16.3", "gobject-sys 0.16.3", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -707,7 +711,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -731,7 +735,7 @@ checksum = "7017f59dc8c3a0c25756d617be038540642be64b9f229a531507b8f8e3e645ea" dependencies = [ "glib-sys 0.16.3", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -756,7 +760,7 @@ dependencies = [ "gdk4-sys", "glib-sys 0.16.3", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -829,27 +833,28 @@ dependencies = [ "glib-sys 0.16.3", "gobject-sys 0.16.3", "libc", - "system-deps 6.0.2", + "system-deps", "winapi", ] [[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 0.10.1", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib-macros 0.15.11", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "libc", "once_cell", + "smallvec", + "thiserror", ] [[package]] @@ -876,14 +881,13 @@ dependencies = [ [[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 0.3.3", - "itertools", - "proc-macro-crate 0.1.5", + "heck", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -897,8 +901,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e084807350b01348b6d9dbabb724d1a0bb987f47a2c85de200e98e12e30733bf" dependencies = [ "anyhow", - "heck 0.4.0", - "proc-macro-crate 1.1.3", + "heck", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -907,12 +911,12 @@ dependencies = [ [[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 1.3.2", + "system-deps", ] [[package]] @@ -922,7 +926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" dependencies = [ "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -949,13 +953,13 @@ dependencies = [ [[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 0.10.1", + "glib-sys 0.15.10", "libc", - "system-deps 1.3.2", + "system-deps", ] [[package]] @@ -966,7 +970,7 @@ checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" dependencies = [ "glib-sys 0.16.3", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -989,7 +993,7 @@ dependencies = [ "glib-sys 0.16.3", "libc", "pkg-config", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -1021,7 +1025,7 @@ dependencies = [ "graphene-sys", "libc", "pango-sys", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -1075,7 +1079,7 @@ dependencies = [ "gstreamer-base-sys", "gstreamer-sys", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -1103,7 +1107,7 @@ dependencies = [ "gobject-sys 0.16.3", "gstreamer-sys", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -1132,7 +1136,7 @@ dependencies = [ "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -1144,7 +1148,7 @@ dependencies = [ "glib-sys 0.16.3", "gobject-sys 0.16.3", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -1175,7 +1179,7 @@ dependencies = [ "gstreamer-base-sys", "gstreamer-sys", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -1214,7 +1218,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "832687a415d9d8bc11fe9c17dda1bf13ee262c41b995dd4df1d1cce33cead405" dependencies = [ "anyhow", - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -1237,16 +1241,7 @@ dependencies = [ "gsk4-sys", "libc", "pango-sys", - "system-deps 6.0.2", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", + "system-deps", ] [[package]] @@ -1298,15 +1293,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.2" @@ -1369,7 +1355,7 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -1380,9 +1366,9 @@ checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" [[package]] name = "libdbus-sys" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +checksum = "9f8d7ae751e1cb825c840ae5e682f59b098cdfd213c350ac268b61449a5f58a0" dependencies = [ "pkg-config", ] @@ -1483,12 +1469,12 @@ dependencies = [ [[package]] name = "mpris-player" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6badd6ebe31be46eb2e2975cf3b34b183bace5f8a8db1d609fefc4d46fbb07" +version = "0.6.2" +source = "git+https://github.com/amkillam/mpris-player-fork.git?branch=forked/master#9d3bbe866423000a61439c60edc5fd6fa74c8d9c" dependencies = [ "dbus", - "glib 0.10.3", + "dbus-tree", + "glib 0.15.12", ] [[package]] @@ -1671,7 +1657,7 @@ dependencies = [ "glib-sys 0.16.3", "gobject-sys 0.16.3", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -1779,15 +1765,6 @@ dependencies = [ "log", ] -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - [[package]] name = "proc-macro-crate" version = "1.1.3" @@ -2097,24 +2074,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "strum" -version = "0.18.0" -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" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "syn" version = "1.0.99" @@ -2126,21 +2085,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "system-deps" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" -dependencies = [ - "heck 0.3.3", - "pkg-config", - "strum", - "strum_macros", - "thiserror", - "toml", - "version-compare 0.0.10", -] - [[package]] name = "system-deps" version = "6.0.2" @@ -2148,10 +2092,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" dependencies = [ "cfg-expr", - "heck 0.4.0", + "heck", "pkg-config", "toml", - "version-compare 0.1.0", + "version-compare", ] [[package]] @@ -2311,12 +2255,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - [[package]] name = "url" version = "2.3.1" @@ -2339,12 +2277,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "version-compare" -version = "0.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" - [[package]] name = "version-compare" version = "0.1.0" @@ -2530,7 +2462,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a13d08f5dc6cf725b693cb6ceacd43cd430ec0664a879188f29e7d7dcd98f96d" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "regex", @@ -2569,7 +2501,7 @@ version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd58d4b6c8e26d3dd2149c8c40c6613ef6451b9885ff1296d1ac86c388351a54" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", diff --git a/Cargo.toml b/Cargo.toml index e0b5f93..fb3e524 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ gtk = { version = "0.5.5", package = "gtk4", features = ["v4_8"] } gtk-macros = "0.3" lofty = "0.11.0" log = "0.4" -mpris-player = "0.6" +mpris-player = { git = "https://github.com/amkillam/mpris-player-fork.git", branch = "forked/master" } once_cell = "1.10" pretty_env_logger = "0.4" rand = "0.8.5" diff --git a/src/main.rs b/src/main.rs index 67b4630..6688de8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -38,7 +38,7 @@ fn main() { debug!("Setting up locale data"); setlocale(LocaleCategory::LcAll, ""); - bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR).expect("Unable to bind the text domain"); + // bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR).expect("Unable to bind the text domain"); bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8") .expect("Unable to set the text domain encoding"); textdomain(GETTEXT_PACKAGE).expect("Unable to switch to the text domain");