Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2020-11-17 21:21:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mozc (Old)
and /work/SRC/openSUSE:Factory/.mozc.new.24930 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozc"
Tue Nov 17 21:21:51 2020 rev:36 rq:846464 version:2.25.4150.102
Changes:
--------
--- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2020-09-15
16:28:47.566625660 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new.24930/mozc.changes 2020-11-17
21:22:05.809159416 +0100
@@ -1,0 +2,26 @@
+Thu Nov 5 14:14:36 UTC 2020 - Fuminobu Takeyama <ft...@geeko.jp>
+
+- Upstream update to 2.25.4150
+ * Remove hand writing feature by using Zinnia
+ * Update dictionaries
+ * Python 3 Support
+ * No changelog is available
+- Add abseil-cpp
+- Remove mozc-gen_zip_code_seed_py.patch
+ * Fix spec file so that the tool works without this patch
+- Remove patches merged by upstream
+ * gcc-8.1-ZeroQueryDict-iterator.patch
+ * add-Japanese-new-era-reiwa-to-dict.patch
+ * add-Japanese-new-era-reiwa-to-date_rewriter.patch
+ * add-Japanese-new-era-reiwa-ligature-to-dict.patch
+ * mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
+ * build-scripts-migration-to-python3.patch
+ * fix-zip-code-conversion-output.patch
+- Add build-with-libstdc++.patch
+ * Force to use libstdc++ instead of libc++
+- Add fcitx-fix-for-a1dcadab.patch
+ * Fix fcitx-mozc patch for the latest mozc
+- Refresh mozc-ninja-verbose-build.patch
+- Update make_archive.sh
+
+-------------------------------------------------------------------
Old:
----
add-Japanese-new-era-reiwa-ligature-to-dict.patch
add-Japanese-new-era-reiwa-to-date_rewriter.patch
add-Japanese-new-era-reiwa-to-dict.patch
build-scripts-migration-to-python3.patch
fix-zip-code-conversion-output.patch
gcc-8.1-ZeroQueryDict-iterator.patch
mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
mozc-2.23.2815.102.tar.xz
mozc-gen_zip_code_seed_py.patch
New:
----
abseil-cpp-lts_2020_02_25.zip
build-with-libstdc++.patch
fcitx-fix-for-a1dcadab.patch
mozc-2.25.4150.102.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozc.spec ++++++
--- /var/tmp/diff_new_pack.56orkg/_old 2020-11-17 21:22:06.857160998 +0100
+++ /var/tmp/diff_new_pack.56orkg/_new 2020-11-17 21:22:06.857160998 +0100
@@ -28,14 +28,13 @@
%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 zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model
%define use_libprotobuf 1
Name: mozc
-Version: 2.23.2815.102
+Version: 2.25.4150.102
Release: 0
Summary: Mozc - Japanese Input Method for Chromium OS, Mac and Linux
-License: BSD-3-Clause AND SUSE-Public-Domain
+License: BSD-3-Clause AND SUSE-Public-Domain AND Apache-2.0
Group: System/I18n/Japanese
ExcludeArch: ppc ppc64 s390 s390x
URL: https://github.com/google/mozc
@@ -61,6 +60,10 @@
# 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
+# 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
#
# jigyosyo.zip and ken_all.zip are zip-code--address data provided by
# Japan Post Co., Ltd.
@@ -72,6 +75,8 @@
# add fcitx as mozc module
# License: BSD-3-Clause
Patch: fcitx-mozc-2.23.2815.102.1.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp -- update fcitx-mozc for newer mozc
+Patch22: fcitx-fix-for-a1dcadab.patch
Source21: fcitx-mozc-icons.tar.gz
%endif
# A script for making a source tar.xz archive
@@ -88,26 +93,8 @@
# PATCH-FIX-OPENSUSE mozc-build-gcc.patch bsc#990844 qz...@suse.com -- Portng
mozc-build-gcc.patch to force mozc build with gcc.
Patch7: mozc-build-gcc.patch
-
-# PATCH-FIX-UPSTREAM i...@marguerite.su
-# fix python import error
-Patch8: mozc-gen_zip_code_seed_py.patch
-# PATCH-FIX-UPSTREAM ft...@geeko.jp
-# fix build error with gcc 8.1
-Patch9: gcc-8.1-ZeroQueryDict-iterator.patch
-# PATCH-FIX-UPSTREAM ft...@geeko.jp
-Patch10: add-Japanese-new-era-reiwa-to-dict.patch
-# PATCH-FIX-UPSTREAM ft...@geeko.jp
-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
+# PATCH-FIX-OPENSUSE build-with-libstdc++.patch ft...@geeko.jp -- force to use
libstdc++ instead of libc++
+Patch8: build-with-libstdc++.patch
BuildRequires: ninja >= 1.4
%if %{use_libprotobuf}
@@ -166,17 +153,14 @@
%package gui-tools
Summary: GUI tools for mozc
Group: System/I18n/Japanese
-BuildRequires: zinnia-devel
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets)
Requires: mozc = %{version}
-Requires: zinnia
-Requires: zinnia-tomoe
%description gui-tools
This package provides config, word-register, dictioaly,
-character-palette, handwriting tools.
+character-palette tools.
%prep
%setup -q
@@ -184,6 +168,7 @@
# extract fcitx-mozc
%if %{with_fcitx}
%patch -p1
+%patch22 -p1
%endif
%patch1 -p1
@@ -202,6 +187,9 @@
mkdir protobuf
tar xvf %{SOURCE6} -C protobuf --strip-components 1
%endif
+# abseil
+unzip %{SOURCE7}
+mv abseil-cpp-lts_2020_02_25 abseil-cpp
cd ../..
cd src
@@ -211,33 +199,18 @@
%patch8 -p1
-%patch9 -p1
-
-# patches to support new Japanese era, Reiwa
-%patch10 -p1
-%patch11 -p1
-cd src
-%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
# prepare zip code dictionary
+unzip -d src/data/dictionary_oss %{SOURCE10}
+unzip -d src/data/dictionary_oss %{SOURCE11}
+
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
-cd ../..
+PYTHONPATH="${PYTHONPATH}:../../" \
+ python3 ../../dictionary/gen_zip_code_seed.py \
+ --zip_code=KEN_ALL.CSV --jigyosyo=JIGYOSYO.CSV >> dictionary09.txt
+cd ../../../
%build
%define target Release
@@ -249,11 +222,11 @@
flags=${RPM_OPT_FLAGS/-Wall/}
# 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'
+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
-python build_mozc.py gyp --server_dir=%{_libdir}/mozc
-python build_mozc.py build -c %{target} \
+python3 build_mozc.py gyp --server_dir=%{_libdir}/mozc
+python3 build_mozc.py build -c %{target} \
unix/ibus/ibus.gyp:ibus_mozc \
%if %{with_fcitx}
unix/fcitx/fcitx.gyp:fcitx-mozc \
++++++ build-with-libstdc++.patch ++++++
diff --git a/src/gyp/common.gypi b/src/gyp/common.gypi
index 4e78489..9a159d8 100644
--- a/src/gyp/common.gypi
+++ b/src/gyp/common.gypi
@@ -105,7 +105,6 @@
],
# Libraries for GNU/Linux environment.
'linux_ldflags': [
- '-lc++',
'-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++',
],
}],
],
++++++ fcitx-fix-for-a1dcadab.patch ++++++
diff --git a/src/unix/fcitx/eim.cc b/src/unix/fcitx/eim.cc
index ce3e205..10e21e1 100644
--- a/src/unix/fcitx/eim.cc
+++ b/src/unix/fcitx/eim.cc
@@ -94,7 +94,7 @@ static void* FcitxMozcCreate(FcitxInstance* instance)
char argv0[] = "fcitx_mozc";
char *_argv[] = { argv0 };
char **argv = _argv;
- mozc::InitMozc(argv[0], &argc, &argv, true);
+ mozc::InitMozc(argv[0], &argc, &argv);
mozcState->mozc = new mozc::fcitx::FcitxMozc(
instance,
mozc::fcitx::MozcConnection::CreateMozcConnection(),
diff --git a/src/unix/fcitx/surrounding_text_util.cc
b/src/unix/fcitx/surrounding_text_util.cc
index d6ccc34..9911e5f 100644
--- a/src/unix/fcitx/surrounding_text_util.cc
+++ b/src/unix/fcitx/surrounding_text_util.cc
@@ -229,12 +229,11 @@ bool GetSurroundingText(FcitxInstance* instance,
const size_t selection_start = std::min(cursor_pos, anchor_pos);
const size_t selection_length = std::abs(info->relative_selected_length);
- Util::SubStringPiece(surrounding_text, 0, selection_start)
- .CopyToString(&info->preceding_text);
- Util::SubStringPiece(surrounding_text, selection_start, selection_length)
- .CopyToString(&info->selection_text);
- Util::SubStringPiece(surrounding_text, selection_start + selection_length)
- .CopyToString(&info->following_text);
+ const auto &selection_start_it = surrounding_text.begin() +
selection_start;
+ const auto &selection_end_it = selection_start_it + selection_length;
+ info->preceding_text.assign(surrounding_text.begin(), selection_start_it);
+ info->selection_text.assign(selection_start_it, selection_end_it);
+ info->following_text.assign(selection_end_it, surrounding_text.end());
return true;
}
++++++ make_archive.sh ++++++
--- /var/tmp/diff_new_pack.56orkg/_old 2020-11-17 21:22:06.957161149 +0100
+++ /var/tmp/diff_new_pack.56orkg/_new 2020-11-17 21:22:06.957161149 +0100
@@ -1,14 +1,21 @@
#!/bin/sh
-version=2.23.2815.102
-commit=afb03ddf
+commit=42426e181cd4691eb840290f60890b0f21e7b23e
+# See: mozc/src/data/version/mozc_version_template.bzl
+# REVISION is always 102 for Linux
+version=2.25.4150.102
set -e
-# git clone --depth=1 https://github.com/google/mozc.git
+if [ ! -e mozc ]; then
+ git clone --depth=1 https://github.com/google/mozc.git
+fi
+
cd mozc
+git checkout $commit
+
git archive --prefix=mozc-$version/ $commit | tar xC ../
cd ..
rm -r mozc-$version/src/third_party/*
rm -r mozc-$version/docker
-tar --owner=0 --group=0 -cvJf mozc-$version.tar.xz mozc-$version
\ No newline at end of file
+tar --owner=0 --group=0 -cvJf mozc-$version.tar.xz mozc-$version
++++++ mozc-2.23.2815.102.tar.xz -> mozc-2.25.4150.102.tar.xz ++++++
/work/SRC/openSUSE:Factory/mozc/mozc-2.23.2815.102.tar.xz
/work/SRC/openSUSE:Factory/.mozc.new.24930/mozc-2.25.4150.102.tar.xz differ:
char 26, line 1
++++++ mozc-ninja-verbose-build.patch ++++++
--- /var/tmp/diff_new_pack.56orkg/_old 2020-11-17 21:22:06.989161197 +0100
+++ /var/tmp/diff_new_pack.56orkg/_new 2020-11-17 21:22:06.989161197 +0100
@@ -1,13 +1,13 @@
-Index: b/src/build_mozc.py
-===================================================================
+diff --git a/src/build_mozc.py b/src/build_mozc.py
+index 873b6ff..e8d8e88 100644
--- a/src/build_mozc.py
+++ b/src/build_mozc.py
-@@ -846,7 +846,7 @@ def BuildWithNinja(options, targets):
- ninja = GetNinjaPath()
+@@ -579,7 +579,7 @@ def BuildWithNinja(options, targets):
- ninja_targets = [GetNinjaTargetName(target) for target in targets]
-- RunOrDie([ninja, '-C', build_arg] + ninja_targets)
-+ RunOrDie([ninja, '-C', build_arg, '-v'] + ninja_targets)
+ for target in targets:
+ (_, target_name) = target.split(':')
+- RunOrDie([ninja, '-C', build_arg, target_name])
++ RunOrDie([ninja, '-C', build_arg, '-v', target_name])
def BuildOnWindows(targets):
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
