v=2.26.4646.102,r=1

3 files changed, 42 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index adaf4b89eb51..369299a189f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = fcitx5-mozc-ut
 	pkgdesc = Mozc module for Fcitx5
-	pkgver = 2.26.4632.102
+	pkgver = 2.26.4646.102
 	pkgrel = 1
 	url = https://github.com/fcitx/mozc
 	arch = x86_64
@@ -10,25 +10,22 @@ pkgbase = fcitx5-mozc-ut
 	license = custom
 	makedepends = bazel
 	makedepends = git
-	makedepends = pkgconf
-	makedepends = python-six
+	makedepends = python
 	makedepends = qt5-base
 	depends = fcitx5
-	depends = mozc>=2.26.4632.102
+	depends = mozc>=2.26.4646.102
 	optdepends = fcitx5-configtool
-	provides = fcitx5-mozc=2.26.4632.102
+	provides = fcitx5-mozc=2.26.4646.102
 	conflicts = fcitx-mozc
 	conflicts = fcitx-mozc-ut
-	conflicts = fcitx-mozc-ut2
 	conflicts = fcitx-mozc-neologd-ut
-	conflicts = fcitx-mozc-neologd-ut+ut2
 	conflicts = fcitx-mozc-ut-unified
 	conflicts = fcitx-mozc-ut-unified-full
 	conflicts = fcitx5-mozc
 	conflicts = fcitx5-mozc-git
-	source = fcitx5-mozc-ut-git::git+https://github.com/google/mozc.git#commit=7329757e1ad30e327c1ae823a8302c79482d6b9c
+	source = fcitx5-mozc-ut-git::git+https://github.com/google/mozc.git#commit=cdb6ca32615805af5d2b7aa1dc5a9b300ae1b09f
 	source = fcitx5.patch
 	sha256sums = SKIP
-	sha256sums = 4a868e7da5ef839472e6149c1ab463d694dc95c79b968cceb8dc1ae673bd6f1b
+	sha256sums = 8f7065cfec2cf4999bafeb39d66dbd92a763d25786048bca9a1612a4d34b4a69
 
 pkgname = fcitx5-mozc-ut
diff --git a/PKGBUILD b/PKGBUILD
index c85eb578eaa7..46392f1b91fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,23 @@
 # Contributor: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
-
 pkgname='fcitx5-mozc-ut'
-pkgver=2.26.4632.102
+pkgver=2.26.4646.102
 pkgrel=1
 pkgdesc='Mozc module for Fcitx5'
 arch=('x86_64')
 url='https://github.com/fcitx/mozc'
 license=('Apache' 'BSD' 'LGPL' 'custom')
-depends=('fcitx5' 'mozc>=2.26.4632.102')
-makedepends=('bazel' 'git' 'pkgconf' 'python-six' 'qt5-base')
+depends=('fcitx5' 'mozc>=2.26.4646.102')
+makedepends=('bazel' 'git' 'python' 'qt5-base')
 optdepends=('fcitx5-configtool')
