Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2020-02-04 19:52:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozc (Old) and /work/SRC/openSUSE:Factory/.mozc.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozc" Tue Feb 4 19:52:01 2020 rev:32 rq:769414 version:2.23.2815.102 Changes: -------- --- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2019-04-23 14:36:20.649484421 +0200 +++ /work/SRC/openSUSE:Factory/.mozc.new.26092/mozc.changes 2020-02-04 19:52:24.217288367 +0100 @@ -1,0 +2,20 @@ +Sun Feb 2 03:01:07 UTC 2020 - Fuminobu Takeyama <ft...@geeko.jp> + +- Upstream update to 2.23.2815 + * Do not use mozc_renderer on Wayland session + * Support GYP_DEFINES='enable_gtk_renderer=0' + * Migrate from IBusConfig to GSetting in ibus_mozc + * Update dictionary + * Code refactoring +- Update zip code dictionary to Jan. 2020 +- Update gyp + * to the version ready for Python 3 +- Update protobuf to 3.5.2 +- Update Fcitx Mozc + * Remove: fcitx-mozc-2.18.2612.102.1.patch + * Add: fcitx-mozc-2.23.2815.102.1.patch +- Refresh patches + * add-Japanese-new-era-reiwa-to-date_rewriter.patch + * add-Japanese-new-era-reiwa-to-dict.patch + +------------------------------------------------------------------- Old: ---- fcitx-mozc-2.18.2612.102.1.patch gyp-940a15e.tar.xz mozc-2.18.2612.102.tar.xz protobuf.tar.xz New: ---- fcitx-mozc-2.23.2815.102.1.patch gyp-e87d37d.tar.xz mozc-2.23.2815.102.tar.xz protobuf-v3.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozc.spec ++++++ --- /var/tmp/diff_new_pack.nXmxjK/_old 2020-02-04 19:52:26.321289594 +0100 +++ /var/tmp/diff_new_pack.nXmxjK/_new 2020-02-04 19:52:26.325289596 +0100 @@ -1,7 +1,7 @@ # # spec file for package mozc # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -34,16 +34,16 @@ %define use_libprotobuf 0 Name: mozc -Version: 2.18.2612.102 +Version: 2.23.2815.102 Release: 0 Summary: Mozc - Japanese Input Method for Chromium OS, Mac and Linux License: BSD-3-Clause AND SUSE-Public-Domain Group: System/I18n/Japanese ExcludeArch: ppc ppc64 s390 s390x -Url: https://github.com/google/mozc +URL: https://github.com/google/mozc # git clone https://github.com/google/mozc.git # cd mozc -# git archive --prefix=mozc-$version/ 05464ea | tar xC ../ +# git archive --prefix=mozc-$version/ afb03ddf | tar xC ../ # rm mozc-$version/src/third_party/* # rm mozc-$version/docker # tar cvJf mozc-$version.tar.xz mozc-$version @@ -53,7 +53,7 @@ # gyp is not included from 1.11.1522.102 # License: BSD-3-Clause # git clone https://chromium.googlesource.com/external/gyp -Source3: gyp-940a15e.tar.xz +Source3: gyp-e87d37d.tar.xz # Source4: ibus-setup-mozc-jp.desktop.in # @@ -64,12 +64,10 @@ # protobuf # License: BSD-3-Clause # -# Use static protobuf lib because of the binary incopatibility problem -# between GCC5 and LLVM -# -# git clone https://github.com/google/protobuf/ -# git archive --prefix protobuf/ v3.1.0 | xz > ../protobuf.tar.xz -Source6: protobuf.tar.xz +# Use static protobuf, which is recommended when protobuf is used from a C++ application +# Using protobuf >= 3.6 requires to update Mozc source +# https://github.com/protocolbuffers/protobuf/archive/v3.5.2.tar.gz +Source6: protobuf-v3.5.2.tar.gz # # jigyosyo.zip and ken_all.zip are zip-code--address data provided by # Japan Post Co., Ltd. @@ -80,7 +78,7 @@ %if %{with_fcitx} # add fcitx as mozc module # License: BSD-3-Clause -Patch: fcitx-mozc-2.18.2612.102.1.patch +Patch: fcitx-mozc-2.23.2815.102.1.patch Source21: fcitx-mozc-icons.tar.gz %endif @@ -110,7 +108,6 @@ Patch12: add-Japanese-new-era-reiwa-ligature-to-dict.patch BuildRequires: ninja >= 1.4 -BuildRequires: pkgconfig %if %{use_libprotobuf} BuildRequires: protobuf-devel %endif @@ -184,59 +181,65 @@ # extract fcitx-mozc %if %{with_fcitx} -%patch -p2 +%patch -p1 %endif -%patch1 -p2 -%patch2 -p2 +%patch1 -p1 +%patch2 -p1 cp %{SOURCE1} . # install third_party files -pushd third_party +cd src/third_party # gyp tar xvf %{SOURCE3} # japanese_usage_dictionary tar xvf %{SOURCE5} # protobuf %if ! %{use_libprotobuf} -tar xvf %{SOURCE6} +tar xvf %{SOURCE6} -C protobuf --strip-components 1 %endif -popd +cd ../.. +cd src %patch6 -p1 - %patch7 -p1 +cd .. -%patch8 -p2 +%patch8 -p1 -%patch9 -p2 +%patch9 -p1 # patches to support new Japanese era, Reiwa %patch10 -p1 %patch11 -p1 +cd src %patch12 -p1 +cd .. # fix installation path sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} > ibus-setup-mozc-jp.desktop # prepare zip code dictionary -pushd data/dictionary_oss +cd src/data/dictionary_oss unzip %{SOURCE10} unzip %{SOURCE11} python ../../dictionary/gen_zip_code_seed.py --zip_code=KEN_ALL.CSV --jigyosyo=JIGYOSYO.CSV >> dictionary09.txt -popd +cd ../.. %build %define target Release + export QTDIR=%{_libdir}/qt5 # -Wall from RPM_OPT_FLAGS overrides -Wno-* options from gyp. # gyp inserts -Wall to the head of release_extra_flags. flags=${RPM_OPT_FLAGS/-Wall/} -export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path} ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=%{use_libprotobuf} use_libzinnia=1 document_dir=%{document_dir} zinnia_model_file=%{zinnia_model_path} release_extra_cflags="'$flags'"' +# disable Fcitx5 for now +export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path} ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=%{use_libprotobuf} use_libzinnia=1 document_dir=%{document_dir} zinnia_model_file=%{zinnia_model_path} release_extra_cflags="'$flags'" use_fcitx5=0' +cd src python build_mozc.py gyp --server_dir=%{_libdir}/mozc python build_mozc.py build -c %{target} \ unix/ibus/ibus.gyp:ibus_mozc \ @@ -248,7 +251,7 @@ gui/gui.gyp:mozc_tool \ renderer/renderer.gyp:mozc_renderer -%define output_dir out_linux/%{target} +%define output_dir src/out_linux/%{target} %install @@ -257,16 +260,16 @@ install -m755 -d %{buildroot}%{_datadir}/ibus/component install -m644 %{output_dir}/gen/unix/ibus/mozc.xml %{buildroot}%{_datadir}/ibus/component/mozc.xml install -m755 -d %{buildroot}%{_datadir}/ibus-mozc -install -m644 data/images/unix/ime_product_icon_opensource-32.png %{buildroot}%{_datadir}/ibus-mozc/product_icon.png -install -m644 data/images/unix/ui-tool.png %{buildroot}%{_datadir}/ibus-mozc/tool.png -install -m644 data/images/unix/ui-properties.png %{buildroot}%{_datadir}/ibus-mozc/properties.png -install -m644 data/images/unix/ui-dictionary.png %{buildroot}%{_datadir}/ibus-mozc/dictionary.png -install -m644 data/images/unix/ui-direct.png %{buildroot}%{_datadir}/ibus-mozc/direct.png -install -m644 data/images/unix/ui-hiragana.png %{buildroot}%{_datadir}/ibus-mozc/hiragana.png -install -m644 data/images/unix/ui-katakana_half.png %{buildroot}%{_datadir}/ibus-mozc/katakana_half.png -install -m644 data/images/unix/ui-katakana_full.png %{buildroot}%{_datadir}/ibus-mozc/katakana_full.png -install -m644 data/images/unix/ui-alpha_half.png %{buildroot}%{_datadir}/ibus-mozc/alpha_half.png -install -m644 data/images/unix/ui-alpha_full.png %{buildroot}%{_datadir}/ibus-mozc/alpha_full.png +install -m644 src/data/images/unix/ime_product_icon_opensource-32.png %{buildroot}%{_datadir}/ibus-mozc/product_icon.png +install -m644 src/data/images/unix/ui-tool.png %{buildroot}%{_datadir}/ibus-mozc/tool.png +install -m644 src/data/images/unix/ui-properties.png %{buildroot}%{_datadir}/ibus-mozc/properties.png +install -m644 src/data/images/unix/ui-dictionary.png %{buildroot}%{_datadir}/ibus-mozc/dictionary.png +install -m644 src/data/images/unix/ui-direct.png %{buildroot}%{_datadir}/ibus-mozc/direct.png +install -m644 src/data/images/unix/ui-hiragana.png %{buildroot}%{_datadir}/ibus-mozc/hiragana.png +install -m644 src/data/images/unix/ui-katakana_half.png %{buildroot}%{_datadir}/ibus-mozc/katakana_half.png +install -m644 src/data/images/unix/ui-katakana_full.png %{buildroot}%{_datadir}/ibus-mozc/katakana_full.png +install -m644 src/data/images/unix/ui-alpha_half.png %{buildroot}%{_datadir}/ibus-mozc/alpha_half.png +install -m644 src/data/images/unix/ui-alpha_full.png %{buildroot}%{_datadir}/ibus-mozc/alpha_full.png install -m755 -d %{buildroot}%{_datadir}/applications install -m644 ibus-setup-mozc-jp.desktop %{buildroot}%{_datadir}/applications/ibus-setup-mozc-jp.desktop @@ -282,7 +285,7 @@ %if %{with_fcitx} # Install Fcitx module -for mofile in out_linux/Release/gen/unix/fcitx/po/*.mo +for mofile in %{output_dir}/gen/unix/fcitx/po/*.mo do filename=`basename $mofile` lang=${filename/.mo/} @@ -293,18 +296,18 @@ install -m755 -d %{buildroot}%{fcitx_icon_dir} install -m755 -d %{buildroot}%{fcitx_lib_dir} install -m 755 %{output_dir}/fcitx-mozc.so %{buildroot}%{fcitx_lib_dir} -install -m 644 unix/fcitx/fcitx-mozc.conf %{buildroot}%{fcitx_addon_dir} -install -m 644 unix/fcitx/mozc.conf %{buildroot}%{fcitx_inputmethod_dir} -install -m 644 data/images/product_icon_32bpp-128.png %{buildroot}%{fcitx_icon_dir}/mozc.png -install -m 644 data/images/unix/ui-alpha_full.png %{buildroot}%{fcitx_icon_dir}/mozc-alpha_full.png -install -m 644 data/images/unix/ui-alpha_half.png %{buildroot}%{fcitx_icon_dir}/mozc-alpha_half.png -install -m 644 data/images/unix/ui-direct.png %{buildroot}%{fcitx_icon_dir}/mozc-direct.png -install -m 644 data/images/unix/ui-hiragana.png %{buildroot}%{fcitx_icon_dir}/mozc-hiragana.png -install -m 644 data/images/unix/ui-katakana_full.png %{buildroot}%{fcitx_icon_dir}/mozc-katakana_full.png -install -m 644 data/images/unix/ui-katakana_half.png %{buildroot}%{fcitx_icon_dir}/mozc-katakana_half.png -install -m 644 data/images/unix/ui-dictionary.png %{buildroot}%{fcitx_icon_dir}/mozc-dictionary.png -install -m 644 data/images/unix/ui-properties.png %{buildroot}%{fcitx_icon_dir}/mozc-properties.png -install -m 644 data/images/unix/ui-tool.png %{buildroot}%{fcitx_icon_dir}/mozc-tool.png +install -m 644 src/unix/fcitx/fcitx-mozc.conf %{buildroot}%{fcitx_addon_dir} +install -m 644 src/unix/fcitx/mozc.conf %{buildroot}%{fcitx_inputmethod_dir} +install -m 644 src/data/images/product_icon_32bpp-128.png %{buildroot}%{fcitx_icon_dir}/mozc.png +install -m 644 src/data/images/unix/ui-alpha_full.png %{buildroot}%{fcitx_icon_dir}/mozc-alpha_full.png +install -m 644 src/data/images/unix/ui-alpha_half.png %{buildroot}%{fcitx_icon_dir}/mozc-alpha_half.png +install -m 644 src/data/images/unix/ui-direct.png %{buildroot}%{fcitx_icon_dir}/mozc-direct.png +install -m 644 src/data/images/unix/ui-hiragana.png %{buildroot}%{fcitx_icon_dir}/mozc-hiragana.png +install -m 644 src/data/images/unix/ui-katakana_full.png %{buildroot}%{fcitx_icon_dir}/mozc-katakana_full.png +install -m 644 src/data/images/unix/ui-katakana_half.png %{buildroot}%{fcitx_icon_dir}/mozc-katakana_half.png +install -m 644 src/data/images/unix/ui-dictionary.png %{buildroot}%{fcitx_icon_dir}/mozc-dictionary.png +install -m 644 src/data/images/unix/ui-properties.png %{buildroot}%{fcitx_icon_dir}/mozc-properties.png +install -m 644 src/data/images/unix/ui-tool.png %{buildroot}%{fcitx_icon_dir}/mozc-tool.png # fix mozc icons. they're too ugly that even lose face for openSUSE. cp -r %{SOURCE21} ./ @@ -324,9 +327,9 @@ install -m755 %{output_dir}/mozc_emacs_helper %{buildroot}%{_bindir} # install only for emacs since xemacs is not supported install -m755 -d %{buildroot}%{_datadir}/emacs/site-lisp -install -m644 unix/emacs/mozc.el %{buildroot}%{_datadir}/emacs/site-lisp/ +install -m644 src/unix/emacs/mozc.el %{buildroot}%{_datadir}/emacs/site-lisp/ -chmod 644 data/installer/credits_*.html +chmod 644 src/data/installer/credits_*.html %if %{with_fcitx} %find_lang fcitx-mozc %no_lang_C @@ -334,8 +337,7 @@ %files %defattr(-, root, root) -%doc data/installer/credits_en.html -%doc data/installer/credits_ja.html +%doc src/data/installer/credits_en.html %doc README.SUSE %dir %{_libdir}/mozc %{_libdir}/mozc/mozc_server ++++++ add-Japanese-new-era-reiwa-to-date_rewriter.patch ++++++ --- /var/tmp/diff_new_pack.nXmxjK/_old 2020-02-04 19:52:26.417289650 +0100 +++ /var/tmp/diff_new_pack.nXmxjK/_new 2020-02-04 19:52:26.417289650 +0100 @@ -1,14 +1,15 @@ ---- mozc-2.18.2612.102/rewriter/date_rewriter.cc.org 2019-04-09 00:24:39.974142422 +0900 -+++ mozc-2.18.2612.102/rewriter/date_rewriter.cc 2019-04-09 00:36:30.557247652 +0900 -@@ -1501,6 +1501,11 @@ +diff --git a/src/rewriter/date_rewriter.cc b/src/rewriter/date_rewriter.cc +index d3bc7f0..375639f 100644 +--- a/src/rewriter/date_rewriter.cc ++++ b/src/rewriter/date_rewriter.cc +@@ -1239,6 +1239,10 @@ const YearData kEraData[] = { 1989, - "\xE5\xB9\xB3\xE6\x88\x90", - "\xE3\x81\xB8\xE3\x81\x84\xE3\x81\x9B\xE3\x81\x84", + "平成", + "へいせい", + }, { -+ // "令和" "れいわ" + 2019, -+ "\xE4\xBB\xA4\xE5\x92\x8C", -+ "\xE3\x82\x8C\xE3\x81\x84\xE3\x82\x8F", ++ "令和", ++ "れいわ", } }; ++++++ add-Japanese-new-era-reiwa-to-dict.patch ++++++ --- /var/tmp/diff_new_pack.nXmxjK/_old 2020-02-04 19:52:26.433289659 +0100 +++ /var/tmp/diff_new_pack.nXmxjK/_new 2020-02-04 19:52:26.437289661 +0100 @@ -1,11 +1,14 @@ ---- mozc-2.18.2612.102/data/dictionary_oss/dictionary08.txt.org 2019-04-09 00:18:08.744509535 +0900 -+++ mozc-2.18.2612.102/data/dictionary_oss/dictionary08.txt 2019-04-09 00:21:16.293257093 +0900 -@@ -16221,6 +16221,8 @@ - れいれいと 12 12 7483 れいれいと - れいろう 1827 1827 7266 玲瓏 - れいわ 1827 1827 8158 例話 -+れいわ 1895 1895 1690 令和 -+れいわ 1898 1898 4000 令和 - れいんこーと 1827 1827 5714 レインコート - れいんじゃー 1827 1827 7313 レインジャー - れいんず 1896 1896 3593 レインズ +diff --git a/src/data/dictionary_oss/dictionary08.txt b/src/data/dictionary_oss/dictionary08.txt +index a685ca8..e997809 100644 +--- a/src/data/dictionary_oss/dictionary08.txt ++++ b/src/data/dictionary_oss/dictionary08.txt +@@ -8591,6 +8591,9 @@ + れいれいと 12 12 7349 れいれいと + れいろう 1847 1847 7276 玲瓏 + れいわ 1847 1847 8251 例話 ++れいわ 1916 1916 1598 令和 ++れいわ 1919 1919 4017 令和 ++れいわ 1920 1920 6206 令和 + れいんこーと 1847 1847 5568 レインコート + れいんじゃー 1847 1847 7459 レインジャー + れいんず 1917 1917 3548 レインズ ++++++ fcitx-mozc-2.18.2612.102.1.patch -> fcitx-mozc-2.23.2815.102.1.patch ++++++ ++++ 4876 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mozc/fcitx-mozc-2.18.2612.102.1.patch ++++ and /work/SRC/openSUSE:Factory/.mozc.new.26092/fcitx-mozc-2.23.2815.102.1.patch ++++++ gyp-940a15e.tar.xz -> gyp-e87d37d.tar.xz ++++++ ++++ 9595 lines of diff (skipped) ++++++ jigyosyo.zip ++++++ Binary files /var/tmp/diff_new_pack.nXmxjK/_old and /var/tmp/diff_new_pack.nXmxjK/_new differ ++++++ ken_all.zip ++++++ Binary files /var/tmp/diff_new_pack.nXmxjK/_old and /var/tmp/diff_new_pack.nXmxjK/_new differ ++++++ mozc-2.18.2612.102.tar.xz -> mozc-2.23.2815.102.tar.xz ++++++ /work/SRC/openSUSE:Factory/mozc/mozc-2.18.2612.102.tar.xz /work/SRC/openSUSE:Factory/.mozc.new.26092/mozc-2.23.2815.102.tar.xz differ: char 17, line 1
