fcitx5-mozc: 2.26.4220.102 -> 2.30.5544.102 #346680
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14587,6 +14587,11 @@ | |
| githubId = 96225281; | ||
| name = "Mustafa Çalışkan"; | ||
| }; | ||
| musjj = { | ||
| name = "musjj"; | ||
| github = "musjj"; | ||
| githubId = 72612857; | ||
| }; | ||
| mvisonneau = { | ||
| name = "Maxime VISONNEAU"; | ||
| email = "[email protected]"; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,129 +1,145 @@ | ||
| { | ||
musjj marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| bazel_7, | ||
| buildBazelPackage, | ||
| fcitx5, | ||
| fetchFromGitHub, | ||
| gettext, | ||
| lib, | ||
| mozc, | ||
| nixosTests, | ||
| pkg-config, | ||
| python3, | ||
| unzip, | ||
| }: | ||
|
|
||
| buildBazelPackage { | ||
| pname = "fcitx5-mozc"; | ||
| version = "2.30.5544.102"; | ||
musjj marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "fcitx"; | ||
| repo = "mozc"; | ||
| fetchSubmodules = true; | ||
| rev = "57e67f2a25e4c0861e0e422da0c7d4c232d89fcc"; | ||
| hash = "sha256-1EZjEbMl+LRipH5gEgFpaKP8uEKPfupHmiiTNJc/T1k="; | ||
| }; | ||
|
|
||
| sourceRoot = "source/src"; | ||
musjj marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| nativeBuildInputs = [ | ||
| gettext | ||
| pkg-config | ||
| python3 | ||
| unzip | ||
| ]; | ||
|
|
||
| buildInputs = [ | ||
| mozc | ||
| fcitx5 | ||
| ]; | ||
|
|
||
| postPatch = '' | ||
| sed -i -e 's|^\(LINUX_MOZC_SERVER_DIR = \).\+|\1"${mozc}/lib/mozc"|' config.bzl | ||
| ''; | ||
|
|
||
| bazel = bazel_7; | ||
| removeRulesCC = false; | ||
| dontAddBazelOpts = true; | ||
|
|
||
| bazelFlags = [ | ||
| "--config" | ||
| "oss_linux" | ||
| "--compilation_mode" | ||
| "opt" | ||
| ]; | ||
|
|
||
| bazelTargets = [ | ||
| "unix/fcitx5:fcitx5-mozc.so" | ||
| "unix/icons" | ||
| ]; | ||
|
|
||
| fetchAttrs = { | ||
| preInstall = '' | ||
| rm -rf $bazelOut/external/fcitx5 | ||
| ''; | ||
|
|
||
| sha256 = "sha256-wz2lJckr7Pu4jtoejjFv8LdjVO2+ferrS473M4jc86I="; | ||
| }; | ||
|
|
||
| buildAttrs = { | ||
| installPhase = '' | ||
| runHook preInstall | ||
|
|
||
| install -Dm444 ../LICENSE $out/share/licenses/fcitx5-mozc/LICENSE | ||
| install -Dm444 data/installer/credits_en.html $out/share/licenses/fcitx5-mozc/Submodules | ||
|
|
||
| install -Dm555 bazel-bin/unix/fcitx5/fcitx5-mozc.so $out/lib/fcitx5/fcitx5-mozc.so | ||
| install -Dm444 unix/fcitx5/mozc-addon.conf $out/share/fcitx5/addon/mozc.conf | ||
| install -Dm444 unix/fcitx5/mozc.conf $out/share/fcitx5/inputmethod/mozc.conf | ||
|
|
||
| for pofile in unix/fcitx5/po/*.po; do | ||
| filename=$(basename $pofile) | ||
| lang=''${filename/.po/} | ||
| mofile=''${pofile/.po/.mo} | ||
| msgfmt $pofile -o $mofile | ||
| install -Dm444 $mofile $out/share/locale/$lang/LC_MESSAGES/fcitx5-mozc.mo | ||
| done | ||
|
|
||
| msgfmt --xml -d unix/fcitx5/po/ --template unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in -o unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml | ||
| install -Dm444 unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml $out/share/metainfo/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml | ||
|
|
||
| cd bazel-bin/unix | ||
|
|
||
| unzip -o icons.zip | ||
|
|
||
| # These are relative symlinks, they will always resolve to files within $out | ||
|
|
||
| install -Dm444 mozc.png $out/share/icons/hicolor/128x128/apps/org.fcitx.Fcitx5.fcitx_mozc.png | ||
| ln -s org.fcitx.Fcitx5.fcitx_mozc.png $out/share/icons/hicolor/128x128/apps/fcitx_mozc.png | ||
|
|
||
| for svg in \ | ||
| alpha_full.svg \ | ||
| alpha_half.svg \ | ||
| direct.svg \ | ||
| hiragana.svg \ | ||
| katakana_full.svg \ | ||
| katakana_half.svg \ | ||
| outlined/dictionary.svg \ | ||
| outlined/properties.svg \ | ||
| outlined/tool.svg | ||
| do | ||
| name=$(basename -- $svg) | ||
| path=$out/share/icons/hicolor/scalable/apps | ||
| prefix=org.fcitx.Fcitx5.fcitx_mozc | ||
|
|
||
| install -Dm444 $svg $path/$prefix_$name | ||
| ln -s $prefix_$name $path/fcitx_mozc_$name | ||
| done | ||
|
|
||
| runHook postInstall | ||
| ''; | ||
| }; | ||
|
|
||
| passthru.tests = { | ||
| inherit (nixosTests) fcitx5; | ||
| }; | ||
|
|
||
| meta = with lib; { | ||
| description = "Mozc - a Japanese Input Method Editor designed for multi-platform"; | ||
| homepage = "https://github.com/fcitx/mozc"; | ||
| license = with licenses; [ | ||
| asl20 # abseil-cpp | ||
| bsd3 # mozc, breakpad, gtest, gyp, japanese-usage-dictionary, protobuf | ||
| mit # wil | ||
| naist-2003 # IPAdic | ||
| publicDomain # src/data/test/stress_test, Okinawa dictionary | ||
| unicode-30 # src/data/unicode, breakpad | ||
|
There was a problem hiding this comment. Because of bazel we cannot unvendor things, right? There was a problem hiding this comment. It's mostly from the submodules in here: https://github.com/fcitx/mozc/tree/ace314567109cbc30dc336fb27844dacff782dd9/src/third_party. General info about the license: https://github.com/fcitx/mozc/tree/master?tab=readme-ov-file#license |
||
| ]; | ||
| maintainers = with maintainers; [ | ||
| berberman | ||
| govanify | ||
| musjj | ||
| ]; | ||
| platforms = platforms.linux; | ||
| }; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for changing this! I forgot about it.