Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2021-02-15 23:15:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozc (Old) and /work/SRC/openSUSE:Factory/.mozc.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozc" Mon Feb 15 23:15:55 2021 rev:37 rq:871313 version:2.26.4276.102 Changes: -------- --- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2020-11-17 21:22:05.809159416 +0100 +++ /work/SRC/openSUSE:Factory/.mozc.new.28504/mozc.changes 2021-02-15 23:18:00.447548793 +0100 @@ -1,0 +2,17 @@ +Mon Feb 8 15:35:55 UTC 2021 - Fuminobu Takeyama <[email protected]> + +- Upstream update to 2.26.4276.102 + * Fix problem with conversion including a number + * Introduce a new configuration file ibus_config.textproto + so that users can change IBus keyboard layout without root +- Update README.SUSE +- Update post code dictionary +- Update abseil-cpp to 20200923.3 +- Refresh build-with-libstdc++.patch +- Refresh ibus-provide-layout-variations.patch +- Remove fcitx-mozc-2.23.2815.102.1.patch + * Replaced with fcitx-mozc.tar.xz +- Remove fcitx-fix-for-a1dcadab.patch + * Merged by upstream + +------------------------------------------------------------------- Old: ---- abseil-cpp-lts_2020_02_25.zip fcitx-fix-for-a1dcadab.patch fcitx-mozc-2.23.2815.102.1.patch mozc-2.25.4150.102.tar.xz New: ---- abseil-cpp-20200923.3.zip fcitx-mozc.tar.xz mozc-2.26.4276.102.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozc.spec ++++++ --- /var/tmp/diff_new_pack.xJRn8B/_old 2021-02-15 23:18:01.591550502 +0100 +++ /var/tmp/diff_new_pack.xJRn8B/_new 2021-02-15 23:18:01.595550508 +0100 @@ -1,7 +1,7 @@ # # spec file for package mozc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,13 +25,14 @@ %define fcitx_lib_dir %{_libdir}/fcitx/ %endif +%define server_dir %{_libdir}/mozc %define ibus_mozc_path %{_libdir}/ibus-mozc/ibus-engine-mozc %define ibus_mozc_icon_path %{_datadir}/ibus-mozc/product_icon.png %define document_dir %{_docdir}/ibus-mozc %define use_libprotobuf 1 Name: mozc -Version: 2.25.4150.102 +Version: 2.26.4276.102 Release: 0 Summary: Mozc - Japanese Input Method for Chromium OS, Mac and Linux License: BSD-3-Clause AND SUSE-Public-Domain AND Apache-2.0 @@ -62,8 +63,8 @@ Source6: protobuf-v3.5.2.tar.gz # abseil cpp # License: Apache-2.0 -# https://github.com/abseil/abseil-cpp/archive/lts_2020_02_25.zip -Source7: abseil-cpp-lts_2020_02_25.zip +# https://github.com/abseil/abseil-cpp/archive/20200923.3.zip +Source7: abseil-cpp-20200923.3.zip # # jigyosyo.zip and ken_all.zip are zip-code--address data provided by # Japan Post Co., Ltd. @@ -74,9 +75,8 @@ %if %{with_fcitx} # add fcitx as mozc module # License: BSD-3-Clause -Patch: fcitx-mozc-2.23.2815.102.1.patch -# PATCH-FIX-UPSTREAM [email protected] -- update fcitx-mozc for newer mozc -Patch22: fcitx-fix-for-a1dcadab.patch +# https://github.com/fcitx/mozc/tree/fcitx/src/unix/fcitx{,5} +Source20: fcitx-mozc.tar.xz Source21: fcitx-mozc-icons.tar.gz %endif # A script for making a source tar.xz archive @@ -93,7 +93,7 @@ # PATCH-FIX-OPENSUSE mozc-build-gcc.patch bsc#990844 [email protected] -- Portng mozc-build-gcc.patch to force mozc build with gcc. Patch7: mozc-build-gcc.patch -# PATCH-FIX-OPENSUSE build-with-libstdc++.patch [email protected] -- force to use libstdc++ instead of libc++ +# PATCH-FIX-OPENSUSE build-with-libstdc++.patch [email protected] -- Use libstdc++ instead of libc++ Patch8: build-with-libstdc++.patch BuildRequires: ninja >= 1.4 @@ -167,8 +167,7 @@ # extract fcitx-mozc %if %{with_fcitx} -%patch -p1 -%patch22 -p1 +tar xvf %{SOURCE20} %endif %patch1 -p1 @@ -189,7 +188,7 @@ %endif # abseil unzip %{SOURCE7} -mv abseil-cpp-lts_2020_02_25 abseil-cpp +mv abseil-cpp-20200923.3 abseil-cpp cd ../.. cd src @@ -225,7 +224,7 @@ export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path} ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=%{use_libprotobuf} document_dir=%{document_dir} release_extra_cflags="'$flags'" use_fcitx5=0' cd src -python3 build_mozc.py gyp --server_dir=%{_libdir}/mozc +python3 build_mozc.py gyp --server_dir=%{server_dir} python3 build_mozc.py build -c %{target} \ unix/ibus/ibus.gyp:ibus_mozc \ %if %{with_fcitx} @@ -303,10 +302,10 @@ %endif -install -m755 -d %{buildroot}%{_libdir}/mozc -install -m755 %{output_dir}/mozc_server %{buildroot}%{_libdir}/mozc -install -m755 %{output_dir}/mozc_tool %{buildroot}%{_libdir}/mozc -install -m755 %{output_dir}/mozc_renderer %{buildroot}%{_libdir}/mozc +install -m755 -d %{buildroot}%{server_dir} +install -m755 %{output_dir}/mozc_server %{buildroot}%{server_dir} +install -m755 %{output_dir}/mozc_tool %{buildroot}%{server_dir} +install -m755 %{output_dir}/mozc_renderer %{buildroot}%{server_dir} install -m755 -d %{buildroot}%{_bindir} install -m755 %{output_dir}/mozc_emacs_helper %{buildroot}%{_bindir} @@ -324,8 +323,8 @@ %defattr(-, root, root) %doc src/data/installer/credits_en.html %doc README.SUSE -%dir %{_libdir}/mozc -%{_libdir}/mozc/mozc_server +%dir %{server_dir} +%{server_dir}/mozc_server %{_bindir}/mozc_emacs_helper %dir %{_datadir}/emacs/site-lisp/ %{_datadir}/emacs/site-lisp/mozc.el ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.xJRn8B/_old 2021-02-15 23:18:01.631550562 +0100 +++ /var/tmp/diff_new_pack.xJRn8B/_new 2021-02-15 23:18:01.631550562 +0100 @@ -1,9 +1,35 @@ -How to use mozc.el: +How to use ibus-mozc with a specific keyboard layout +----------------------------------------------------- + +openSUSE provides four variants of ibus-mozc with different layouts: + +- Mozc (which does not change layout) +- Mozc - JP layout +- Mozc - US layout +- Mozc - US Dvorak layout + +If you want to use ibus-mozc with a layout other than above, please find +ibus_config.textproto in ~/.mozc or ~/.config/mozc and a add new engine, +specifying "layout" and "variant" option. For available values of those +options, please refer to /usr/share/ibus/component/simple.xml + +After you change the configuration, please confirm the change is applied +successfully by running: + +``` +/usr/lib64/ibus-mozc/ibus-engine-mozc --xml +``` + + +How to use mozc.el ------------------- + After Mozc is installed, "mozc.el" is not enabled automatically since almost people input Japanese characters through a GTK IM module or XIM. If you want to use "mozc.el", please describe the following lines in your "~/.emacs": +``` (require 'mozc) (setq default-input-method 'japanese-mozc) +``` ++++++ build-with-libstdc++.patch ++++++ --- /var/tmp/diff_new_pack.xJRn8B/_old 2021-02-15 23:18:01.651550592 +0100 +++ /var/tmp/diff_new_pack.xJRn8B/_new 2021-02-15 23:18:01.651550592 +0100 @@ -1,5 +1,5 @@ diff --git a/src/gyp/common.gypi b/src/gyp/common.gypi -index 4e78489..9a159d8 100644 +index 0635068..dd8043e 100644 --- a/src/gyp/common.gypi +++ b/src/gyp/common.gypi @@ -105,7 +105,6 @@ @@ -10,19 +10,3 @@ '-pthread', ], -@@ -213,7 +212,6 @@ - ['compiler_target=="clang" or compiler_target=="gcc"', { - 'cflags_cc': [ - '-std=c++17', -- '-stdlib=libc++', - ], - }], - ], -@@ -233,7 +231,6 @@ - ['compiler_host=="clang" or compiler_host=="gcc"', { - 'cflags_cc': [ - '-std=c++17', -- '-stdlib=libc++', - ], - }], - ], ++++++ ibus-provide-layout-variations.patch ++++++ --- /var/tmp/diff_new_pack.xJRn8B/_old 2021-02-15 23:18:01.671550621 +0100 +++ /var/tmp/diff_new_pack.xJRn8B/_new 2021-02-15 23:18:01.675550628 +0100 @@ -1,36 +1,35 @@ diff --git a/src/unix/ibus/gen_mozc_xml.py b/src/unix/ibus/gen_mozc_xml.py -index 1e2180c..5cb1e50 100644 +index 52ae998..34b17a1 100644 --- a/src/unix/ibus/gen_mozc_xml.py +++ b/src/unix/ibus/gen_mozc_xml.py -@@ -183,14 +183,20 @@ def main(): - 'description': '%(product_name)s (Japanese Input Method)', - 'language': 'ja', - 'icon': '%(ibus_mozc_icon_path)s', -- 'rank': '80', -+ 'symbol': 'あ', - } - - # DO NOT change the engine name 'mozc-jp'. The names is referenced by - # unix/ibus/mozc_engine.cc. -+ # openSUSE provides four engines like ChromeOS - engines_props = { -- 'name': ['mozc-jp'], -- 'longname': ['%(product_name)s'], -+ 'name': ['mozc-jp', 'mozc-jp-jp', 'mozc-us', 'mozc-dv'], -+ 'longname': ['%(product_name)s', -+ '%(product_name)s - JP layout', -+ '%(product_name)s - US layout', -+ '%(product_name)s - US Dvorak layout'], -+ 'layout': ['default', 'jp', 'us', 'us(dvorak)'], -+ 'rank': ['80', '0', '0', '0'], - } - - # IBus 1.5.11 and greater supports 'icon_prop_key'. -@@ -202,7 +208,6 @@ def main(): - - if CheckIBusVersion(options, '1.5.0'): - engine_common_props['symbol'] = 'あ' -- engines_props['layout'] = ['default'] - else: - engines_props['layout'] = ['jp'] +@@ -224,6 +224,30 @@ def main(): + 'layout_variant': '', + 'layout_option': '', + 'rank': 80, ++ }, ++ { ++ '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: ++++++ jigyosyo.zip ++++++ Binary files /var/tmp/diff_new_pack.xJRn8B/_old and /var/tmp/diff_new_pack.xJRn8B/_new differ ++++++ ken_all.zip ++++++ Binary files /var/tmp/diff_new_pack.xJRn8B/_old and /var/tmp/diff_new_pack.xJRn8B/_new differ ++++++ make_archive.sh ++++++ --- /var/tmp/diff_new_pack.xJRn8B/_old 2021-02-15 23:18:01.771550771 +0100 +++ /var/tmp/diff_new_pack.xJRn8B/_new 2021-02-15 23:18:01.775550777 +0100 @@ -1,9 +1,9 @@ #!/bin/sh -commit=42426e181cd4691eb840290f60890b0f21e7b23e +commit=6ac62d2e888cabb138c8427e6173c04e07bb60e0 # See: mozc/src/data/version/mozc_version_template.bzl # REVISION is always 102 for Linux -version=2.25.4150.102 +version=2.26.4276.102 set -e ++++++ mozc-2.25.4150.102.tar.xz -> mozc-2.26.4276.102.tar.xz ++++++ /work/SRC/openSUSE:Factory/mozc/mozc-2.25.4150.102.tar.xz /work/SRC/openSUSE:Factory/.mozc.new.28504/mozc-2.26.4276.102.tar.xz differ: char 26, line 1
