Bug#1091869: marked as done (bookworm-pu: package mozc/2.28.4715.102+dfsg-2.2+deb12u1)

Debian Bug Tracking System Sat, 15 Mar 2025 03:08:54 -0700

Your message dated Sat, 15 Mar 2025 09:44:44 +0000
with message-id <[email protected]>
and subject line Close 1091869
has caused the Debian Bug report #1091869,
regarding bookworm-pu: package mozc/2.28.4715.102+dfsg-2.2+deb12u1
to be marked as done.


This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
1091869: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1091869
Debian Bug Tracking System
Contact [email protected] with problems

--- Begin Message ---

Package: release.debian.org
Control: affects -1 + src:mozc
X-Debbugs-Cc: [email protected]
User: [email protected]
Usertags: pu
Tags: bookworm
X-Debbugs-Cc: [email protected]
Severity: normal

Dear Debian Stable Release managers,

I am looking into solving Debian Bug https://bugs.debian.org/1091829
in Debian 12.

[ Reason ]
The source package mozc provides fcitx5-mozc input method as well. After
some communication with the fcitx5 upstream author, it is determined
that the naming of fcitx-mozc*.png icon files is problematic, and some
unexpected side effect of XDG Icon Theme Spec [1] will cause wrong
fallback on fcitx-related icons.

The fix towards this issue is requested by the fcitx5 upstream author, who contacted me for a stable-pu in Debian 12.


This issue was solved by fcitx5-mozc upstream back in April 2024 at [2].
For Debian 12, we expect to cherry-pick the commmit at [2] and apply
the same fix.

[1] https://specifications.freedesktop.org/icon-theme-spec/latest/

[2] https://github.com/fcitx/mozc/commit/e13338a41329f58e724801771f0cecf7338e24fb


[ Impact ]
The current version of fcitx5-mozc will have some wrong icons when
displayed in the GUI windows. An example can be found at
https://github.com/fcitx/fcitx5/pull/1220#issuecomment-2566177095 .

[ Tests ]
Manually tested.

[ Risks ]
Minimal risk. In the worst case scenario, related icons could not

be properly displayed in GUI, which is harmless on utilities' actual functionalities.


[ Checklist ]
  [X] *all* changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in (old)stable
  [X] the issue is verified as fixed in unstable

[ Changes ]
Please see the attached debdiff. The change includes the upstream
cherry-picked commit, as well as changes in debian/fcitx-mozc-data.links
to provide the symlinks with updated icon file names.

Please let me know if you have any questions. Thanks!


Thanks,
Boyuan Yang

