diff options
author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2018-06-01 05:02:06 +0200 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2018-06-13 10:36:21 -0400 |
commit | a917a8214bb56d2486898553788d9764a2b26cdc (patch) | |
tree | 4776ad767252f10d03bdd4b8dbcdc057511c2e90 /app-i18n/mozc | |
parent | net-irc/kvirc: Version bump (5.0_pre20180605072059). (diff) | |
download | gentoo-a917a8214bb56d2486898553788d9764a2b26cdc.tar.gz gentoo-a917a8214bb56d2486898553788d9764a2b26cdc.tar.bz2 gentoo-a917a8214bb56d2486898553788d9764a2b26cdc.zip |
app-i18n/mozc: Fix building with GCC 8.
Closes: https://bugs.gentoo.org/655570
Diffstat (limited to 'app-i18n/mozc')
-rw-r--r-- | app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch | 22 | ||||
-rw-r--r-- | app-i18n/mozc/mozc-2.23.2815.102.ebuild | 1 | ||||
-rw-r--r-- | app-i18n/mozc/mozc-9999.ebuild | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch new file mode 100644 index 000000000000..07514048e7a4 --- /dev/null +++ b/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch @@ -0,0 +1,22 @@ +https://github.com/google/mozc/issues/441 + +--- /src/prediction/zero_query_dict.h ++++ /src/prediction/zero_query_dict.h +@@ -147,6 +147,17 @@ + return iter; + } + ++ 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; diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild index de335e87e8d6..7bc5284670a7 100644 --- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild +++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild @@ -99,6 +99,7 @@ src_unpack() { src_prepare() { eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch" + eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch" eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch" eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch" diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild index e2a00716e051..d8763dd2dfe0 100644 --- a/app-i18n/mozc/mozc-9999.ebuild +++ b/app-i18n/mozc/mozc-9999.ebuild @@ -99,6 +99,7 @@ src_unpack() { src_prepare() { eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch" + eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch" eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch" eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch" |