Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2026-10-21 21:01:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozc (Old) and /work/SRC/openSUSE:Factory/.mozc.new.2252680 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozc" Wed Oct 21 21:01:31 2026 rev:58 rq:1386783 version:3.34.6239 Changes: -------- --- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2026-05-15 23:56:46.553174784 +0200 +++ /work/SRC/openSUSE:Factory/.mozc.new.2252680/mozc.changes 2026-10-21 21:02:52.001569998 +0200 @@ -1,0 +2,27 @@ +Sat Oct 17 16:14:03 UTC 2026 - Martin Pluskal <[email protected]> + +- Update to version 3.34.6239: + * Updated OSS dictionary and zip code data as of 2026-04-03 + * Added the circled zero to number conversion candidates + * Enabled partial matches in user history prediction and improved + prediction performance + * Sanitize user dictionary entries and IBus config strings + * IBus engines moved to ibus_config.textproto, engine XML is no + longer generated (ibus-provide-layout-variations.patch rebased + to the new file to keep the JP/US/Dvorak layout variants) + * Refreshed use-system-python.patch for the new MODULE.bazel + * Adapt the fcitx modules to mozc-3.34 (base:singleton is gone; + backported from fcitx/mozc): fcitx-mozc-3.34-compat.patch +- Regenerated dependencies.tar and bcr.tar.xz for the new Bazel + module pins (abseil-cpp 20260107.1, protobuf 34.1, rules_python + 1.9.0, rules_go/gazelle/rules_android and others) +- Shut the Bazel server down without the project .bazelrc: its + common:linux_env chain pulls in the build-only compiler_gcc_like + config, failing an otherwise successful build at the last step +- Drop Group and BuildRoot tags; spec-cleaner pass (macro-ified + install paths) +- Fix build with Qt 6.12 uic, which rejects the leading "::" in + the dictionary_tool custom widget class name (upstream commit + 29c082a): qt-6.12-uic-class-name.patch + +------------------------------------------------------------------- Old: ---- mozc-3.33.6133.102.tar.xz New: ---- fcitx-mozc-3.34-compat.patch mozc-3.34.6239.tar.xz qt-6.12-uic-class-name.patch ----------(New B)---------- New: * Adapt the fcitx modules to mozc-3.34 (base:singleton is gone; backported from fcitx/mozc): fcitx-mozc-3.34-compat.patch - Regenerated dependencies.tar and bcr.tar.xz for the new Bazel New: the dictionary_tool custom widget class name (upstream commit 29c082a): qt-6.12-uic-class-name.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozc.spec ++++++ --- /var/tmp/diff_new_pack.TQrouU/_old 2026-10-21 21:02:54.877694473 +0200 +++ /var/tmp/diff_new_pack.TQrouU/_new 2026-10-21 21:02:54.881694646 +0200 @@ -17,9 +17,8 @@ %global flavor @BUILD_FLAVOR@%{nil} - %if 0%{?is_opensuse} -%if "%flavor" == "fcitx" +%if "%{flavor}" == "fcitx" %define with_fcitx4 1 %define with_fcitx5 0 %define install_mozc 0 @@ -29,9 +28,8 @@ %define install_mozc 1 %endif %endif - %if !0%{?is_opensuse} -%if "%flavor" == "fcitx" +%if "%{flavor}" == "fcitx" ExclusiveArch: do_not_build %else %define with_fcitx4 0 @@ -39,35 +37,26 @@ %define install_mozc 1 %endif %endif - +%define server_dir %{_libdir}/mozc +%define ibus_mozc_path %{_libdir}/ibus-mozc/ibus-engine-mozc +%define ibus_mozc_icon_path %{_datadir}/ibus-mozc/mozc.png +%define document_dir %{_docdir}/ibus-mozc %if %{with_fcitx4} %define fcitx_icon_dir %{_datadir}/fcitx/mozc/icon/ %define fcitx_addon_dir %{_datadir}/fcitx/addon/ %define fcitx_inputmethod_dir %{_datadir}/fcitx/inputmethod/ %define fcitx_lib_dir %{_libdir}/fcitx/ %endif - %if %{with_fcitx5} %define fcitx5_addon_dir %{_datadir}/fcitx5/addon/ %define fcitx5_inputmethod_dir %{_datadir}/fcitx5/inputmethod/ %define fcitx5_lib_dir %{_libdir}/fcitx5/ %endif - -%define server_dir %{_libdir}/mozc -%define ibus_mozc_path %{_libdir}/ibus-mozc/ibus-engine-mozc -%define ibus_mozc_icon_path %{_datadir}/ibus-mozc/mozc.png -%define document_dir %{_docdir}/ibus-mozc - Name: mozc -Version: 3.33.6133.102 +Version: 3.34.6239 Release: 0 Summary: Mozc - Japanese Input Method for Chromium OS, Mac and Linux -License: Apache-2.0 AND BSD-3-Clause AND SUSE-Public-Domain AND Zlib -Group: System/I18n/Japanese -ExcludeArch: ppc ppc64 s390 s390x %{ix86} -%if %{with_fcitx4} && 0%{?suse_version} >= 1600 && 0%{?is_opensuse} -ExclusiveArch: donotbuild -%endif +License: Apache-2.0 AND BSD-3-Clause AND LicenseRef-SUSE-Public-Domain AND Zlib URL: https://github.com/google/mozc Source0: %{name}-%{version}.tar.xz Source1: README.SUSE @@ -78,6 +67,20 @@ # License: Apache-2.0 Source3: bcr.tar.xz Source4: ibus-setup-mozc-jp.desktop.in +# PATCH-FEATURE-OPENSUSE [email protected] +Patch1: ibus-provide-layout-variations.patch +# PATCH-FEATURE-OPENSUSE [email protected] -- Use system python while building +Patch2: use-system-python.patch +# PATCH-FIX-UPSTREAM https://github.com/google/mozc/commit/29c082a64b577b661694148760a2ae19817beb57 -- Qt 6.12 uic rejects leading "::" in custom widget class names +Patch3: qt-6.12-uic-class-name.patch +BuildRequires: bazel8 +BuildRequires: pkgconfig +BuildRequires: unzip +BuildRequires: pkgconfig(zlib) +ExcludeArch: ppc ppc64 s390 s390x %{ix86} +%if %{with_fcitx4} && 0%{?suse_version} >= 1600 && 0%{?is_opensuse} +ExclusiveArch: donotbuild +%endif # # # add fcitx as mozc module @@ -88,18 +91,10 @@ Source20: fcitx-mozc-96fcec5b.tar.xz Source21: fcitx-mozc-icons.tar.gz Patch20: fcitx-mozc-bazel-build.patch +# PATCH-FIX-UPSTREAM adapt fcitx modules to mozc-3.34 (base:singleton removed upstream) +Patch21: fcitx-mozc-3.34-compat.patch %endif -# PATCH-FEATURE-OPENSUSE [email protected] -Patch1: ibus-provide-layout-variations.patch -# PATCH-FEATURE-OPENSUSE [email protected] -- Use system python while building -Patch2: use-system-python.patch - -BuildRequires: bazel8 -BuildRequires: unzip -BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build - %description Mozc is a Japanese Input Method Editor (IME) designed for multi-platform such as Chromium OS, Mac and Linux. This open-source @@ -107,8 +102,8 @@ %package -n ibus-mozc Summary: The Mozc engine for IBus -Group: System/I18n/Japanese -BuildRequires: ibus-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(ibus-1.0) Requires: ibus >= 1.4.1 Requires: mozc = %{version} Requires: mozc-gui-tools = %{version} @@ -120,7 +115,7 @@ %package -n ibus-mozc-candidate-window Summary: An optional candidate window for ibus-mozc -Group: System/I18n/Japanese +BuildRequires: pkgconfig BuildRequires: pkgconfig(Qt6Core) BuildRequires: pkgconfig(Qt6Gui) BuildRequires: pkgconfig(Qt6Widgets) @@ -134,8 +129,8 @@ %if %{with_fcitx4} %package -n fcitx-mozc Summary: The Mozc backend for Fcitx -Group: System/I18n/Japanese -BuildRequires: fcitx-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(fcitx) Requires: fcitx Requires: mozc = %{version} Requires: mozc-gui-tools = %{version} @@ -148,8 +143,11 @@ %if %{with_fcitx5} %package -n fcitx5-mozc Summary: The Mozc backend for Fcitx 5 -Group: System/I18n/Japanese -BuildRequires: fcitx5-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(Fcitx5Config) +BuildRequires: pkgconfig(Fcitx5Core) +BuildRequires: pkgconfig(Fcitx5Module) +BuildRequires: pkgconfig(Fcitx5Utils) Requires: fcitx5 Requires: mozc = %{version} Requires: mozc-gui-tools = %{version} @@ -166,7 +164,7 @@ %package gui-tools Summary: GUI tools for mozc -Group: System/I18n/Japanese +BuildRequires: pkgconfig BuildRequires: pkgconfig(Qt6Core) BuildRequires: pkgconfig(Qt6Gui) BuildRequires: pkgconfig(Qt6Widgets) @@ -183,6 +181,7 @@ %if %{with_fcitx4} || %{with_fcitx5} tar xvf %{SOURCE20} %patch -P 20 -p1 +%patch -P 21 -p1 %endif %patch -P 1 -p1 @@ -191,6 +190,8 @@ %patch -P 2 -p1 +%patch -P 3 -p1 + # extract dependencies tar xf %{SOURCE2} tar xf %{SOURCE3} @@ -242,7 +243,10 @@ --verbose_failures \ -s -bazel shutdown +# Bare `bazel shutdown` reads src/.bazelrc, where common:linux_env pulls +# in the build-only compiler_gcc_like config and fails the whole build. +# (--bazelrc only *adds* a file; --noworkspace_rc drops the workspace one.) +bazel --noworkspace_rc shutdown %define output_dir src/bazel-bin @@ -360,6 +364,9 @@ install -m755 -d %{buildroot}%{_bindir} install -m755 %{output_dir}/unix/emacs/mozc_emacs_helper %{buildroot}%{_bindir} # install only for emacs since xemacs is not supported +# Keep the datadir-based install path spelled out: the emacs sitelisp +# macro is not defined in this buildroot, so the macro form breaks the +# files list below. install -m755 -d %{buildroot}%{_datadir}/emacs/site-lisp install -m644 src/unix/emacs/mozc.el %{buildroot}%{_datadir}/emacs/site-lisp/ @@ -367,16 +374,15 @@ %endif %if %{with_fcitx4} -%find_lang fcitx-mozc %no_lang_C +%find_lang fcitx-mozc %{no_lang_C} %endif %if %{with_fcitx5} -%find_lang fcitx5-mozc %no_lang_C +%find_lang fcitx5-mozc %{no_lang_C} %endif %if %{install_mozc} %files -%defattr(-, root, root) %doc src/data/installer/credits_en.html %doc README.SUSE %dir %{server_dir} @@ -386,11 +392,9 @@ %{_datadir}/emacs/site-lisp/mozc.el %files gui-tools -%defattr(-, root, root) %{_libdir}/mozc/mozc_tool %files -n ibus-mozc -%defattr(-, root, root) %dir %{_libdir}/ibus-mozc/ %{_libdir}/ibus-mozc/ibus-engine-mozc %{_datadir}/applications/ibus-setup-mozc-jp.desktop @@ -402,13 +406,11 @@ %{_datadir}/ibus-mozc/ %files -n ibus-mozc-candidate-window -%defattr(-, root, root) %{_libdir}/mozc/mozc_renderer %endif %if %{with_fcitx4} %files -n fcitx-mozc -f fcitx-mozc.lang -%defattr(-,root,root) %{fcitx_lib_dir}/fcitx-mozc.so %{fcitx_addon_dir}/fcitx-mozc.conf @@ -430,7 +432,6 @@ %if %{with_fcitx5} %files -n fcitx5-mozc -f fcitx5-mozc.lang -%defattr(-,root,root) %{fcitx5_lib_dir}/fcitx5-mozc.so %{fcitx5_addon_dir}/mozc.conf ++++++ bcr.tar.xz ++++++ ++++ 17038 lines of diff (skipped) ++++++ dependencies.tar ++++++ /work/SRC/openSUSE:Factory/mozc/dependencies.tar /work/SRC/openSUSE:Factory/.mozc.new.2252680/dependencies.tar differ: char 1, line 1 ++++++ fcitx-mozc-3.34-compat.patch ++++++ # PATCH-FIX-UPSTREAM adapt fcitx modules to mozc-3.34 (no more base:singleton) # Backported from fcitx/mozc commits 5e1ea48, 02eaaa6 and the # SharedStatePolicy OptionWithAnnotation change (all in fcitx tree by 2026-06-24) --- a/src/unix/fcitx/BUILD.bazel +++ b/src/unix/fcitx/BUILD.bazel @@ -60,7 +60,6 @@ ], deps = [ "//base:port", - "//base:singleton", "//base:vlog", "//protocol:commands_cc_proto", "//protocol:config_cc_proto", --- a/src/unix/fcitx/fcitx_key_event_handler.cc +++ b/src/unix/fcitx/fcitx_key_event_handler.cc @@ -34,7 +34,6 @@ #include "absl/log/check.h" #include "base/vlog.h" -#include "base/singleton.h" namespace mozc { namespace fcitx { @@ -52,7 +51,7 @@ data_[commands::KeyEvent::LEFT_SHIFT] = commands::KeyEvent::SHIFT; data_[commands::KeyEvent::RIGHT_SHIFT] = commands::KeyEvent::SHIFT; } - const std::map<uint32_t, commands::KeyEvent::ModifierKey> &data() { + const std::map<uint32_t, commands::KeyEvent::ModifierKey> &data() const { return data_; } @@ -66,8 +65,10 @@ std::set<commands::KeyEvent::ModifierKey> *modifier_keys_set) { DCHECK(modifier_keys_set); - const std::map<uint32_t, commands::KeyEvent::ModifierKey> &data = - Singleton<AdditionalModifiersData>::get()->data(); + static const AdditionalModifiersData modifiers_data; + + const std::map<uint32_t, mozc::commands::KeyEvent::ModifierKey>& data = + modifiers_data.data(); // Adds MODIFIER if there are (LEFT|RIGHT)_MODIFIER like LEFT_SHIFT. for (std::set<commands::KeyEvent::ModifierKey>::const_iterator it = --- a/src/unix/fcitx5/BUILD.bazel +++ b/src/unix/fcitx5/BUILD.bazel @@ -56,7 +56,6 @@ ], deps = [ ":mozc_client_interface", - "//base:singleton", "//base:vlog", "//config:config_handler", "//data_manager/oss:oss_data_manager", @@ -143,7 +142,6 @@ ], deps = [ "//base:port", - "//base:singleton", "//base:vlog", "//protocol:commands_cc_proto", "//protocol:config_cc_proto", --- a/src/unix/fcitx5/fcitx_key_event_handler.cc +++ b/src/unix/fcitx5/fcitx_key_event_handler.cc @@ -42,7 +42,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include "base/singleton.h" #include "protocol/commands.pb.h" #include "protocol/config.pb.h" #include "unix/fcitx5/fcitx_key_translator.h" @@ -65,7 +64,8 @@ data_[mozc::commands::KeyEvent::RIGHT_SHIFT] = mozc::commands::KeyEvent::SHIFT; } - const std::map<uint32_t, mozc::commands::KeyEvent::ModifierKey>& data() { + const std::map<uint32_t, mozc::commands::KeyEvent::ModifierKey>& data() + const { return data_; } @@ -79,8 +79,10 @@ std::set<mozc::commands::KeyEvent::ModifierKey>* modifier_keys_set) { DCHECK(modifier_keys_set); + static const AdditionalModifiersData modifiers_data; + const std::map<uint32_t, mozc::commands::KeyEvent::ModifierKey>& data = - mozc::Singleton<AdditionalModifiersData>::get()->data(); + modifiers_data.data(); // Adds MODIFIER if there are (LEFT|RIGHT)_MODIFIER like LEFT_SHIFT. for (auto it = modifier_keys_set->begin(); it != modifier_keys_set->end(); --- a/src/unix/fcitx5/mozc_direct_client.cc +++ b/src/unix/fcitx5/mozc_direct_client.cc @@ -11,7 +11,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include "base/singleton.h" #include "config/config_handler.h" #include "data_manager/oss/oss_data_manager.h" #include "engine/engine.h" --- a/src/unix/fcitx5/mozc_engine.h +++ b/src/unix/fcitx5/mozc_engine.h @@ -81,9 +81,9 @@ OptionWithAnnotation<CompositionMode, CompositionModeI18NAnnotation> initialMode{this, "InitialMode", _("Initial Mode"), mozc::commands::HIRAGANA}; - Option<SharedStatePolicy> sharedStatePolicy{ - this, "InputState", _("Shared Input State"), - SharedStatePolicy::FollowGlobalConfig}; + OptionWithAnnotation<SharedStatePolicy, SharedStatePolicyI18NAnnotation> + sharedStatePolicy{this, "InputState", _("Shared Input State"), + SharedStatePolicy::FollowGlobalConfig}; Option<bool> verticalList{this, "Vertical", _("Vertical candidate list"), true}; OptionWithAnnotation<ExpandMode, ExpandModeI18NAnnotation> expandMode{ ++++++ ibus-provide-layout-variations.patch ++++++ --- /var/tmp/diff_new_pack.TQrouU/_old 2026-10-21 21:02:55.218709232 +0200 +++ /var/tmp/diff_new_pack.TQrouU/_new 2026-10-21 21:02:55.226709578 +0200 @@ -1,33 +1,37 @@ -diff --git a/src/unix/ibus/gen_mozc_xml.py b/src/unix/ibus/gen_mozc_xml.py -index 75514ea3..7998c0e9 100755 ---- a/src/unix/ibus/gen_mozc_xml.py -+++ b/src/unix/ibus/gen_mozc_xml.py -@@ -244,6 +244,27 @@ def main(): - 'rank': 99, - 'symbol': 'A', - 'composition_mode': 'DIRECT', -+ }, { -+ 'name': 'mozc-jp-jp', -+ 'longname': product_name + " - JP layout", -+ 'layout': 'jp', -+ 'layout_variant': '', -+ 'layout_option': '', -+ 'rank': 0, -+ }, { -+ 'name': 'mozc-us', -+ 'longname': product_name + " - US layout", -+ 'layout': 'us', -+ 'layout_variant': '', -+ 'layout_option': '', -+ 'rank': 0, -+ }, { -+ 'name': 'mozc-dv', -+ 'longname': product_name + " - US Dvorak layout", -+ 'layout': 'us', -+ 'layout_variant': 'dvorak', -+ 'layout_option': '', -+ 'rank': 0, - }] - - if options.output_cpp: +# PATCH-FEATURE-OPENSUSE [email protected] +# Provide JP/US/Dvorak keyboard layout variations for ibus-mozc +# (rebased for 3.34: engines moved from gen_mozc_xml.py to ibus_config.textproto) +--- a/src/unix/ibus/ibus_config.textproto ++++ b/src/unix/ibus/ibus_config.textproto +@@ -66,6 +66,30 @@ + symbol : "A" + composition_mode : DIRECT + } ++engines { ++ name : "mozc-jp-jp" ++ longname : "Mozc - JP layout" ++ layout : "jp" ++ layout_variant : "" ++ layout_option : "" ++ rank : 0 ++} ++engines { ++ name : "mozc-us" ++ longname : "Mozc - US layout" ++ layout : "us" ++ layout_variant : "" ++ layout_option : "" ++ rank : 0 ++} ++engines { ++ name : "mozc-dv" ++ longname : "Mozc - US Dvorak layout" ++ layout : "us" ++ layout_variant : "dvorak" ++ layout_option : "" ++ rank : 0 ++} + active_on_launch: False + mozc_renderer { + # Set 'False' to use IBus' candidate window. ++++++ mozc-3.33.6133.102.tar.xz -> mozc-3.34.6239.tar.xz ++++++ /work/SRC/openSUSE:Factory/mozc/mozc-3.33.6133.102.tar.xz /work/SRC/openSUSE:Factory/.mozc.new.2252680/mozc-3.34.6239.tar.xz differ: char 15, line 1 ++++++ qt-6.12-uic-class-name.patch ++++++ From: Google Mozc upstream <https://github.com/google/mozc/commit/29c082a64b577b661694148760a2ae19817beb57> Subject: Remove leading "::" from custom widget class name in dictionary_tool.ui Qt 6.12.0 uic rejects class names starting with "::" in UI files, resulting in build errors (uic: Invalid class name). Drop the leading "::" from the custom widget class. Upstream issue: https://github.com/google/mozc/issues/1594 Upstream commit rebased onto the 3.34 sources (context differs from master, change is identical). --- a/src/gui/dictionary_tool/dictionary_tool.ui +++ b/src/gui/dictionary_tool/dictionary_tool.ui @@ -52,7 +52,7 @@ <enum>Qt::Horizontal</enum> </property> <widget class="QListWidget" name="dic_list_"/> - <widget class="::mozc::gui::DictionaryContentTableWidget" name="dic_content_"/> + <widget class="mozc::gui::DictionaryContentTableWidget" name="dic_content_"/> </widget> </item> </layout> @@ -78,7 +78,7 @@ <container>1</container> </customwidget> <customwidget> - <class>::mozc::gui::DictionaryContentTableWidget</class> + <class>mozc::gui::DictionaryContentTableWidget</class> <extends>QTableWidget</extends> <header>gui/dictionary_tool/dictionary_content_table_widget.h</header> </customwidget> ++++++ use-system-python.patch ++++++ --- /var/tmp/diff_new_pack.TQrouU/_old 2026-10-21 21:02:55.302712867 +0200 +++ /var/tmp/diff_new_pack.TQrouU/_new 2026-10-21 21:02:55.305712997 +0200 @@ -1,10 +1,9 @@ -diff --git a/src/MODULE.bazel b/src/MODULE.bazel -index d1bcb5dea..5143ae96d 100644 +diff --git a/src/MODULE.bazel --- a/src/MODULE.bazel +++ b/src/MODULE.bazel -@@ -359,3 +359,5 @@ http_archive( - sha256 = "47a3e63e1379f707af9c49df5c4fa0534332173c73c61f93d14555673bed7599", - url = "https://github.com/hiroyuki-komatsu/japanpost_zipcode/raw/33524763837473258e7ba2f14b17fc3a70519831/ken_all.zip";, +@@ -372,3 +372,5 @@ + sha256 = "3adc97d8e19e1168a6cdcb2fce759d0e9e613a9a3b630cc180aecfd56ae81eaf", + url = "https://github.com/hiroyuki-komatsu/japanpost_zipcode/raw/621d059fbcbfae17bfca15b439692bae934268c3/ken_all.zip";, ) + +register_toolchains("//python_toolchain:all")
