From 5ae34958028a399d2b29c0b4fd01912650ec2825 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 2 Nov 2022 19:01:57 +0200 Subject: [PATCH] 1.2.1 - Updated dependencies, components and the core library; fixed voiceovers updating issue From previous commits: - Fixed `--run-game` flag work - Fixed predownload button's state updating - Now launcher will run the game with `--run-game` flag even when predownloading is available, but if update was already predownloaded - Added `--just-run-game` flag to run game even when predownloading is available --- CHANGELOG.md | 10 ++++ Cargo.lock | 128 +++++++++++++++++++++++---------------------- Cargo.toml | 10 ++-- anime-game-core | 2 +- blueprint-compiler | 2 +- build.rs | 2 +- components | 2 +- src/ui/main.rs | 2 +- 8 files changed, 85 insertions(+), 73 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4156724..19a5547 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# 1.2.1 + +- Fixed `--run-game` flag work +- Fixed predownload button's state updating +- Now launcher will run the game with `--run-game` flag + even when predownloading is available, but if update was already predownloaded +- Added `--just-run-game` flag to run game even when predownloading is available +- Updated dependencies, components and the core library; + fixed voiceovers updating issue + # 1.2.0 - updated core library; now launcher will try to repair diff --git a/Cargo.lock b/Cargo.lock index 3b99cc0..1af22b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,7 +31,7 @@ dependencies = [ [[package]] name = "anime-game-core" -version = "1.2.0" +version = "1.2.2" dependencies = [ "anyhow", "bzip2", @@ -52,12 +52,13 @@ dependencies = [ [[package]] name = "anime-game-launcher" -version = "1.2.0" +version = "1.2.1" dependencies = [ "anime-game-core", "anyhow", "cached", "dirs", + "glib-build-tools", "gtk4", "lazy_static", "libadwaita", @@ -269,9 +270,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "cached" -version = "0.39.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e27085975166ffaacbd04527132e1cf5906fa612991f9b4fea08e787da2961" +checksum = "72b4147cd94d5fbdc2ab71b11d50a2f45493625576b3bb70257f59eedea69f3d" dependencies = [ "async-trait", "async_once", @@ -306,22 +307,23 @@ checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" [[package]] name = "cairo-rs" -version = "0.15.12" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +checksum = "08f9ee4a4ca9239c9a839453dce04b7ddee2f859ec4cd7acd1f5703b68db549c" dependencies = [ "bitflags", "cairo-sys-rs", "glib", "libc", + "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +checksum = "5119ea655ec777b523f0b57279e70f8a4542f61b0e98a48f892b4ef043fd4c5d" dependencies = [ "glib-sys", "libc", @@ -767,9 +769,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.15.11" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +checksum = "c0fb526c8c3a075eda15f961820edf3e15fe18576ac4fbabbb324e4cc6c421e6" dependencies = [ "bitflags", "gdk-pixbuf-sys", @@ -780,9 +782,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.15.10" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +checksum = "7df12d15c10c3c5a84d9fb4ba0e27659f6a2bdee4f27f8b17126da15d5ddd3f2" dependencies = [ "gio-sys", "glib-sys", @@ -793,9 +795,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.4.8" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabb7cf843c26b085a5d68abb95d0c0bf27a9ae2eeff9c4adb503a1eb580876" +checksum = "66fe07f362c977c4684d1136a29f097208b3ccb2013ab6f441a3c60a046fd358" dependencies = [ "bitflags", "cairo-rs", @@ -809,9 +811,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.4.8" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efe7dcb44f5c00aeabff3f69abfc5673de46559070f89bd3fbb7b66485d9cef2" +checksum = "ddcf9e3ab5f237bb641e7f2fccc4b26d5b86f111f0d62e27d452dc24964541c2" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -847,26 +849,29 @@ dependencies = [ [[package]] name = "gio" -version = "0.15.12" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +checksum = "33c1debf8d0315d69be0153aa76249db3c858ef69b7778ad3cc669e6d370c485" dependencies = [ "bitflags", "futures-channel", "futures-core", "futures-io", + "futures-util", "gio-sys", "glib", "libc", "once_cell", + "pin-project-lite", + "smallvec", "thiserror", ] [[package]] name = "gio-sys" -version = "0.15.10" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +checksum = "6da1bba9d3f2ab13a6e9932c40f240dc99ebc9f0bdc35cfb130d1a3df36f374c" dependencies = [ "glib-sys", "gobject-sys", @@ -877,15 +882,17 @@ dependencies = [ [[package]] name = "glib" -version = "0.15.12" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +checksum = "d5abffa711471e015eb93d65d6ea20e7e9f6f7951fc0a1042280439319b2de06" dependencies = [ "bitflags", "futures-channel", "futures-core", "futures-executor", "futures-task", + "futures-util", + "gio-sys", "glib-macros", "glib-sys", "gobject-sys", @@ -896,10 +903,16 @@ dependencies = [ ] [[package]] -name = "glib-macros" -version = "0.15.11" +name = "glib-build-tools" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" +checksum = "b70aae3c71f39e3d902e2e842b316e5271f504c3495ad4991aa6e7b7b11dad55" + +[[package]] +name = "glib-macros" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e195c1311fa6b04d7b896ea39385f6bd60ef5d25bf74a7c11c8c3f94f6c1a572" dependencies = [ "anyhow", "heck", @@ -912,9 +925,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.15.10" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +checksum = "b33357bb421a77bd849f6a0bfcaf3b4b256a2577802971bb5dd522d530f27021" dependencies = [ "libc", "system-deps", @@ -922,9 +935,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.15.10" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +checksum = "63ca11a57400f3d4fda594e002844be47900c9fb8b29e2155c6e37a1f24e51b3" dependencies = [ "glib-sys", "libc", @@ -933,9 +946,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c54f9fbbeefdb62c99f892dfca35f83991e2cb5b46a8dc2a715e58612f85570" +checksum = "95a8de4506a64776d90fedf9c28fdca5a7127f8cc9c78976e8184ac6f42685d8" dependencies = [ "glib", "graphene-sys", @@ -944,9 +957,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.15.10" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa691fc7337ba1df599afb55c3bcb85c04f1b3f17362570e9bb0ff0d1bc3028a" +checksum = "f2c952f764f02f8546fcc5d014bc78aa704c6d453c828c8b429121f704349163" dependencies = [ "glib-sys", "libc", @@ -956,9 +969,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.4.8" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e9020d333280b3aa38d496495bfa9b50712eebf1ad63f0ec5bcddb5eb61be4" +checksum = "d4fc2b86c751a7fe9aad0fdba85937a6aace3a8453e0e2a08d2a31ce4bb8ae55" dependencies = [ "bitflags", "cairo-rs", @@ -972,9 +985,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.4.8" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add39ccf60078508c838643a2dcc91f045c46ed63b5ea6ab701b2e25bda3fea" +checksum = "2cb53e25cbbe3fa8e3e9db7c06d65085086fadbec4cd0aa567b2e2a4917db83d" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -988,9 +1001,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.4.8" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64f0c2a3d80e899dc3febddad5bac193ffcf74a0fd7e31037f30dd34d6f7396" +checksum = "47223ddb27033731b71ea841d1b878bd87a275a865f1df60b41505f9e4933d64" dependencies = [ "bitflags", "cairo-rs", @@ -1011,24 +1024,23 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.4.8" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fafbcc920af4eb677d7d164853e7040b9de5a22379c596f570190c675d45f7a7" +checksum = "ce5eb86364b216ee8c497b1121831168fb25130d3378495a135f8e5c1972db7b" dependencies = [ "anyhow", "proc-macro-crate", "proc-macro-error", "proc-macro2", - "quick-xml", "quote", "syn", ] [[package]] name = "gtk4-sys" -version = "0.4.8" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc8006eea634b7c72da3ff79e24606e45f21b3b832a3c5a1f543f5f97eb0f63" +checksum = "0f04bd0b63d999a36ae53a916ee4b20ea64a3ef4732ca8a98b1fde4a22c1476c" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1132,9 +1144,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libadwaita" -version = "0.2.0-alpha.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73815fa30ca62d1db2713fe87cfd1cea41cad076ccdece6bb8328032db152f47" +checksum = "ed92f031cf7f3d501b84f41e4d05aed6ebfd8eed59a8fc0cccbf51359e92c8e3" dependencies = [ "bitflags", "futures-channel", @@ -1151,9 +1163,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.2.0-alpha.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91960ec236b6fecdace0491ae1e4aac938d1c6adffd5939f811f3ed6592a59e" +checksum = "9ec4243e86fb53d06df2461d543529a640c9a0fba2d4cc850b70e11a85f9d952" dependencies = [ "gdk4-sys", "gio-sys", @@ -1386,11 +1398,12 @@ dependencies = [ [[package]] name = "pango" -version = "0.15.10" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +checksum = "7208c60f224cf6e44c551df5ee2ef38f9da0fd29d7c5a0402000b8ab0520e798" dependencies = [ "bitflags", + "gio", "glib", "libc", "once_cell", @@ -1399,9 +1412,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.15.10" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +checksum = "922441c228366ed98d3534b87bc7c987c50564094c3abbc3513717786419252d" dependencies = [ "glib-sys", "gobject-sys", @@ -1557,15 +1570,6 @@ dependencies = [ "unicode-ident", ] -[[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.20" @@ -2051,8 +2055,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" dependencies = [ "autocfg", - "num_cpus", - "once_cell", "pin-project-lite", "tokio-macros", ] diff --git a/Cargo.toml b/Cargo.toml index ad43c87..d8fddee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anime-game-launcher" -version = "1.2.0" +version = "1.2.1" description = "Anime Game launcher" authors = ["Nikita Podvirnyy "] license = "GPL-3.0" @@ -13,11 +13,11 @@ lto = true opt-level = 3 [build-dependencies] -gtk = { package = "gtk4", version = "0.4", features = ["v4_8"] } +glib-build-tools = { version = "0.16" } [dependencies] -gtk = { package = "gtk4", version = "0.4", features = ["v4_8"] } -adw = { package = "libadwaita", version = "0.2.0-alpha.3", features = ["v1_2"] } +gtk = { package = "gtk4", version = "0.5", features = ["v4_8"] } +adw = { package = "libadwaita", version = "0.2", features = ["v1_2"] } rfd = { version = "0.10", features = ["xdg-portal"], default-features = false } anime-game-core = { path = "anime-game-core", features = ["all", "static", "genshin"] } @@ -32,4 +32,4 @@ regex = "1.6.0" lazy_static = "1.4.0" anyhow = "1.0" md5 = "0.7" -cached = { version = "0.39", features = ["proc_macro"]} +cached = { version = "0.40", features = ["proc_macro"]} diff --git a/anime-game-core b/anime-game-core index 6f2c976..c6b4b3e 160000 --- a/anime-game-core +++ b/anime-game-core @@ -1 +1 @@ -Subproject commit 6f2c976003893603a7ac795deb6367db30595503 +Subproject commit c6b4b3ed23d0e2fe6258e2e32de0c7127f678955 diff --git a/blueprint-compiler b/blueprint-compiler index 447785e..bc15ac9 160000 --- a/blueprint-compiler +++ b/blueprint-compiler @@ -1 +1 @@ -Subproject commit 447785ec8c2c8c1f9fc842a5bd73c43f17d09ee7 +Subproject commit bc15ac9efbb762e9e960badb5bf35655e5d8603b diff --git a/build.rs b/build.rs index 90785b8..1e940c3 100644 --- a/build.rs +++ b/build.rs @@ -75,7 +75,7 @@ fn main() { blp_process_dir(String::new()); if read_to_string("assets/resources.xml").is_ok() { - gtk::gio::compile_resources( + glib_build_tools::compile_resources( "assets", "assets/resources.xml", ".assets.gresource", diff --git a/components b/components index 09b26e7..ff19449 160000 --- a/components +++ b/components @@ -1 +1 @@ -Subproject commit 09b26e7025512a10e0b57f03da0b22b984e65a19 +Subproject commit ff194493e4614bc8c12cffed840a430651e17060 diff --git a/src/ui/main.rs b/src/ui/main.rs index 2801604..e98458b 100644 --- a/src/ui/main.rs +++ b/src/ui/main.rs @@ -135,7 +135,7 @@ impl AppWidgets { String::new(), format!("GTK version: {}.{}.{}", gtk::major_version(), gtk::minor_version(), gtk::micro_version()), format!("Libadwaita version: {}.{}.{}", adw::major_version(), adw::minor_version(), adw::micro_version()), - format!("Pango version: {}", gtk::pango::version_string().unwrap_or("?".into())), + format!("Pango version: {}", gtk::pango::version_string()), format!("Cairo version: {}", gtk::cairo::version_string()), ].join("\n"));