From 5f76a4b590f6403d6046860fb0c399d2426162ae Mon Sep 17 00:00:00 2001 From: Rocka Date: Sat, 16 May 2026 18:11:36 +0800 Subject: [PATCH] Update libime pinyin dict to 20260430 --- build.cfg | 4 ++-- fcitx5 | 2 +- fmt | 1 - libime | 2 +- src/Main.hs | 1 - src/Rules/Fcitx5.hs | 25 +------------------------ 6 files changed, 5 insertions(+), 30 deletions(-) delete mode 160000 fmt diff --git a/build.cfg b/build.cfg index 7186514a..2c944b8b 100644 --- a/build.cfg +++ b/build.cfg @@ -9,8 +9,8 @@ lm_sc = lm_sc.arpa-20250113.tar.zst lm_sc_sha256 = ee83ecf20d52e8bccdba4cf6cd57183d53c257713a5eb77ee3a63d50fc3796dd # pinyin dict -pinyin_dict = dict-20250327.tar.zst -pinyin_dict_sha256 = 7ca6be4754c0d4c27ba7702c0dce651659bd2ca1faa5cbf2848d81a0053c8c13 +pinyin_dict = dict-20260430.tar.zst +pinyin_dict_sha256 = 3edc008d90fcd61b9967b9e590f396189d7a00fa74c45ecde0d9850a0fdd6241 # table dict table = table-20240108.tar.gz diff --git a/fcitx5 b/fcitx5 index d3f45a07..ac7a6b93 160000 --- a/fcitx5 +++ b/fcitx5 @@ -1 +1 @@ -Subproject commit d3f45a07335d4cdf7728ad02766e59d45f32f8a8 +Subproject commit ac7a6b937d69acf812a58eea6926182ceb3e502c diff --git a/fmt b/fmt deleted file mode 160000 index 12391371..00000000 --- a/fmt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 123913715afeb8a437e6388b4473fcc4753e1c9a diff --git a/libime b/libime index aa3ed007..c16d4e52 160000 --- a/libime +++ b/libime @@ -1 +1 @@ -Subproject commit aa3ed0070f878b7d912ba2e8c6478b87ab5d960d +Subproject commit c16d4e52c21d98ae71ffce355b395631a05acc42 diff --git a/src/Main.hs b/src/Main.hs index 3034a0e3..4ca166be 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -48,7 +48,6 @@ main = do want files usingConfigFile "build.cfg" downloadFileRule - hostFmtRule hostFcitx5Rule spellDictRule libIMERule diff --git a/src/Rules/Fcitx5.hs b/src/Rules/Fcitx5.hs index 9bd7e5fc..387b39bf 100644 --- a/src/Rules/Fcitx5.hs +++ b/src/Rules/Fcitx5.hs @@ -1,37 +1,14 @@ module Rules.Fcitx5 - ( hostFmtRule, - hostFcitx5Rule, + ( hostFcitx5Rule, spellDictRule, ) where import Base -hostFmtRule :: Rules () -hostFmtRule = do - "host-fmt" ~> do - let fmtSrc = "fmt" - let buildDir = outputDir "fmt-build-host" - let hostPrefix = outputDir "host" - cmd_ - "cmake" - "-B" - buildDir - "-G" - "Ninja" - [ "-DCMAKE_INSTALL_PREFIX=" <> hostPrefix, - "-DFMT_TEST=OFF" , - "-DFMT_DOC=OFF" - ] - fmtSrc - cmd_ "cmake" "--build" buildDir - cmd_ "cmake" "--install" buildDir - - hostFcitx5Rule :: Rules () hostFcitx5Rule = do "host-fcitx5" ~> do - need ["host-fmt"] let fcitx5Src = "fcitx5" let buildDir = outputDir "fcitx5-build-host" let hostPrefix = outputDir "host"