Pullup ticket #5665 - requested by tsutsui

inputmethod/mozc-server: build fix Revisions pulled up: - inputmethod/mozc-server/distinfo 1.21 - inputmethod/mozc-server/patches/patch-prediction_user__history__predictor.cc 1.1 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: tsutsui Date: Sat Dec 30 14:51:42 UTC 2017 Modified Files: pkgsrc/inputmethod/mozc-server: distinfo Added Files: pkgsrc/inputmethod/mozc-server/patches: patch-prediction_user__history__predictor.cc Log Message: mozc-server: fix a build error on NetBSD/amd64 7.1.1 + pkgsrc-2017Q4. Apply a patch from the upstream pull request TritonDataCenter#424: https://github.com/google/mozc/pull/424/files > Fix reference to std::swap TritonDataCenter#424 To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 pkgsrc/inputmethod/mozc-server/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/inputmethod/mozc-server/patches/patch-prediction_user__history__predictor.cc
wiedi · Jan 1, 2018 · c246308 · c246308
1 parent 05e9f48
commit c246308
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/inputmethod/mozc-server/distinfo b/inputmethod/mozc-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2017/12/17 14:15:43 tsutsui Exp $
+$NetBSD: distinfo,v 1.20.2.1 2018/01/01 18:18:01 spz Exp $
 
 SHA1 (mozc-2.20.2673.102.tar.xz) = 9cedf4d392593e04755fa44afd79cd40bb80b9d1
 RMD160 (mozc-2.20.2673.102.tar.xz) = 723fef550d88c5a4dc33f2ec9c8d7ee694e60d64
@@ -42,6 +42,7 @@ SHA1 (patch-ipc_ipc__path__manager__test.cc) = 1b83b513383f184f5ab5a56cce734b793
 SHA1 (patch-ipc_named__event.cc) = 92283261e7580569587e43156f13567b593c9a32
 SHA1 (patch-ipc_unix__ipc.cc) = 25107c2e84844ecaa3445efb48cc3f2795579dec
 SHA1 (patch-net_net.gyp) = 61353724533f9239f4c58fa37f0a8fb2eb5552c3
+SHA1 (patch-prediction_user__history__predictor.cc) = 14e7a899c1c27108169de6571746d5fe4841630a
 SHA1 (patch-session_session.cc) = 773017ac54e79239f6734a124f457b0b81bb1ced
 SHA1 (patch-session_session__test.cc) = 99165b29555844a40d30cf5554cc5c66773b70ed
 SHA1 (patch-third__party_protobuf_post__process__dist.sh) = 8adc79d5d7eed3cbf406ebcfbd5832b7a050ced6

diff --git a/inputmethod/mozc-server/patches/patch-prediction_user__history__predictor.cc b/inputmethod/mozc-server/patches/patch-prediction_user__history__predictor.cc
@@ -0,0 +1,16 @@
+$NetBSD: patch-prediction_user__history__predictor.cc,v 1.1.2.2 2018/01/01 18:18:01 spz Exp $
+
+- Apply a patch from the upstream pull request #424:
+  https://github.com/google/mozc/pull/424/files
+
+--- prediction/user_history_predictor.cc.orig	2017-11-02 13:32:47.000000000 +0000
++++ prediction/user_history_predictor.cc
+@@ -841,7 +841,7 @@ bool UserHistoryPredictor::RomanFuzzyPre
+       // 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;
+         }