diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2017-10-19 20:24:54 +0200 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2017-10-23 13:24:34 -0400 |
| commit | ce97c27422e17263f2e31dbda11b4dc963e2a14a (patch) | |
| tree | b21401630afd81317ec5c684e6f4dc3d7c450491 /app-i18n | |
| parent | app-backup/flexbackup: amd64 stable, bug 635042 (diff) | |
| download | gentoo-ce97c27422e17263f2e31dbda11b4dc963e2a14a.tar.gz gentoo-ce97c27422e17263f2e31dbda11b4dc963e2a14a.tar.bz2 gentoo-ce97c27422e17263f2e31dbda11b4dc963e2a14a.zip | |
app-i18n/mozc: Fix building with GCC <6 (bug #634014).
Bug: https://bugs.gentoo.org/634014
Diffstat (limited to 'app-i18n')
| -rw-r--r-- | app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch | 11 | ||||
| -rw-r--r-- | app-i18n/mozc/mozc-2.20.2673.102.ebuild | 1 | ||||
| -rw-r--r-- | app-i18n/mozc/mozc-9999.ebuild | 1 |
3 files changed, 13 insertions, 0 deletions
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 index 000000000000..b8b2bf1808ec --- /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 eb93090b7361..ee84afb7d91f 100644 --- 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 c56eb0e73da6..35e9ab69f408 100644 --- 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" |