app-i18n/mozc: Fix building with GCC 8.

Closes: https://bugs.gentoo.org/655570

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 (file)
index 0000000..0751404
--- /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 de335e87e8d6afc4cf16cc14848b5fcb1ac8dfd4..7bc5284670a7fd43a98359e6f905b3c551c958b0 100644 (file)
--- 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 e2a00716e051d9306c0b724703aa91155a0ceeed..d8763dd2dfe0ad5b66ed33e52e1e932f603ce5d0 100644 (file)
--- 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"