From 196453bfe438e95d4554a395653f65fd213c6cff Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Mon, 16 May 2016 17:43:22 +0000 Subject: Update japanese/mozc-server to 2.17.2322.102. Changes include: - Use Github as the source. - Depend on devel/py-gyp and japanese/zinnia because bundled versions have been removed from the original distfile. - devel/py-gyp-devel has been updated to snapshot as of 20160504 and renamed with devel/py-gyp. Take maintainership[*]. - Install mozc.el.gz instead of mozc.el. Approved by: maintainer [*] --- ...ra-patch-src-unix-fcitx-mozc_response_parser.cc | 50 ---------------------- 1 file changed, 50 deletions(-) delete mode 100644 japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_response_parser.cc (limited to 'japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_response_parser.cc') diff --git a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_response_parser.cc b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_response_parser.cc deleted file mode 100644 index 77fdebbcb320..000000000000 --- a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_response_parser.cc +++ /dev/null @@ -1,50 +0,0 @@ ---- src/unix/fcitx/mozc_response_parser.cc.orig 2015-07-13 04:56:54.572997000 +0900 -+++ src/unix/fcitx/mozc_response_parser.cc 2015-07-13 04:58:15.160661000 +0900 -@@ -36,7 +36,7 @@ - #include "base/logging.h" - #include "base/process.h" - #include "base/util.h" --#include "session/commands.pb.h" -+#include "protocol/commands.pb.h" - #include "unix/fcitx/fcitx_mozc.h" - #include "unix/fcitx/surrounding_text_util.h" - #include -@@ -235,11 +235,13 @@ - } - } - -+#if 0 - static boolean FcitxMozcPaging(void* arg, boolean prev) - { - FcitxMozc* mozc = static_cast(arg); - return mozc->paging(prev); - } -+#endif - - void MozcResponseParser::ParseCandidates( - const mozc::commands::Candidates &candidates, FcitxMozc *fcitx_mozc) const { -@@ -286,12 +288,14 @@ - FcitxCandidateWordList* candList = FcitxInputStateGetCandidateList(fcitx_mozc->GetInputState()); - FcitxCandidateWordReset(candList); - FcitxCandidateWordSetPageSize(candList, 9); -+#if 0 - if (candidates.has_direction() && - candidates.direction() == commands::Candidates::HORIZONTAL) { - FcitxCandidateWordSetLayoutHint(candList, CLH_Horizontal); - } else { - FcitxCandidateWordSetLayoutHint(candList, CLH_Vertical); - } -+#endif - - map > usage_map; - if (candidates.has_usages()) { -@@ -395,7 +399,9 @@ - else - FcitxCandidateWordSetChoose(candList, EMPTY_STR_CHOOSE); - FcitxCandidateWordSetFocus(candList, local_index); -+#if 0 - FcitxCandidateWordSetOverridePaging(candList, hasPrev, hasNext, FcitxMozcPaging, fcitx_mozc, NULL); -+#endif - } - - static int GetRawCursorPos(const char * str, int upos) -- cgit v1.2.3