-conflicts=('fcitx-mozc' 'fcitx-mozc-ut' 'fcitx-mozc-ut2' 'fcitx-mozc-neologd-ut' 'fcitx-mozc-neologd-ut+ut2' 'fcitx-mozc-ut-unified' 'fcitx-mozc-ut-unified-full'
+conflicts=('fcitx-mozc' 'fcitx-mozc-ut' 'fcitx-mozc-neologd-ut' 'fcitx-mozc-ut-unified' 'fcitx-mozc-ut-unified-full'
            'fcitx5-mozc' 'fcitx5-mozc-git')
-provides=('fcitx5-mozc=2.26.4632.102')
-source=("${pkgname}-git::git+https://github.com/google/mozc.git#commit=7329757e1ad30e327c1ae823a8302c79482d6b9c"
+provides=('fcitx5-mozc=2.26.4646.102')
+source=("${pkgname}-git::git+https://github.com/google/mozc.git#commit=cdb6ca32615805af5d2b7aa1dc5a9b300ae1b09f"
         "fcitx5.patch")
 sha256sums=('SKIP'
-            '4a868e7da5ef839472e6149c1ab463d694dc95c79b968cceb8dc1ae673bd6f1b')
+            '8f7065cfec2cf4999bafeb39d66dbd92a763d25786048bca9a1612a4d34b4a69')
 
 prepare() {
     cd ${pkgname}-git
@@ -42,7 +41,7 @@ prepare() {
 build() {
     cd ${pkgname}-git/src
 
-    env PATH="/usr/lib/jvm/java-11-openjdk/bin/:$PATH" bazel build unix/fcitx5:fcitx5-mozc.so unix/icons --config oss_linux --compilation_mode opt
+    env PATH="/usr/lib/jvm/java-11-openjdk/bin/:$PATH" bazel build unix/fcitx5:fcitx5-mozc.so unix/icons --config oss_linux --compilation_mode opt --copt=-fPIC
 }
 
 package() {
diff --git a/fcitx5.patch b/fcitx5.patch
index 7106d00b75e8..cac9eb064f20 100644
--- a/fcitx5.patch
+++ b/fcitx5.patch
@@ -4024,22 +4024,23 @@ diff -ruN google-mozc-git/src/unix/fcitx5/po/LINGUAS fcitx-mozc-git/src/unix/fci
 +zh_TW
 diff -ruN google-mozc-git/src/unix/fcitx5/po/ru.po fcitx-mozc-git/src/unix/fcitx5/po/ru.po
 --- google-mozc-git/src/unix/fcitx5/po/ru.po	1970-01-01 02:00:00.000000000 +0200
-+++ fcitx-mozc-git/src/unix/fcitx5/po/ru.po	2022-01-31 13:12:52.982202692 +0200
-@@ -0,0 +1,125 @@
++++ fcitx-mozc-git/src/unix/fcitx5/po/ru.po	2022-02-07 12:26:47.179161226 +0200
+@@ -0,0 +1,128 @@
 +# SOME DESCRIPTIVE TITLE.
 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 +# This file is distributed under the same license as the fcitx5-mozc package.
 +#
 +# Translators:
 +# csslayer <wengxt@gmail.com>, 2017
++# Dmitry <dmitrydmitry761@gmail.com>, 2022
 +#
 +msgid ""
 +msgstr ""
 +"Project-Id-Version: fcitx5-mozc\n"
 +"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
-+"POT-Creation-Date: 2021-12-30 02:39+0000\n"
++"POT-Creation-Date: 2022-01-31 20:24+0000\n"
 +"PO-Revision-Date: 2017-11-23 05:28+0000\n"
-+"Last-Translator: csslayer <wengxt@gmail.com>, 2017\n"
++"Last-Translator: Dmitry <dmitrydmitry761@gmail.com>, 2022\n"
 +"Language-Team: Russian (https://www.transifex.com/fcitx/teams/12005/ru/)\n"
 +"Language: ru\n"
 +"MIME-Version: 1.0\n"
@@ -4051,19 +4052,19 @@ diff -ruN google-mozc-git/src/unix/fcitx5/po/ru.po fcitx-mozc-git/src/unix/fcitx
 +
 +#: mozc_engine.h:84 mozc_engine.cc:196
 +msgid "About Mozc"
-+msgstr ""
++msgstr "О Mozc"
 +
 +#: mozc_engine.h:82 mozc_engine.cc:189
 +msgid "Add Word"
-+msgstr ""
++msgstr "Добавить слово"
 +
 +#: mozc_engine.h:48
 +msgid "Always"
-+msgstr ""
++msgstr "Всегда"
 +
 +#: mozc_engine.cc:96
 +msgid "Composition Mode"
-+msgstr ""
++msgstr "Композиционный режим"
 +
 +#: mozc_engine.h:78 mozc_engine.cc:173
 +msgid "Configuration Tool"
@@ -4075,82 +4076,84 @@ diff -ruN google-mozc-git/src/unix/fcitx5/po/ru.po fcitx-mozc-git/src/unix/fcitx
 +
 +#: mozc_engine.h:51 mozc_engine.cc:52
 +msgid "Direct"
-+msgstr ""
++msgstr "Непосредственный"
 +
 +#: mozc_engine.h:69
 +msgid "Expand Usage (Requires vertical candidate list)"
-+msgstr ""
++msgstr "Развернуть использование (требуется вертикальный список кандидатов)"
 +
 +#: mozc_engine.h:73
 +msgid "Fix embedded preedit cursor at the beginning of the preedit"
 +msgstr ""
++"Зафиксировать встроенный курсор предварительного редактирования в начале "
++"предварительного редактирования."
 +
 +#. Full width ASCII letter A.
 +#: mozc_engine.h:53 mozc_engine.cc:82
 +msgid "Full ASCII"
-+msgstr ""
++msgstr "Полная ASCII"
 +
 +#. Katakana letter A.
 +#: mozc_engine.h:52 mozc_engine.cc:66
 +msgid "Full Katakana"
-+msgstr ""
++msgstr "Полная Катакана"
 +
 +#: mozc_engine.h:52 mozc_engine.cc:74
 +msgid "Half ASCII"
-+msgstr ""
++msgstr "Половинная ASCII"
 +
 +#. Half width Katakana letter A.
 +#: mozc_engine.h:53 mozc_engine.cc:89
 +msgid "Half Katakana"
-+msgstr ""
++msgstr "Половинная Катакана"
 +
 +#. Hiragana letter A in UTF-8.
 +#: mozc_engine.h:51 mozc_engine.cc:59
 +msgid "Hiragana"
-+msgstr ""
++msgstr "Хирагана"
 +
 +#: mozc_engine.h:49
 +msgid "Hotkey"
-+msgstr ""
++msgstr "Горячая клавиша"
 +
 +#: mozc_engine.h:75
 +msgid "Hotkey to expand usage"
-+msgstr ""
++msgstr "Горячая клавиша для расширения использования"
 +
 +#: mozc_engine.h:63
 +msgid "Initial Mode"
-+msgstr ""
++msgstr "Начальный режим"
 +
 +#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:8
 +msgid "Japanese input method based on Mozc"
-+msgstr ""
++msgstr "Японский метод ввода на основе Mozc"
 +
 +#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:7
 +msgid "Mozc for Fcitx 5"
-+msgstr ""
++msgstr "Mozc для Fcitx 5"
 +
 +#: mozc_engine.h:48
 +msgid "On Focus"
-+msgstr ""
++msgstr "В фокусе"
 +
 +#. We don't have a good library option for this, just do the simple
 +#. replace. absl's runtime parsed format string is too copmlex.
 +#: mozc_response_parser.cc:175
 +#, c-format
 +msgid "Press %s to show usages."
-+msgstr ""
++msgstr "Нажмите %s , чтобы показать использование."
 +
 +#: mozc_state.cc:405
 +msgid "Press Escape to go back"
-+msgstr ""
++msgstr "Нажмите Escape, чтобы вернуться назад"
 +
 +#: mozc_engine.cc:159 mozc_engine.cc:160
 +msgid "Tool"
-+msgstr ""
++msgstr "Инструмент"
 +
 +#: mozc_engine.h:65
 +msgid "Vertical candidate list"
-+msgstr ""
++msgstr "Вертикальный список кандидатов"
 diff -ruN google-mozc-git/src/unix/fcitx5/po/tr.po fcitx-mozc-git/src/unix/fcitx5/po/tr.po
 --- google-mozc-git/src/unix/fcitx5/po/tr.po	1970-01-01 02:00:00.000000000 +0200
 +++ fcitx-mozc-git/src/unix/fcitx5/po/tr.po	2022-01-31 13:12:52.982202692 +0200