Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2020-09-15 16:28:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mozc (Old)
and /work/SRC/openSUSE:Factory/.mozc.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozc"
Tue Sep 15 16:28:43 2020 rev:35 rq:834322 version:2.23.2815.102
Changes:
--------
--- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2020-06-02
14:38:07.299423244 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new.4249/mozc.changes 2020-09-15
16:28:47.566625660 +0200
@@ -1,0 +2,16 @@
+Thu Sep 10 14:23:44 UTC 2020 - Fuminobu Takeyama <ft...@geeko.jp>
+
+- Build scripts migration to Python 3
+ * Add: build-scripts-migration-to-python3.patch
+ * Add: fix-zip-code-conversion-output.patch
+- Update post code dictionary
+
+-------------------------------------------------------------------
+Sat Sep 5 08:51:02 UTC 2020 - Fuminobu Takeyama <ft...@geeko.jp>
+
+- Use system libprotobuf because Mozc's build script cannot handle
+ newer protobuf source code
+ * Fix build error under RISC V environment
+ * Add: mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
+
+-------------------------------------------------------------------
New:
----
build-scripts-migration-to-python3.patch
fix-zip-code-conversion-output.patch
mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozc.spec ++++++
--- /var/tmp/diff_new_pack.iK3wPH/_old 2020-09-15 16:28:48.586626636 +0200
+++ /var/tmp/diff_new_pack.iK3wPH/_new 2020-09-15 16:28:48.590626640 +0200
@@ -29,7 +29,7 @@
%define ibus_mozc_icon_path %{_datadir}/ibus-mozc/product_icon.png
%define document_dir %{_docdir}/ibus-mozc
%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model
-%define use_libprotobuf 0
+%define use_libprotobuf 1
Name: mozc
Version: 2.23.2815.102
@@ -39,12 +39,7 @@
Group: System/I18n/Japanese
ExcludeArch: ppc ppc64 s390 s390x
URL: https://github.com/google/mozc
-# git clone https://github.com/google/mozc.git
-# cd mozc
-# 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
+# Run ./make_archive.sh to make tar.xz removing third party files
Source0: %{name}-%{version}.tar.xz
Source1: README.SUSE
@@ -106,12 +101,19 @@
Patch11: add-Japanese-new-era-reiwa-to-date_rewriter.patch
# PATCH-FIX-UPSTREAM ft...@geeko.jp
Patch12: add-Japanese-new-era-reiwa-ligature-to-dict.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp -- fix compile error caused by newer
protobuf (from Gentoo)
+# https://github.com/google/mozc/issues/460
+Patch13:
mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp -- Use Python 3 to build Mozc
+Patch14: build-scripts-migration-to-python3.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp -- fix a bug of the Python3 patch
+Patch15: fix-zip-code-conversion-output.patch
BuildRequires: ninja >= 1.4
%if %{use_libprotobuf}
BuildRequires: protobuf-devel
%endif
-BuildRequires: python
+BuildRequires: python3
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
@@ -218,6 +220,15 @@
%patch12 -p1
cd ..
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+
+# Use python as python3
+mkdir %{_builddir}/bin
+ln -s /usr/bin/python3 %{_builddir}/bin/python
+export PATH=%{_builddir}/bin:$PATH
+
# fix installation path
sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} > ibus-setup-mozc-jp.desktop
@@ -230,7 +241,7 @@
%build
%define target Release
-
+export PATH=%{_builddir}/bin:$PATH
export QTDIR=%{_libdir}/qt5
# -Wall from RPM_OPT_FLAGS overrides -Wno-* options from gyp.
++++++ build-scripts-migration-to-python3.patch ++++++
++++ 3693 lines (skipped)
++++++ fix-zip-code-conversion-output.patch ++++++
--- mozc-2.23.2815.102/src/dictionary/gen_zip_code_seed.py.org 2020-09-08
14:34:18.613390927 +0000
+++ mozc-2.23.2815.102/src/dictionary/gen_zip_code_seed.py 2020-09-08
14:40:55.050072520 +0000
@@ -83,7 +83,7 @@
address = unicodedata.normalize('NFKC', self.address)
line = '\t'.join([zip_code, '0', '0', str(ZIP_CODE_COST),
address, ZIP_CODE_LABEL])
- print(line.encode('utf-8'))
+ print(line)
def ProcessZipCodeCSV(file_name):
++++++ jigyosyo.zip ++++++
Binary files /var/tmp/diff_new_pack.iK3wPH/_old and
/var/tmp/diff_new_pack.iK3wPH/_new differ
++++++ ken_all.zip ++++++
Binary files /var/tmp/diff_new_pack.iK3wPH/_old and
/var/tmp/diff_new_pack.iK3wPH/_new differ
++++++ mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch ++++++
++++ 1039 lines (skipped)
