From 55142666b4f514bad74e0fef7aefafeb30cca49c Mon Sep 17 00:00:00 2001 From: madonuko Date: Sat, 18 Jan 2025 01:39:19 +0800 Subject: [PATCH] fix(backend/steps/dnfdownloadapps): auto install fcitx5-chinese-addons fcitx5-table-extra requires fcitx5-chinese-addons, but the requires is missing from Fedora's package, so we manually pull it here. --- src/backend/i18n.rs | 3 --- src/backend/steps/_05_dnfdownloadapps.rs | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/backend/i18n.rs b/src/backend/i18n.rs index 0aa7b27..28281b5 100644 --- a/src/backend/i18n.rs +++ b/src/backend/i18n.rs @@ -22,9 +22,6 @@ macro_rules! im { } // lang → `InputMethod` -// TODO: add fcitx5-chinese-addons manually if fcitx5-table-extra (thanks Fedora definitely not a -// packaging issue) -// TODO: enable fcitx5 automatically? // NOTE: some characters may not be displayed properly on your device, please make sure you have // the corresponding fonts installed. pub const IMS: phf::Map<&'static str, phf::Map<&'static str, InputMethod>> = phf::phf_map! { diff --git a/src/backend/steps/_05_dnfdownloadapps.rs b/src/backend/steps/_05_dnfdownloadapps.rs index f3ed45c..06bf099 100644 --- a/src/backend/steps/_05_dnfdownloadapps.rs +++ b/src/backend/steps/_05_dnfdownloadapps.rs @@ -48,6 +48,13 @@ impl super::Step for DnfDownloadApps { .map(|im| im.get_pkg().to_owned()) .unique(), ); + // Fedora didn't package `fcitx5-table-extra` properly, it's missing the + // `fcitx5-chinese-addons` dependency, so we manually add it here. + if settings.actions[1].contains(&"fcitx5-table-extra".to_owned()) + && !settings.actions[1].contains(&"fcitx5-chinese-addons".to_owned()) + { + settings.actions[1].push("fcitx5-chinese-addons".to_owned()); + } Ok(()) }