Update ibus-chewing to 1.4.12.

* Thu Dec 11 2014 Ding-Yi Chen <dchen at redhat.com> - 1.4.12
- Fix the GitHub download link

* Thu Dec 11 2014 Ding-Yi Chen <dchen at redhat.com> - 1.4.11.1
- Resolves Bug 1013977 - Slow focus change with ibus-chewing
- Resolves Bug 1062133 - ibus-chewing may not handle key event after focus change
- Resolves Bug 1073797 - Cannot identify input mode for Chinese IME (ibus-chewing)
- Fixed Bug 902866 - ibus-chewing uses dconf but still installs gconf schemas
  (Also listed as GitHub ibus-chewing #36)
- MakerDialog GUI is only loaded when setting dialog is invoked.
- Setting is removed from ibus-properties because it can be launched
  from either:
  + Executable ibus-setup-chewing: Usually under /usr/libexec
  + Input method preference in IBus preference.
- Fixed github issue #43: First space not able to input
    Thanks FreedomKnight.
- Fixed github issue #44: Update input-events (for libchewing-0.4.0)
    Thanks hiunnhue.
- Fixed github issue #45: Optimize properties handling.
    Thanks Ueno.
- github is now hosting the ibus-chewing tarballs.

14 files changed, 160 insertions, 114 deletions

diff --git a/inputmethod/ibus-chewing/Makefile b/inputmethod/ibus-chewing/Makefile
index b02371437bc..80c371e3dc8 100644
--- a/inputmethod/ibus-chewing/Makefile
+++ b/inputmethod/ibus-chewing/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2014/10/07 16:47:27 adam Exp $
+# $NetBSD: Makefile,v 1.40 2014/12/13 06:33:15 obache Exp $
 #
 
-DISTNAME=	ibus-chewing-1.4.10.1-Source
+DISTNAME=	ibus-chewing-1.4.12-Source
 PKGNAME=	${DISTNAME:S/-Source//}
-PKGREVISION=	1
 CATEGORIES=	inputmethod chinese
 MASTER_SITES=	https://github.com/definite/ibus-chewing/releases/download/${PKGVERSION_NOREV}/
 
@@ -20,13 +19,18 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt pkg-config
 TOOLS_NOOP+=		msgmerge xgettext
 
-GCONF_SCHEMAS=	ibus-chewing.schemas
-CMAKE_ARGS+=	-DLIBEXEC_DIR=${PREFIX}/libexec
-CMAKE_ARGS+=	-DGCONF_SCHEMAS_INSTALLED_DIR:PATH=${GCONF_SCHEMAS_DIR}
-
 BUILD_TARGET=	all translations
 
-.include "../../devel/GConf/schemas.mk"
+SUBST_CLASSES+=		libexecdir
+SUBST_STAGE.libexecdir=	post-configure
+SUBST_FILES.libexecdir=	data/ibus-setup-chewing.desktop
+SUBST_SED.libexecdir=	-e 's,/usr/libexec/,${PREFIX}/libexec/,g'
+
+TEST_TARGET=	test
+
+.include "../../devel/glib2/schemas.mk"
+
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../inputmethod/libchewing/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/inputmethod/ibus-chewing/PLIST b/inputmethod/ibus-chewing/PLIST
index acf08c909dd..375511f9a5d 100644
--- a/inputmethod/ibus-chewing/PLIST
+++ b/inputmethod/ibus-chewing/PLIST
@@ -1,22 +1,25 @@
-@comment $NetBSD: PLIST,v 1.4 2014/01/16 11:14:51 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/12/13 06:33:15 obache Exp $
 libexec/ibus-engine-chewing
-share/doc/${PKGNAME}/AUTHORS
-share/doc/${PKGNAME}/COPYING
-share/doc/${PKGNAME}/ChangeLog
-share/doc/${PKGNAME}/README
-share/doc/${PKGNAME}/USER-GUIDE
-share/gconf/schemas/ibus-chewing.schemas
+libexec/ibus-setup-chewing
+share/applications/ibus-setup-chewing.desktop
+share/doc/ibus-chewing/AUTHORS
+share/doc/ibus-chewing/COPYING
+share/doc/ibus-chewing/ChangeLog
+share/doc/ibus-chewing/README
+share/doc/ibus-chewing/USER-GUIDE
+share/glib-2.0/schemas/org.freedesktop.IBus.Chewing.gschema.xml
 share/ibus-chewing/icons/ibus-chewing-orig.png
 share/ibus-chewing/icons/ibus-chewing.png
-share/ibus-chewing/icons/settings.png
+share/ibus-chewing/icons/ibus-setup-chewing.png
 share/ibus/component/chewing.xml
-share/locale/de_DE/LC_MESSAGES/ibus-chewing.mo
-share/locale/es_ES/LC_MESSAGES/ibus-chewing.mo
-share/locale/fr_FR/LC_MESSAGES/ibus-chewing.mo
-share/locale/it_IT/LC_MESSAGES/ibus-chewing.mo
-share/locale/ja_JP/LC_MESSAGES/ibus-chewing.mo
-share/locale/ko_KR/LC_MESSAGES/ibus-chewing.mo
+share/locale/de/LC_MESSAGES/ibus-chewing.mo
+share/locale/es/LC_MESSAGES/ibus-chewing.mo
+share/locale/fr/LC_MESSAGES/ibus-chewing.mo
+share/locale/it/LC_MESSAGES/ibus-chewing.mo
+share/locale/ja/LC_MESSAGES/ibus-chewing.mo
+share/locale/ko/LC_MESSAGES/ibus-chewing.mo
+share/locale/pa/LC_MESSAGES/ibus-chewing.mo
 share/locale/pt_BR/LC_MESSAGES/ibus-chewing.mo
-share/locale/uk_UA/LC_MESSAGES/ibus-chewing.mo
+share/locale/uk/LC_MESSAGES/ibus-chewing.mo
 share/locale/zh_CN/LC_MESSAGES/ibus-chewing.mo
 share/locale/zh_TW/LC_MESSAGES/ibus-chewing.mo
diff --git a/inputmethod/ibus-chewing/distinfo b/inputmethod/ibus-chewing/distinfo
index 7e0b645bfc6..58d1b3d02a8 100644
--- a/inputmethod/ibus-chewing/distinfo
+++ b/inputmethod/ibus-chewing/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.16 2014/08/04 09:11:23 obache Exp $
+$NetBSD: distinfo,v 1.17 2014/12/13 06:33:15 obache Exp $
 
-SHA1 (ibus-chewing-1.4.10.1-Source.tar.gz) = 0bea26bf509574e47d4fbdc7fa8765d566d739bd
-RMD160 (ibus-chewing-1.4.10.1-Source.tar.gz) = 140a676619e76d20d7cdf3733d26ab164688a448
-Size (ibus-chewing-1.4.10.1-Source.tar.gz) = 107616 bytes
-SHA1 (patch-Modules_DateTimeFormat.cmake) = 588068914de5db765c1c5d1a623e3b73f720a64f
-SHA1 (patch-Modules_ManageEnvironment.cmake) = 333c7aa542d0555c7bb9cd3913e73a205c0dea94
-SHA1 (patch-Modules_ManageGConf.cmake) = 54e0059fbbea29add90740222d8b7dc81eb6f63f
-SHA1 (patch-Modules_ManageTranslation.cmake) = 5fd818a2a089eb9885fc749a60ded8e478f6be64
-SHA1 (patch-po_zh__CN.po) = 8818c423d3096e5d527c6e9034b876c2a4eba5d3
-SHA1 (patch-src_generate-gconf-schemas.c) = 8800a1ab67dce1848dc516e26c38cece46b9ffab
-SHA1 (patch-src_main.c) = cd160807386097de5bee3e24f8bbaae3c420d2d5
+SHA1 (ibus-chewing-1.4.12-Source.tar.gz) = 9d626194459f0ba4d4da4d92dbc6c4d0a856daa6
+RMD160 (ibus-chewing-1.4.12-Source.tar.gz) = fff16cc108c73196870d9fbd2f6b8b366a9e3939
+Size (ibus-chewing-1.4.12-Source.tar.gz) = 159593 bytes
+SHA1 (patch-CMakeLists.txt) = 86c9335ba9cbc82163bc49b837a72a0bfa4a8d3c
+SHA1 (patch-Modules_ManageEnvironment.cmake) = 213274162dca9e3fb4d54d494908a309b6819e51
+SHA1 (patch-Modules_ManageEnvironmentCommon.cmake) = 1d8bb1e91c448df5dc8c7e5b7aa1760bb637a9d0
+SHA1 (patch-Modules_ManageTranslation.cmake) = eb96c2c3610ff15999f504c2211bca5231e384af
+SHA1 (patch-po_zh__CN.po) = 158a186e43f013fbd5c62cd70dbc9e0a79375ffc
+SHA1 (patch-src_generate-gconf-schemas.c) = e48a546d676f65c83379ed0cd35bd3529b5db4e5
+SHA1 (patch-src_generate-gsettings-schemas.c) = 451ad5e9aece6b3436f9d549e4d733e8a7a0f958
+SHA1 (patch-src_ibus-setup-chewing.c) = b8526fe2ec87a54c3ed4cc5542a28c401da70d94
+SHA1 (patch-src_main.c) = 9ca342bb8a23dc14e448288fdf2030e80393bc78
diff --git a/inputmethod/ibus-chewing/patches/patch-CMakeLists.txt b/inputmethod/ibus-chewing/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..46685d2fe2c
--- /dev/null
+++ b/inputmethod/ibus-chewing/patches/patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2014/12/13 06:33:15 obache Exp $
+
+* variable name mismatch with fedora-cmake.
+
+--- CMakeLists.txt.orig	2014-12-11 12:13:51.000000000 +0000
++++ CMakeLists.txt
+@@ -170,7 +170,7 @@ ADD_DEFINITIONS("-DCHEWING_VERSION_MAJOR
+     )
+ 
+ ## In case CHEWING_DATADIR is incorrect
+-FOREACH(d ${CHEWING_DATADIR} /usr/share/chewing ${CHEWING_LIBDIR}/libchewing)
++FOREACH(d ${CHEWING_chewing_DATADIR} /usr/share/chewing ${CHEWING_LIBDIR}/libchewing)
+     IF(EXISTS "${d}/symbols.dat")
+ 	SET(CHEWING_DATADIR_REAL "${d}" CACHE STRING "CHEWING_DATADIR_REAL")
+ 	BREAK()
diff --git a/inputmethod/ibus-chewing/patches/patch-Modules_DateTimeFormat.cmake b/inputmethod/ibus-chewing/patches/patch-Modules_DateTimeFormat.cmake
deleted file mode 100644
index 0158d679fca..00000000000
--- a/inputmethod/ibus-chewing/patches/patch-Modules_DateTimeFormat.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Modules_DateTimeFormat.cmake,v 1.1 2012/08/13 11:50:45 obache Exp $
-
-* -u is much portable than --utc.
-
---- Modules/DateTimeFormat.cmake.orig	2012-07-22 19:33:19.000000000 +0000
-+++ Modules/DateTimeFormat.cmake
-@@ -28,7 +28,7 @@ IF(NOT DEFINED _DATE_TIME_FORMAT_CMAKE_)
- 	IF(_locale)
- 	    SET(ENV{LC_ALL} ${_locale})
- 	ENDIF(_locale)
--	COMMAND_OUTPUT_TO_VARIABLE(${date_var} date --utc "${format}")
-+	COMMAND_OUTPUT_TO_VARIABLE(${date_var} date -u "${format}")
-     ENDMACRO(TODAY date_var format)
- 
-     TODAY(TODAY_CHANGELOG "+%a %b %d %Y" "C")
diff --git a/inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironment.cmake b/inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironment.cmake
index d2becd5a21b..40f38190caf 100644
--- a/inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironment.cmake
+++ b/inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironment.cmake
@@ -1,15 +1,14 @@
-$NetBSD: patch-Modules_ManageEnvironment.cmake,v 1.1 2013/10/08 12:06:23 obache Exp $
+$NetBSD: patch-Modules_ManageEnvironment.cmake,v 1.2 2014/12/13 06:33:15 obache Exp $
 
 * PKGLOCALEDIR support
 
---- Modules/ManageEnvironment.cmake.orig	2012-11-26 07:37:40.000000000 +0000
+--- Modules/ManageEnvironment.cmake.orig	2014-10-28 05:05:31.000000000 +0000
 +++ Modules/ManageEnvironment.cmake
-@@ -163,6 +163,8 @@ IF(NOT DEFINED _MANAGE_ENVIRONMENT_CMAKE
- 	CACHE PATH "Data dir")
-     SET_COMPILE_ENV(DOC_DIR  "${DATA_DIR}/doc"
- 	CACHE PATH "Documentation dir")
-+    SET_COMPILE_ENV(LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}"
-+	CACHE PATH "Locale dir")
-     SET_COMPILE_ENV(SYSCONF_DIR "/etc"
- 	CACHE PATH "System configuration dir")
-     SET_COMPILE_ENV(LIBEXEC_DIR "${CMAKE_INSTALL_PREFIX}/libexec"
+@@ -144,6 +144,7 @@ M_MSG(${M_INFO1} "CMAKE_SYSTEM_PROCESSOR
+ ## Set compile flags
+ SET_COMPILE_ENV(BIN_DIR)
+ SET_COMPILE_ENV(DATA_DIR)
++SET_COMPILE_ENV(LOCALE_DIR)
+ SET_COMPILE_ENV(DOC_DIR)
+ SET_COMPILE_ENV(SYSCONF_DIR)
+ SET_COMPILE_ENV(LIB_DIR)
diff --git a/inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironmentCommon.cmake b/inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironmentCommon.cmake
new file mode 100644
index 00000000000..e971a6951bd
--- /dev/null
+++ b/inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironmentCommon.cmake
@@ -0,0 +1,14 @@
+$NetBSD: patch-Modules_ManageEnvironmentCommon.cmake,v 1.1 2014/12/13 06:33:15 obache Exp $
+
+* PKGLOCALEDIR support
+
+--- Modules/ManageEnvironmentCommon.cmake.orig	2014-10-28 05:05:31.000000000 +0000
++++ Modules/ManageEnvironmentCommon.cmake
+@@ -41,6 +41,7 @@ SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PA
+ SET(BIN_DIR     "${CMAKE_INSTALL_PREFIX}/bin"     CACHE PATH "Binary dir")
+ SET(DATA_DIR    "${CMAKE_INSTALL_PREFIX}/share"   CACHE PATH "Data dir")
+ SET(DOC_DIR     "${DATA_DIR}/doc"                 CACHE PATH "Doc dir")
++SET(LOCALE_DIR  "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}" CACHE PATH "Locale dir")
+ SET(LIBEXEC_DIR "${CMAKE_INSTALL_PREFIX}/libexec" CACHE PATH "Libexec dir")
+ SET(SYSCONF_DIR "/etc"                            CACHE PATH 
+     "System configuration dir"
diff --git a/inputmethod/ibus-chewing/patches/patch-Modules_ManageGConf.cmake b/inputmethod/ibus-chewing/patches/patch-Modules_ManageGConf.cmake
deleted file mode 100644
index 2deaa12f3ba..00000000000
--- a/inputmethod/ibus-chewing/patches/patch-Modules_ManageGConf.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Modules_ManageGConf.cmake,v 1.1 2013/12/28 04:59:36 obache Exp $
-
-* Honor GCONF_SCHEMAS_INSTALLED_DIR as document
-
---- Modules/ManageGConf.cmake.orig	2013-12-17 09:08:18.000000000 +0000
-+++ Modules/ManageGConf.cmake
-@@ -60,8 +60,8 @@ IF(NOT DEFINED _MANAGE_GCONF_CMAKE_)
- 	COMMENT "Installing schemas"
- 	)
- 
--    MANAGE_FILE_INSTALL(SYSCONF ${GCONF_SCHEMAS_FILE}
--	DEST_SUBDIR "gconf/schemas")
-+    INSTALL(FILES ${GCONF_SCHEMAS_FILE}
-+	DESTINATION "${GCONF_SCHEMAS_INSTALLED_DIR}")
- ENDIF(NOT DEFINED _MANAGE_GCONF_CMAKE_)
- 
- 
diff --git a/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake b/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake
index 0d5cbf5fee7..075c9c56257 100644
--- a/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake
+++ b/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake
@@ -1,15 +1,26 @@
-$NetBSD: patch-Modules_ManageTranslation.cmake,v 1.3 2013/12/28 04:59:36 obache Exp $
+$NetBSD: patch-Modules_ManageTranslation.cmake,v 1.4 2014/12/13 06:33:15 obache Exp $
 
 * PKGLOCALEDIR support
+* `-printf' option of find(1) is not portable.
 
---- Modules/ManageTranslation.cmake.orig	2013-12-17 15:57:40.000000000 +0000
+--- Modules/ManageTranslation.cmake.orig	2014-10-28 05:05:31.000000000 +0000
 +++ Modules/ManageTranslation.cmake
-@@ -199,7 +199,7 @@ IF(NOT DEFINED _MANAGE_TRANSLATION_CMAKE
- 		## No need to use MANAGE_FILE_INSTALL
- 		## As this will handle by rpmbuild
- 		INSTALL(FILES ${_gmoFile} DESTINATION 
--		    ${DATA_DIR}/locale/${_locale}/LC_MESSAGES 
-+		    ${CMAKE_INSTALL_LOCALEDIR}/${_locale}/LC_MESSAGES 
- 		    RENAME ${_opt_POTFILE_NAME}.mo
- 		    )
- 	    ENDFOREACH(_locale ${_opt_LOCALES})
+@@ -353,7 +353,7 @@ FUNCTION(MANAGE_POT_FILE potFile)
+ 
+ 	IF(NOT "${moDir}" STREQUAL "")
+ 	    ## MO file
+-	    SET(_moDir  "${DATA_DIR}/locale/${_l}/LC_MESSAGES")
++	    SET(_moDir  "${LOCALE_DIR}/${_l}/LC_MESSAGES")
+ 	    SET(_gmoFile "${moDir}/${_l}.gmo")
+ 	    ADD_CUSTOM_COMMAND(OUTPUT ${_gmoFile}
+ 		COMMAND ${MSGFMT_EXECUTABLE} 
+@@ -393,8 +393,7 @@ FUNCTION(MANAGE_GETTEXT_LOCALES localeLi
+     ELSE()
+ 	## LOCALES is not specified, detect now
+ 	EXECUTE_PROCESS(
+-	    COMMAND find ${poDir} -name "*.po" -printf "%f\n"
+-	    COMMAND sed -e "s/.po//g"
++	    COMMAND find ${poDir} -name "*.po" -exec basename {} .po \;
+ 	    COMMAND sort -u
+ 	    COMMAND xargs
+ 	    COMMAND sed -e "s/ /;/g"
diff --git a/inputmethod/ibus-chewing/patches/patch-po_zh__CN.po b/inputmethod/ibus-chewing/patches/patch-po_zh__CN.po
index f3cf5c2ad5b..40b0f11826e 100644
--- a/inputmethod/ibus-chewing/patches/patch-po_zh__CN.po
+++ b/inputmethod/ibus-chewing/patches/patch-po_zh__CN.po
@@ -1,15 +1,15 @@
-$NetBSD: patch-po_zh__CN.po,v 1.2 2014/01/16 11:14:51 obache Exp $
+$NetBSD: patch-po_zh__CN.po,v 1.3 2014/12/13 06:33:15 obache Exp $
 
 * fixes initial default value
 
---- po/zh_CN.po.orig	2014-01-15 11:09:51.000000000 +0000
+--- po/zh_CN.po.orig	2014-12-11 01:06:43.000000000 +0000
 +++ po/zh_CN.po
-@@ -8,7 +8,7 @@ msgstr  "Project-Id-Version: ibus-chewin
-         "POT-Creation-Date: 2014-01-15 21:09+1000\n"
-         "PO-Revision-Date: 2012-11-28 08:19-0500\n"
-         "Last-Translator: leahliu <lliu@redhat.com>\n"
--        "Language-Team: LANGUAGE <LL@li.org>\n"
-+        "Language-Team: Simplfied Chinese\n"
-         "Language: zh-CN\n"
-         "MIME-Version: 1.0\n"
-         "Content-Type: text/plain; charset=UTF-8\n"
+@@ -13,7 +13,7 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "PO-Revision-Date: 2014-12-09 03:30-0500\n"
+ "Last-Translator: Pany <geekpany@gmail.com>\n"
+-"Language-Team: LANGUAGE <LL@li.org>\n"
++"Language-Team: Simplfied Chinese\n"
+ "Language: zh-CN\n"
+ "X-Generator: Zanata 3.5.1\n"
+ "Plural-Forms: nplurals=1; plural=0\n"
diff --git a/inputmethod/ibus-chewing/patches/patch-src_generate-gconf-schemas.c b/inputmethod/ibus-chewing/patches/patch-src_generate-gconf-schemas.c
index 7c8c53646f1..58a0dce0e47 100644
--- a/inputmethod/ibus-chewing/patches/patch-src_generate-gconf-schemas.c
+++ b/inputmethod/ibus-chewing/patches/patch-src_generate-gconf-schemas.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_generate-gconf-schemas.c,v 1.1 2013/10/08 12:06:23 obache Exp $
+$NetBSD: patch-src_generate-gconf-schemas.c,v 1.2 2014/12/13 06:33:15 obache Exp $
 
 * PKGLOCALEDIR support
 
---- src/generate-gconf-schemas.c.orig	2012-10-22 05:32:11.000000000 +0000
+--- src/generate-gconf-schemas.c.orig	2014-12-09 06:13:50.000000000 +0000
 +++ src/generate-gconf-schemas.c
-@@ -41,7 +41,7 @@ int main (gint argc, gchar *argv[])
+@@ -172,7 +172,7 @@ int main(gint argc, gchar * argv[])
  
      /* Init i18n messages */
-     setlocale (LC_ALL, "");
--    bindtextdomain(quote_me(PROJECT_NAME), quote_me(DATA_DIR) "/locale");
-+    bindtextdomain(quote_me(PROJECT_NAME), quote_me(LOCALE_DIR));
-     textdomain(quote_me(PROJECT_NAME));
+     setlocale(LC_ALL, "");
+-    bindtextdomain(QUOTE_ME(PROJECT_NAME), QUOTE_ME(DATA_DIR) "/locale");
++    bindtextdomain(QUOTE_ME(PROJECT_NAME), QUOTE_ME(LOCALE_DIR));
+     textdomain(QUOTE_ME(PROJECT_NAME));
  
      context = g_option_context_new("schemasFile");
diff --git a/inputmethod/ibus-chewing/patches/patch-src_generate-gsettings-schemas.c b/inputmethod/ibus-chewing/patches/patch-src_generate-gsettings-schemas.c
new file mode 100644
index 00000000000..4d4dc5390dc
--- /dev/null
+++ b/inputmethod/ibus-chewing/patches/patch-src_generate-gsettings-schemas.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_generate-gsettings-schemas.c,v 1.1 2014/12/13 06:33:15 obache Exp $
+
+* PKGLOCALEDIR support
+
+--- src/generate-gsettings-schemas.c.orig	2014-12-09 06:13:50.000000000 +0000
++++ src/generate-gsettings-schemas.c
+@@ -67,7 +67,7 @@ int main(gint argc, gchar * argv[])
+ 
+     /* Init i18n messages */
+     setlocale(LC_ALL, "");
+-    bindtextdomain(QUOTE_ME(PROJECT_NAME), QUOTE_ME(DATA_DIR) "/locale");
++    bindtextdomain(QUOTE_ME(PROJECT_NAME), QUOTE_ME(LOCALE_DIR));
+     textdomain(QUOTE_ME(PROJECT_NAME));
+ 
+     context = g_option_context_new("schemasFile");
diff --git a/inputmethod/ibus-chewing/patches/patch-src_ibus-setup-chewing.c b/inputmethod/ibus-chewing/patches/patch-src_ibus-setup-chewing.c
new file mode 100644
index 00000000000..6036513f1a1
--- /dev/null
+++ b/inputmethod/ibus-chewing/patches/patch-src_ibus-setup-chewing.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_ibus-setup-chewing.c,v 1.1 2014/12/13 06:33:15 obache Exp $
+
+* PKGLOCALEDIR support
+
+--- src/ibus-setup-chewing.c.orig	2014-12-04 06:48:33.000000000 +0000
++++ src/ibus-setup-chewing.c
+@@ -91,7 +91,7 @@ gint main(gint argc, gchar * argv[])
+ 
+     /* Init i18n messages */
+     setlocale(LC_ALL, "");
+-    bindtextdomain(QUOTE_ME(PROJECT_NAME), QUOTE_ME(DATA_DIR) "/locale");
++    bindtextdomain(QUOTE_ME(PROJECT_NAME), QUOTE_ME(LOCALE_DIR));
+     textdomain(QUOTE_ME(PROJECT_NAME));
+ 
+     context = g_option_context_new("- ibus chewing engine setup");
diff --git a/inputmethod/ibus-chewing/patches/patch-src_main.c b/inputmethod/ibus-chewing/patches/patch-src_main.c
index 78485117cac..2e1108d79d8 100644
--- a/inputmethod/ibus-chewing/patches/patch-src_main.c
+++ b/inputmethod/ibus-chewing/patches/patch-src_main.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_main.c,v 1.3 2013/10/08 12:06:23 obache Exp $
+$NetBSD: patch-src_main.c,v 1.4 2014/12/13 06:33:15 obache Exp $
 
 * PKGLOCALEDIR support
 
---- src/main.c.orig	2012-10-22 05:32:11.000000000 +0000
+--- src/main.c.orig	2014-12-09 06:13:50.000000000 +0000
 +++ src/main.c
-@@ -146,7 +146,7 @@ main (gint argc, gchar *argv[])
+@@ -162,7 +162,7 @@ int main(gint argc, gchar * argv[])
  
      /* Init i18n messages */
-     setlocale (LC_ALL, "zh_TW.utf8");
--    bindtextdomain(quote_me(PROJECT_NAME), quote_me(DATA_DIR) "/locale");
-+    bindtextdomain(quote_me(PROJECT_NAME), quote_me(LOCALE_DIR));
-     textdomain(quote_me(PROJECT_NAME));
+     setlocale(LC_ALL, "");
+-    bindtextdomain(QUOTE_ME(PROJECT_NAME), QUOTE_ME(DATA_DIR) "/locale");
++    bindtextdomain(QUOTE_ME(PROJECT_NAME), QUOTE_ME(LOCALE_DIR));
+     textdomain(QUOTE_ME(PROJECT_NAME));
+     determine_locale();
  
-     context = g_option_context_new ("- ibus chewing engine component");