From b706405e3a6b34bb044ea52afedd86ccfcc7a06f Mon Sep 17 00:00:00 2001 From: Daichi GOTO Date: Sat, 7 Jan 2012 04:49:16 +0000 Subject: [PATCH] added support for ibus-1.4.0 Requested by: Buganini --- japanese/ibus-mozc/Makefile | 2 +- japanese/mozc-server/Makefile | 4 +++- .../mozc-server/files/patch-unix_ibus_mozc_engine.cc | 11 +++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc diff --git a/japanese/ibus-mozc/Makefile b/japanese/ibus-mozc/Makefile index f9e4e57bc50f..6aac6d41355c 100644 --- a/japanese/ibus-mozc/Makefile +++ b/japanese/ibus-mozc/Makefile @@ -7,7 +7,7 @@ PKGNAMEPREFIX= ja-ibus- PKGNAMESUFFIX= -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Mozc engine for IBus DATADIR= ${PREFIX}/share/ibus-${PORTNAME} diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index ae11ac9d4c91..e5416aef43ff 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= mozc PORTVERSION= 1.3.931.102 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMEPREFIX?= ja- @@ -132,6 +132,8 @@ do-install-mozc_tool: # ibus_mozc .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" LIB_DEPENDS+= ibus.2:${PORTSDIR}/textproc/ibus +# after ibus updated to 1.4.0, use below instead. +#LIB_DEPENDS+= ibus-1.0.400:${PORTSDIR}/textproc/ibus RUN_DEPENDS+= mozc_server:${PORTSDIR}/japanese/mozc-server \ mozc_tool:${PORTSDIR}/japanese/mozc-tool \ mozc_server_start:${PORTSDIR}/japanese/mozc-additions \ diff --git a/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc b/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc new file mode 100644 index 000000000000..c269c5b95f71 --- /dev/null +++ b/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc @@ -0,0 +1,11 @@ +--- unix/ibus/mozc_engine.cc.orig 2011-12-24 13:17:12.915092360 +0900 ++++ unix/ibus/mozc_engine.cc 2012-01-07 13:40:28.811283808 +0900 +@@ -1187,7 +1187,7 @@ + + string selection_text; + const uint32 selection_start = min(cursor_pos, anchor_pos); +- const uint32 selection_length = abs(cursor_pos - anchor_pos); ++ const uint32 selection_length = ::abs(cursor_pos - anchor_pos); + Util::SubString(surrounding_text, + selection_start, + selection_length,