app-i18n/mozc: Fix building with GCC <6 (bug #634014).

Bug: https://bugs.gentoo.org/634014

diff --git a/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch b/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch
new file mode 100644 (file)
index 0000000..b8b2bf1
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch
@@ -0,0 +1,11 @@
+--- /src/prediction/user_history_predictor.cc
++++ /src/prediction/user_history_predictor.cc
+@@ -841,7 +841,7 @@
+       // swap.
+       if (i + 1 < prefix.size()) {
+         string swapped_prefix = prefix;
+-        swap(swapped_prefix[i], swapped_prefix[i + 1]);
++        std::swap(swapped_prefix[i], swapped_prefix[i + 1]);
+         if (Util::StartsWith(str, swapped_prefix)) {
+           return true;
+         }

diff --git a/app-i18n/mozc/mozc-2.20.2673.102.ebuild b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
index eb93090b73615dce86701ba9fc18b0da6967250f..ee84afb7d91fb63377908ad3a4c782a47b5aa981 100644 (file)
--- a/app-i18n/mozc/mozc-2.20.2673.102.ebuild
+++ b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
@@ -94,6 +94,7 @@ src_unpack() {
 
 src_prepare() {
        eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-system_libraries.patch"
+       eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-gcc-5.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 c56eb0e73da696e1a721cb146b8751198f0c1b4f..35e9ab69f408965a4b50452fd0d13ff9698e7038 100644 (file)
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -94,6 +94,7 @@ src_unpack() {
 
 src_prepare() {
        eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-system_libraries.patch"
+       eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-gcc-5.patch"
        eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
        eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"