diff -Nru mozc-2.28.4715.102+dfsg/debian/changelog 
mozc-2.28.4715.102+dfsg/debian/changelog
--- mozc-2.28.4715.102+dfsg/debian/changelog    2022-12-10 05:44:49.000000000 
-0500
+++ mozc-2.28.4715.102+dfsg/debian/changelog    2025-01-01 12:06:29.000000000 
-0500
@@ -1,3 +1,13 @@
+mozc (2.28.4715.102+dfsg-2.2+deb12u1) bookworm; urgency=medium
+
+   * debian/patches/fcitx5-backport/:
+    + e13338a41329f58e724801771f0cecf7338e24fb.patch: Backport fixes
+      for fcitx icon names. (Closes: #1091829)
+  * debian/fcitx-mozc-data.links: Also adjust file installation link
+    accordingly following the patch.
+
+ -- Boyuan Yang <[email protected]>  Wed, 01 Jan 2025 12:06:29 -0500
+
 mozc (2.28.4715.102+dfsg-2.2) unstable; urgency=medium
 
   * Non-maintainer upload
diff -Nru mozc-2.28.4715.102+dfsg/debian/fcitx-mozc-data.links 
mozc-2.28.4715.102+dfsg/debian/fcitx-mozc-data.links
--- mozc-2.28.4715.102+dfsg/debian/fcitx-mozc-data.links        2022-11-30 
15:06:06.000000000 -0500
+++ mozc-2.28.4715.102+dfsg/debian/fcitx-mozc-data.links        2025-01-01 
12:04:40.000000000 -0500
@@ -1,18 +1,19 @@
+# Also see 
https://github.com/fcitx/mozc/commit/e13338a41329f58e724801771f0cecf7338e24fb
 usr/share/icons/mozc/ime_product_icon_opensource-32.png 
usr/share/fcitx/mozc/icon/mozc.png
-usr/share/icons/mozc/product_icon_32bpp-128.png 
usr/share/icons/hicolor/128x128/apps/org.fcitx.Fcitx5.fcitx-mozc.png
-usr/share/icons/mozc/ime_product_icon_opensource-32.png 
usr/share/icons/hicolor/32x32/apps/org.fcitx.Fcitx5.fcitx-mozc.png
-usr/share/icons/mozc/product_icon_32bpp-128.png 
usr/share/icons/hicolor/128x128/apps/fcitx-mozc.png
-usr/share/icons/mozc/ime_product_icon_opensource-32.png 
usr/share/icons/hicolor/32x32/apps/fcitx-mozc.png
+usr/share/icons/mozc/product_icon_32bpp-128.png 
usr/share/icons/hicolor/128x128/apps/org.fcitx.Fcitx5.fcitx_mozc.png
+usr/share/icons/mozc/ime_product_icon_opensource-32.png 
usr/share/icons/hicolor/32x32/apps/org.fcitx.Fcitx5.fcitx_mozc.png
+usr/share/icons/mozc/product_icon_32bpp-128.png 
usr/share/icons/hicolor/128x128/apps/fcitx_mozc.png
+usr/share/icons/mozc/ime_product_icon_opensource-32.png 
usr/share/icons/hicolor/32x32/apps/fcitx_mozc.png
  
-usr/share/icons/mozc/ui-tool.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-tool.png
-usr/share/icons/mozc/ui-properties.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-tool.png
-usr/share/icons/mozc/ui-dictionary.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-dictionary.png
-usr/share/icons/mozc/ui-direct.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-direct.png
-usr/share/icons/mozc/ui-hiragana.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-hiragana.png
-usr/share/icons/mozc/ui-katakana_half.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-katakana-half.png
-usr/share/icons/mozc/ui-katakana_full.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-katakana-full.png
-usr/share/icons/mozc/ui-alpha_half.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-alpha-half.png
-usr/share/icons/mozc/ui-alpha_full.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-alpha-full.png
+usr/share/icons/mozc/ui-tool.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_tool.png
+usr/share/icons/mozc/ui-properties.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_tool.png
+usr/share/icons/mozc/ui-dictionary.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_dictionary.png
+usr/share/icons/mozc/ui-direct.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_direct.png
+usr/share/icons/mozc/ui-hiragana.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_hiragana.png
+usr/share/icons/mozc/ui-katakana_half.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_katakana_half.png
+usr/share/icons/mozc/ui-katakana_full.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_katakana_full.png
+usr/share/icons/mozc/ui-alpha_half.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_alpha_half.png
+usr/share/icons/mozc/ui-alpha_full.png 
usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_alpha_full.png
 # usr/share/icons/mozc/ime_product_icon_opensource-32.png 
/usr/share/fcitx/mozc/icon/mozc.png
 usr/share/icons/mozc/ui-tool.png usr/share/fcitx/mozc/icon/mozc-tool.png
 usr/share/icons/mozc/ui-properties.png 
usr/share/fcitx/mozc/icon/mozc-properties.png
@@ -23,12 +24,12 @@
 usr/share/icons/mozc/ui-katakana_full.png 
usr/share/fcitx/mozc/icon/mozc-katakana_full.png
 usr/share/icons/mozc/ui-alpha_half.png 
usr/share/fcitx/mozc/icon/mozc-alpha_half.png
 usr/share/icons/mozc/ui-alpha_full.png 
usr/share/fcitx/mozc/icon/mozc-alpha_full.png
-usr/share/icons/mozc/ui-tool.png 
usr/share/icons/hicolor/48x48/apps/fcitx-mozc-tool.png
-usr/share/icons/mozc/ui-properties.png 
usr/share/icons/hicolor/48x48/apps/fcitx-mozc-tool.png
-usr/share/icons/mozc/ui-dictionary.png 
usr/share/icons/hicolor/48x48/apps/fcitx-mozc-dictionary.png
-usr/share/icons/mozc/ui-direct.png 
usr/share/icons/hicolor/48x48/apps/fcitx-mozc-direct.png
-usr/share/icons/mozc/ui-hiragana.png 
usr/share/icons/hicolor/48x48/apps/fcitx-mozc-hiragana.png
-usr/share/icons/mozc/ui-katakana_half.png 
usr/share/icons/hicolor/48x48/apps/fcitx-mozc-katakana-half.png
-usr/share/icons/mozc/ui-katakana_full.png 
usr/share/icons/hicolor/48x48/apps/fcitx-mozc-katakana-full.png
-usr/share/icons/mozc/ui-alpha_half.png 
usr/share/icons/hicolor/48x48/apps/fcitx-mozc-alpha-half.png
-usr/share/icons/mozc/ui-alpha_full.png 
usr/share/icons/hicolor/48x48/apps/fcitx-mozc-alpha-full.png
+usr/share/icons/mozc/ui-tool.png 
usr/share/icons/hicolor/48x48/apps/fcitx_mozc_tool.png
+usr/share/icons/mozc/ui-properties.png 
usr/share/icons/hicolor/48x48/apps/fcitx_mozc_tool.png
+usr/share/icons/mozc/ui-dictionary.png 
usr/share/icons/hicolor/48x48/apps/fcitx_mozc_dictionary.png
+usr/share/icons/mozc/ui-direct.png 
usr/share/icons/hicolor/48x48/apps/fcitx_mozc_direct.png
+usr/share/icons/mozc/ui-hiragana.png 
usr/share/icons/hicolor/48x48/apps/fcitx_mozc_hiragana.png
+usr/share/icons/mozc/ui-katakana_half.png 
usr/share/icons/hicolor/48x48/apps/fcitx_mozc_katakana_half.png
+usr/share/icons/mozc/ui-katakana_full.png 
usr/share/icons/hicolor/48x48/apps/fcitx_mozc_katakana_full.png
+usr/share/icons/mozc/ui-alpha_half.png 
usr/share/icons/hicolor/48x48/apps/fcitx_mozc_alpha_half.png
+usr/share/icons/mozc/ui-alpha_full.png 
usr/share/icons/hicolor/48x48/apps/fcitx_mozc_alpha_full.png
diff -Nru 
mozc-2.28.4715.102+dfsg/debian/patches/fcitx5-backport/e13338a41329f58e724801771f0cecf7338e24fb.patch
 
mozc-2.28.4715.102+dfsg/debian/patches/fcitx5-backport/e13338a41329f58e724801771f0cecf7338e24fb.patch
--- 
mozc-2.28.4715.102+dfsg/debian/patches/fcitx5-backport/e13338a41329f58e724801771f0cecf7338e24fb.patch
       1969-12-31 19:00:00.000000000 -0500
+++ 
mozc-2.28.4715.102+dfsg/debian/patches/fcitx5-backport/e13338a41329f58e724801771f0cecf7338e24fb.patch
       2025-01-01 12:04:40.000000000 -0500
@@ -0,0 +1,163 @@
+From: Weng Xuetian <[email protected]>
+Date: Mon, 29 Apr 2024 15:02:58 -0700
+Subject: [PATCH] rename mozc icon
+
+Bug-Debian: https://bugs.debian.org/1091829
+Applied-Upstream: 
https://github.com/fcitx/mozc/commit/e13338a41329f58e724801771f0cecf7338e24fb
+Forwarded: not-needed
+Last-Updated: 2024-12-31
+
+Signed-off-by: Boyuan Yang <[email protected]>
+---
+ scripts/install_fcitx5_icons   | 44 +++++++++++++++++++++---------------------
+ src/unix/fcitx5/mozc.conf      |  2 +-
+ src/unix/fcitx5/mozc_engine.cc | 18 ++++++++---------
+ 3 files changed, 32 insertions(+), 32 deletions(-)
+
+diff --git a/scripts/install_fcitx5_icons b/scripts/install_fcitx5_icons
+index a3d45a0..e8f101b 100755
+--- a/scripts/install_fcitx5_icons
++++ b/scripts/install_fcitx5_icons
+@@ -2,26 +2,26 @@
+ 
+ PREFIX="${PREFIX:-/usr}"
+ 
+-install -D -m 644 data/images/product_icon_32bpp-128.png 
"${PREFIX}/share/icons/hicolor/128x128/apps/org.fcitx.Fcitx5.fcitx-mozc.png"
+-install -D -m 644 data/images/unix/ime_product_icon_opensource-32.png 
"${PREFIX}/share/icons/hicolor/32x32/apps/org.fcitx.Fcitx5.fcitx-mozc.png"
+-install -D -m 644 ../scripts/icons/ui-alpha_full.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-alpha-full.png"
+-install -D -m 644 ../scripts/icons/ui-alpha_half.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-alpha-half.png"
+-install -D -m 644 ../scripts/icons/ui-direct.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-direct.png"
+-install -D -m 644 ../scripts/icons/ui-hiragana.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-hiragana.png"
+-install -D -m 644 ../scripts/icons/ui-katakana_full.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-katakana-full.png"
+-install -D -m 644 ../scripts/icons/ui-katakana_half.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-katakana-half.png"
+-install -D -m 644 ../scripts/icons/ui-dictionary.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-dictionary.png"
+-install -D -m 644 ../scripts/icons/ui-properties.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-properties.png"
+-install -D -m 644 ../scripts/icons/ui-tool.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-tool.png"
++install -D -m 644 data/images/product_icon_32bpp-128.png 
"${PREFIX}/share/icons/hicolor/128x128/apps/org.fcitx.Fcitx5.fcitx_mozc.png"
++install -D -m 644 data/images/unix/ime_product_icon_opensource-32.png 
"${PREFIX}/share/icons/hicolor/32x32/apps/org.fcitx.Fcitx5.fcitx_mozc.png"
++install -D -m 644 ../scripts/icons/ui-alpha_full.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_alpha_full.png"
++install -D -m 644 ../scripts/icons/ui-alpha_half.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_alpha_half.png"
++install -D -m 644 ../scripts/icons/ui-direct.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_direct.png"
++install -D -m 644 ../scripts/icons/ui-hiragana.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_hiragana.png"
++install -D -m 644 ../scripts/icons/ui-katakana_full.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_katakana_full.png"
++install -D -m 644 ../scripts/icons/ui-katakana_half.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_katakana_half.png"
++install -D -m 644 ../scripts/icons/ui-dictionary.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_dictionary.png"
++install -D -m 644 ../scripts/icons/ui-properties.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_properties.png"
++install -D -m 644 ../scripts/icons/ui-tool.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_mozc_tool.png"
+ 
+-ln -sf org.fcitx.Fcitx5.fcitx-mozc.png 
"${PREFIX}/share/icons/hicolor/128x128/apps/fcitx-mozc.png"
+-ln -sf org.fcitx.Fcitx5.fcitx-mozc.png 
"${PREFIX}/share/icons/hicolor/32x32/apps/fcitx-mozc.png"
+-ln -sf org.fcitx.Fcitx5.fcitx-mozc-alpha-full.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx-mozc-alpha-full.png"
+-ln -sf org.fcitx.Fcitx5.fcitx-mozc-alpha-half.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx-mozc-alpha-half.png"
+-ln -sf org.fcitx.Fcitx5.fcitx-mozc-direct.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx-mozc-direct.png"
+-ln -sf org.fcitx.Fcitx5.fcitx-mozc-hiragana.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx-mozc-hiragana.png"
+-ln -sf org.fcitx.Fcitx5.fcitx-mozc-katakana-full.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx-mozc-katakana-full.png"
+-ln -sf org.fcitx.Fcitx5.fcitx-mozc-katakana-half.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx-mozc-katakana-half.png"
+-ln -sf org.fcitx.Fcitx5.fcitx-mozc-dictionary.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx-mozc-dictionary.png"
+-ln -sf org.fcitx.Fcitx5.fcitx-mozc-properties.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx-mozc-properties.png"
+-ln -sf org.fcitx.Fcitx5.fcitx-mozc-tool.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx-mozc-tool.png"
++ln -sf org.fcitx.Fcitx5.fcitx_mozc.png 
"${PREFIX}/share/icons/hicolor/128x128/apps/fcitx_mozc.png"
++ln -sf org.fcitx.Fcitx5.fcitx_mozc.png 
"${PREFIX}/share/icons/hicolor/32x32/apps/fcitx_mozc.png"
++ln -sf org.fcitx.Fcitx5.fcitx_mozc_alpha_full.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx_mozc_alpha_full.png"
++ln -sf org.fcitx.Fcitx5.fcitx_mozc_alpha_half.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx_mozc_alpha_half.png"
++ln -sf org.fcitx.Fcitx5.fcitx_mozc_direct.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx_mozc_direct.png"
++ln -sf org.fcitx.Fcitx5.fcitx_mozc_hiragana.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx_mozc_hiragana.png"
++ln -sf org.fcitx.Fcitx5.fcitx_mozc_katakana_full.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx_mozc_katakana_full.png"
++ln -sf org.fcitx.Fcitx5.fcitx_mozc_katakana_half.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx_mozc_katakana_half.png"
++ln -sf org.fcitx.Fcitx5.fcitx_mozc_dictionary.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx_mozc_dictionary.png"
++ln -sf org.fcitx.Fcitx5.fcitx_mozc_properties.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx_mozc_properties.png"
++ln -sf org.fcitx.Fcitx5.fcitx_mozc_tool.png 
"${PREFIX}/share/icons/hicolor/48x48/apps/fcitx_mozc_tool.png"
+diff --git a/src/unix/fcitx5/mozc.conf b/src/unix/fcitx5/mozc.conf
+index e87064e..40725d7 100644
+--- a/src/unix/fcitx5/mozc.conf
++++ b/src/unix/fcitx5/mozc.conf
+@@ -1,6 +1,6 @@
+ [InputMethod]
+ Name=Mozc
+-Icon=fcitx-mozc
++Icon=fcitx_mozc
+ Label=あ
+ LangCode=ja
+ Addon=mozc
+diff --git a/src/unix/fcitx5/mozc_engine.cc b/src/unix/fcitx5/mozc_engine.cc
+index e04b061..dd69871 100644
+--- a/src/unix/fcitx5/mozc_engine.cc
++++ b/src/unix/fcitx5/mozc_engine.cc
+@@ -47,21 +47,21 @@ const struct CompositionModeInfo {
+ } kPropCompositionModes[] = {
+     {
+         "mozc-mode-direct",
+-        "fcitx-mozc-direct",
++        "fcitx_mozc_direct",
+         "A",
+         N_("Direct"),
+         mozc::commands::DIRECT,
+     },
+     {
+         "mozc-mode-hiragana",
+-        "fcitx-mozc-hiragana",
++        "fcitx_mozc_hiragana",
+         "\xe3\x81\x82",  // Hiragana letter A in UTF-8.
+         N_("Hiragana"),
+         mozc::commands::HIRAGANA,
+     },
+     {
+         "mozc-mode-katakana_full",
+-        "fcitx-mozc-katakana-full",
++        "fcitx_mozc_katakana_full",
+         "\xe3\x82\xa2",  // Katakana letter A.
+         N_("Full Katakana"),
+         mozc::commands::FULL_KATAKANA,
+@@ -69,7 +69,7 @@ const struct CompositionModeInfo {
+     {
+ 
+         "mozc-mode-alpha_half",
+-        "fcitx-mozc-alpha-half",
++        "fcitx_mozc_alpha_half",
+         "A",
+         N_("Half ASCII"),
+         mozc::commands::HALF_ASCII,
+@@ -77,14 +77,14 @@ const struct CompositionModeInfo {
+     {
+ 
+         "mozc-mode-alpha_full",
+-        "fcitx-mozc-alpha-full",
++        "fcitx_mozc_alpha_full",
+         "\xef\xbc\xa1",  // Full width ASCII letter A.
+         N_("Full ASCII"),
+         mozc::commands::FULL_ASCII,
+     },
+     {
+         "mozc-mode-katakana_half",
+-        "fcitx-mozc-katakana-half",
++        "fcitx_mozc_katakana_half",
+         "\xef\xbd\xb1",  // Half width Katakana letter A.
+         N_("Half Katakana"),
+         mozc::commands::HALF_KATAKANA,
+@@ -142,7 +142,7 @@ MozcEngine::MozcEngine(Instance *instance)
+   instance_->userInterfaceManager().registerAction("mozc-tool", &toolAction_);
+   toolAction_.setShortText(_("Mozc Settings"));
+   toolAction_.setLongText(_("Mozc Settings"));
+-  toolAction_.setIcon("fcitx-mozc-tool");
++  toolAction_.setIcon("fcitx_mozc_tool");
+ 
+   int i = 0;
+   for (auto &modeAction : modeActions_) {
+@@ -169,7 +169,7 @@ MozcEngine::MozcEngine(Instance *instance)
+   instance_->userInterfaceManager().registerAction("mozc-tool-config",
+                                                    &configToolAction_);
+   configToolAction_.setShortText(_("Configuration Tool"));
+-  configToolAction_.setIcon("fcitx-mozc-tool");
++  configToolAction_.setIcon("fcitx_mozc_tool");
+   configToolAction_.connect<SimpleAction::Activated>([](InputContext *) {
+     mozc::Process::SpawnMozcProcess("mozc_tool", "--mode=config_dialog");
+   });
+@@ -177,7 +177,7 @@ MozcEngine::MozcEngine(Instance *instance)
+   instance_->userInterfaceManager().registerAction("mozc-tool-dict",
+                                                    &dictionaryToolAction_);
+   dictionaryToolAction_.setShortText(_("Dictionary Tool"));
+-  dictionaryToolAction_.setIcon("fcitx-mozc-dictionary");
++  dictionaryToolAction_.setIcon("fcitx_mozc_dictionary");
+   dictionaryToolAction_.connect<SimpleAction::Activated>([](InputContext *) {
+     mozc::Process::SpawnMozcProcess("mozc_tool", "--mode=dictionary_tool");
+   });
diff -Nru mozc-2.28.4715.102+dfsg/debian/patches/series 
mozc-2.28.4715.102+dfsg/debian/patches/series
--- mozc-2.28.4715.102+dfsg/debian/patches/series       2022-12-10 
05:27:09.000000000 -0500
+++ mozc-2.28.4715.102+dfsg/debian/patches/series       2025-01-01 
12:05:59.000000000 -0500
@@ -7,3 +7,4 @@
 0007-common.gypi-Use-command-v-instead-of-which.patch
 #0008-renderer-Convert-Gtk2-to-Gtk3.patch
 0009-protobuf.gyp-Add-latomic-to-link_settings.patch
+fcitx5-backport/e13338a41329f58e724801771f0cecf7338e24fb.patch

OpenPGP_signature.asc
Description: OpenPGP digital signature

--- End Message ---

--- Begin Message ---

Version: 12.10
This update has been released as part of 12.10. Thank you for your contribution.

--- End Message ---

Bug#1091869: marked as done (bookworm-pu: package mozc/2.28.4715.102+dfsg-2.2+deb12u1)

Reply via email to