Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2018-07-27 10:55:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozc (Old) and /work/SRC/openSUSE:Factory/.mozc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozc" Fri Jul 27 10:55:54 2018 rev:30 rq:625309 version:2.18.2612.102 Changes: -------- --- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2018-03-28 10:30:05.239837997 +0200 +++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2018-07-27 10:55:54.853608918 +0200 @@ -1,0 +2,6 @@ +Tue Jul 24 15:23:05 UTC 2018 - [email protected] + +- add gcc-8.1-ZeroQueryDict-iterator.patch + * fix a build error with gcc 8 + +------------------------------------------------------------------- New: ---- gcc-8.1-ZeroQueryDict-iterator.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozc.spec ++++++ --- /var/tmp/diff_new_pack.UcVqIl/_old 2018-07-27 10:55:55.921610962 +0200 +++ /var/tmp/diff_new_pack.UcVqIl/_new 2018-07-27 10:55:55.921610962 +0200 @@ -37,7 +37,7 @@ Version: 2.18.2612.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 Group: System/I18n/Japanese ExcludeArch: ppc ppc64 s390 s390x Url: https://github.com/google/mozc @@ -99,6 +99,9 @@ # PATCH-FIX-UPSTREAM [email protected] # fix python import error Patch8: mozc-gen_zip_code_seed_py.patch +# PATCH-FIX-UPSTREAM [email protected] +# fix build error with gcc 8.1 +Patch9: gcc-8.1-ZeroQueryDict-iterator.patch BuildRequires: ninja >= 1.4 BuildRequires: pkgconfig @@ -201,6 +204,8 @@ %patch8 -p2 +%patch9 -p2 + # fix installation path sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} > ibus-setup-mozc-jp.desktop ++++++ gcc-8.1-ZeroQueryDict-iterator.patch ++++++ diff --git a/src/prediction/zero_query_dict.h b/src/prediction/zero_query_dict.h index c11aa24d..4eece4eb 100644 --- a/src/prediction/zero_query_dict.h +++ b/src/prediction/zero_query_dict.h @@ -132,6 +132,17 @@ class ZeroQueryDict { return tmp; } + iterator &operator--() { + ptr_ -= kTokenByteSize; + return *this; + } + + iterator operator--(int) { + const iterator tmp(ptr_, string_array_); + ptr_ -= kTokenByteSize; + return tmp; + } + iterator &operator+=(ptrdiff_t n) { ptr_ += n * kTokenByteSize; return *this;
