14 files changed, 217 insertions, 120 deletions

diff --git a/chinese/fcitx/files/patch-CMakeLists.txt b/chinese/fcitx/files/patch-CMakeLists.txt
index e1dc7fdab463..5d9025643c53 100644
--- a/chinese/fcitx/files/patch-CMakeLists.txt
+++ b/chinese/fcitx/files/patch-CMakeLists.txt
@@ -1,11 +1,44 @@
---- CMakeLists.txt~	2011-10-02 05:43:11.000000000 -0500
-+++ CMakeLists.txt	2011-11-09 07:51:31.801020675 -0600
-@@ -93,7 +93,7 @@ if (ENABLE_OPENCC)
- endif (ENABLE_OPENCC)
+--- ./CMakeLists.txt.orig	2013-09-28 17:33:14.000000000 +0900
++++ ./CMakeLists.txt	2014-03-19 13:45:08.000000000 +0900
+@@ -207,16 +207,21 @@
+     set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "sys config directory [default=PREFIX/etc/]")
+ endif()
  
- if(ENABLE_DEBUG)
--    set(_DEBUG)
-+    set(_DEBUG ON)
- endif(ENABLE_DEBUG)
+-set(includedir "${CMAKE_INSTALL_PREFIX}/include")
+-set(libdir ${LIB_INSTALL_DIR})
+-set(pkgconfdir ${LIBDATA_INSTALL_DIR}/pkgconfig)
+-set(mandir ${MAN_INSTALL_DIR})
++set(includedir "${PREFIX}/include")
++set(libdir ${PREFIX}/lib)
++set(pkgconfdir ${PREFIX}/libdata/pkgconfig)
++set(mandir ${MANPREFIX}/man)
+ set(addondir ${libdir}/${package} )
+-set(pkgdatadir ${prefix}/share/${package})
++set(addondestdir "\${PREFIX}/lib/${package}" )
++set(pkgdatadir ${DATADIR})
++set(pkgdatadestdir "\${DATADIR}")
+ set(configdescdir ${pkgdatadir}/configdesc)
++set(configdescdestdir ${pkgdatadestdir}/configdesc)
+ set(addonconfigdir ${pkgdatadir}/addon)
++set(addonconfigdestdir ${pkgdatadestdir}/addon)
+ set(imconfigdir ${pkgdatadir}/inputmethod)
+-set(localedir ${CMAKE_INSTALL_PREFIX}/share/locale)
++set(imconfigdestdir ${pkgdatadestdir}/inputmethod)
++set(localedir ${PREFIX}/share/locale)
  
- set(package     fcitx)
+ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
+ list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
+@@ -229,9 +234,13 @@
+ 
+ # For FcitxMacro
+ set(FCITX4_ADDON_INSTALL_DIR ${addondir})
++set(FCITX4_ADDON_INSTALL_DESTDIR ${addondestdir})
+ set(FCITX4_CONFIGDESC_INSTALL_DIR ${configdescdir})
++set(FCITX4_CONFIGDESC_INSTALL_DESTDIR ${configdescdir})
+ set(FCITX4_ADDON_CONFIG_INSTALL_DIR ${addonconfigdir})
++set(FCITX4_ADDON_CONFIG_INSTALL_DESTDIR ${addonconfigdir})
+ set(FCITX4_INPUTMETHOD_CONFIG_INSTALL_DIR ${imconfigdir})
++set(FCITX4_INPUTMETHOD_CONFIG_INSTALL_DESTDIR ${imconfigdir})
+ set(FCITX4_PACKAGE_NAME ${package})
+ 
+ function(_RESOLVE_LIBRARY_PATH _FILE_NAME _LIBRARY_PATH)
diff --git a/chinese/fcitx/files/patch-cmake__FcitxConfig.cmake b/chinese/fcitx/files/patch-cmake__FcitxConfig.cmake
new file mode 100644
index 000000000000..a5258064fda7
--- /dev/null
+++ b/chinese/fcitx/files/patch-cmake__FcitxConfig.cmake
@@ -0,0 +1,16 @@
+--- ./cmake/FcitxConfig.cmake.orig	2013-09-28 17:33:14.000000000 +0900
++++ ./cmake/FcitxConfig.cmake	2014-03-19 13:45:08.000000000 +0900
+@@ -76,9 +76,13 @@
+ IF(FCITX4_FCITXCONFIG_EXECUTABLE)
+     message(STATUS "fcitx4-config found ${FCITX4_FCITXCONFIG_EXECUTABLE}")
+     EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --addondir OUTPUT_VARIABLE FCITX4_ADDON_INSTALL_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
++    EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --addondestdir OUTPUT_VARIABLE FCITX4_ADDON_INSTALL_DESTDIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+     EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --imconfigdir OUTPUT_VARIABLE FCITX4_INPUTMETHOD_CONFIG_INSTALL_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
++    EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --imconfigdestdir OUTPUT_VARIABLE FCITX4_INPUTMETHOD_CONFIG_INSTALL_DESTDIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+     EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --configdescdir OUTPUT_VARIABLE FCITX4_CONFIGDESC_INSTALL_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
++    EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --configdescdestdir OUTPUT_VARIABLE FCITX4_CONFIGDESC_INSTALL_DESTDIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+     EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --addonconfigdir OUTPUT_VARIABLE FCITX4_ADDON_CONFIG_INSTALL_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
++    EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --addonconfigdestdir OUTPUT_VARIABLE FCITX4_ADDON_CONFIG_INSTALL_DESTDIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+     EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --package OUTPUT_VARIABLE FCITX4_PACKAGE_NAME ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+     EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --version OUTPUT_VARIABLE FCITX4_VERSION ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+     EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --prefix OUTPUT_VARIABLE FCITX4_PREFIX ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/chinese/fcitx/files/patch-cmake__FcitxMacro.cmake b/chinese/fcitx/files/patch-cmake__FcitxMacro.cmake
new file mode 100644
index 000000000000..e71041bf7840
--- /dev/null
+++ b/chinese/fcitx/files/patch-cmake__FcitxMacro.cmake
@@ -0,0 +1,51 @@
+--- ./cmake/FcitxMacro.cmake.orig	2013-09-28 17:33:14.000000000 +0900
++++ ./cmake/FcitxMacro.cmake	2014-03-19 13:46:27.000000000 +0900
+@@ -366,10 +366,10 @@
+   add_custom_target("${target_name}" ALL)
+ 
+   __fcitx_addon_config_file("${target_name}" "${FCITX_ADDON_CONF_SRC}"
+-    "${FCITX4_ADDON_CONFIG_INSTALL_DIR}")
++    "${FCITX4_ADDON_CONFIG_INSTALL_DESTDIR}")
+   foreach(im_config ${FCITX_ADDON_IM_CONFIG})
+     __fcitx_addon_config_file("${target_name}" "${im_config}"
+-      "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DIR}")
++      "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DESTDIR}")
+   endforeach()
+   __fcitx_add_addon_lib("${FCITX_ADDON_LIB_NAME}" ${FCITX_ADDON_SOURCES})
+   if(FCITX_ADDON_LINK_LIBS)
+@@ -393,7 +393,7 @@
+   set_target_properties("${lib_name}" PROPERTIES PREFIX ""
+     COMPILE_FLAGS "-fvisibility=hidden")
+   add_dependencies("${lib_name}" fcitx-scan-addons.target)
+-  install(TARGETS "${lib_name}" DESTINATION "${FCITX4_ADDON_INSTALL_DIR}")
++  install(TARGETS "${lib_name}" DESTINATION "${FCITX4_ADDON_INSTALL_DESTDIR}")
+ endfunction()
+ 
+ function(__fcitx_install_addon_desc target_name)
+@@ -402,7 +402,7 @@
+   add_custom_target("${desc_target}" DEPENDS ${descs})
+   add_dependencies("${target_name}" "${desc_target}")
+   install(FILES ${descs}
+-    DESTINATION "${FCITX4_CONFIGDESC_INSTALL_DIR}")
++    DESTINATION "${FCITX4_CONFIGDESC_INSTALL_DESTDIR}")
+ endfunction()
+ 
+ # Add additional config-desc files, the file will be added to extracte
+@@ -893,7 +893,7 @@
+   __FCITX_CONF_FILE_GET_UNIQUE_TARGET_NAME(fcitx_addon_conf targetname)
+   add_custom_target(${targetname} ALL DEPENDS ${conffilename})
+   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${conffilename}"
+-    DESTINATION "${FCITX4_ADDON_CONFIG_INSTALL_DIR}")
++    DESTINATION "${FCITX4_ADDON_CONFIG_INSTALL_DESTDIR}")
+ ENDMACRO(FCITX_ADD_ADDON_CONF_FILE conffilename)
+ 
+ MACRO(FCITX_ADD_INPUTMETHOD_CONF_FILE conffilename)
+@@ -902,7 +902,7 @@
+   __FCITX_CONF_FILE_GET_UNIQUE_TARGET_NAME(fcitx_inputmethod_conf targetname)
+   add_custom_target(${targetname} ALL DEPENDS ${conffilename})
+   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${conffilename}"
+-    DESTINATION "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DIR}")
++    DESTINATION "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DESTDIR}")
+ ENDMACRO()
+ 
+ MACRO(FCITX_ADD_CONFIGDESC_FILE)
diff --git a/chinese/fcitx/files/patch-cmake_modules_FindLibkvm.cmake b/chinese/fcitx/files/patch-cmake_modules_FindLibkvm.cmake
deleted file mode 100644
index f79e91036651..000000000000
--- a/chinese/fcitx/files/patch-cmake_modules_FindLibkvm.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/cmake/FindLibkvm.cmake b/cmake/FindLibkvm.cmake
-index a66b85d..4453fd4 100644
---- cmake/FindLibkvm.cmake
-+++ cmake/FindLibkvm.cmake
-@@ -5,23 +5,11 @@
- #  LIBKVM_INCLUDE_DIR - Libkvm include directory
- #  LIBKVM_LIBRARIES - Libraries needed to use Libkvm
- #
-- 
--if(LIBKVM_INCLUDE_DIR AND LIBKVM_FOUND)
--  set(Libkvm_FIND_QUIETLY TRUE)
--endif(LIBKVM_INCLUDE_DIR AND LIBKVM_FOUND)
-- 
-+
- find_path(LIBKVM_INCLUDE_DIR kvm.h)
-- 
--set(LIBKVM_FOUND FALSE)
-- 
--if(LIBKVM_INCLUDE_DIR)
--    find_library(LIBKVM_LIBRARIES NAMES kvm)
--    if(LIBKVM_LIBRARIES)
--      set(LIBKVM_FOUND TRUE)
--    endif(LIBKVM_LIBRARIES)
--endif(LIBKVM_INCLUDE_DIR)
-- 
-+find_library(LIBKVM_LIBRARIES NAMES kvm)
-+
- include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(Libkvm  DEFAULT_MSG  LIBKVM_INCLUDE_DIR  LIBKVM_FOUND)
-- 
--mark_as_advanced(LIBKVM_INCLUDE_DIR  LIBKVM_LIBRARIES  LIBKVM_LIBC_HAS_KVM_OPEN  LIBKVM_FOUND)
-+find_package_handle_standard_args(Libkvm  DEFAULT_MSG  LIBKVM_INCLUDE_DIR  LIBKVM_LIBRARIES)
-+
-+mark_as_advanced(LIBKVM_INCLUDE_DIR  LIBKVM_LIBRARIES)
diff --git a/chinese/fcitx/files/patch-data__script__fcitx4-config.in b/chinese/fcitx/files/patch-data__script__fcitx4-config.in
new file mode 100644
index 000000000000..3da686b3351f
--- /dev/null
+++ b/chinese/fcitx/files/patch-data__script__fcitx4-config.in
@@ -0,0 +1,78 @@
+--- ./data/script/fcitx4-config.in.orig	2013-09-28 17:33:14.000000000 +0900
++++ ./data/script/fcitx4-config.in	2014-03-19 13:45:08.000000000 +0900
+@@ -1,14 +1,26 @@
+ #! /bin/sh
+ 
++## cmake does not handle \$\{.PREFIX\:\-\@prefix\@\} syntax (even in comments).
++if [ -z "$PREFIX" ]; then
++  PREFIX=@prefix@
++fi
++if [ -z "$DATADIR" ]; then
++  DATADIR=$PREFIX/share/fcitx
++fi
++
+ package=@package@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ includedir=@includedir@
+ libdir=@libdir@
+ addondir=@addondir@
++addondestdir=@addondestdir@
+ imconfigdir=@imconfigdir@
++imconfigdestdir=@imconfigdestdir@
+ configdescdir=@configdescdir@
++configdescdestdir=@configdescdestdir@
+ addonconfigdir=@addonconfigdir@
++addonconfigdestdir=@addonconfigdestdir@
+ 
+ usage()
+ {
+@@ -23,9 +35,13 @@
+   --libdir              Fcitx Library Prefix
+   --includedir          Fcitx Include Prefix
+   --addondir            Fcitx Addon Library Dir
++  --addondestdir        Fcitx Addon Library DestDir
+   --configdescdir       Fcitx Configure Description File Dir
++  --configdescdestdir   Fcitx Configure Description File DestDir
+   --addonconfigdir      Fcitx Addon Config File Dir
++  --addonconfigdestdir  Fcitx Addon Config File DestDir
+   --imconfigdir         Fcitx Input Method Config File Dir
++  --imconfigdestdir     Fcitx Input Method Config File DestDir
+   --help                display this help and exit
+   --version             output version information
+ EOF
+@@ -72,18 +88,34 @@
+       echo $addondir
+       ;;
+ 
++    --addondestdir)
++      echo $addondestdir
++      ;;
++
+     --configdescdir)
+       echo $configdescdir
+       ;;
+ 
++    --configdescdestdir)
++      echo $configdescdestdir
++      ;;
++
+     --addonconfigdir)
+       echo $addonconfigdir
+       ;;
+ 
++    --addonconfigdestdir)
++      echo $addonconfigdestdir
++      ;;
++
+     --imconfigdir)
+       echo $imconfigdir
+       ;;
+ 
++    --imconfigdestdir)
++      echo $imconfigdestdir
++      ;;
++
+     --version)
+         echo @version@
+         exit 0
diff --git a/chinese/fcitx/files/patch-doc_man_CMakeLists.txt b/chinese/fcitx/files/patch-doc_man_CMakeLists.txt
deleted file mode 100644
index bdb4c8cd8b09..000000000000
--- a/chinese/fcitx/files/patch-doc_man_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- doc/man/CMakeLists.txt~	2011-10-02 05:43:11.000000000 -0500
-+++ doc/man/CMakeLists.txt	2011-11-09 05:30:55.468797225 -0600
-@@ -2,4 +2,4 @@ set(FCITX_MANS
- fcitx.1 createPYMB.1 readPYBase.1 readPYMB.1 mb2org.1 scel2org.1 mb2txt.1 txt2mb.1 fcitx-remote.1
- )
- 
--install(FILES ${FCITX_MANS} DESTINATION share/man/man1)
-\ No newline at end of file
-+install(FILES ${FCITX_MANS} DESTINATION man/man1)
diff --git a/chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt b/chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt
deleted file mode 100644
index e944723c786d..000000000000
--- a/chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/fcitx-config/CMakeLists.txt.orig	2011-10-02 05:43:11.000000000 -0500
-+++ src/lib/fcitx-config/CMakeLists.txt	2011-11-13 16:02:26.681232301 -0600
-@@ -23,7 +23,7 @@ set_target_properties(fcitx-config
- configure_file(fcitx-config.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc)
- 
- install(TARGETS fcitx-config DESTINATION ${libdir})
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc DESTINATION "${libdir}/pkgconfig")
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc DESTINATION "libdata/pkgconfig")
- install(FILES ${FCITX_CONFIG_HEADERS} DESTINATION "${includedir}/fcitx-config")
- 
- if (ENABLE_STATIC)
diff --git a/chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt b/chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt
deleted file mode 100644
index c76228b80ae3..000000000000
--- a/chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/lib/fcitx-gclient/CMakeLists.txt~	2012-07-17 15:21:04.000000000 -0500
-+++ src/lib/fcitx-gclient/CMakeLists.txt	2012-07-18 00:46:13.209418264 -0500
-@@ -46,7 +46,7 @@ target_link_libraries(fcitx-gclient ${GI
- configure_file(fcitx-gclient.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc)
- 
- install(TARGETS fcitx-gclient LIBRARY DESTINATION "${libdir}")
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc DESTINATION "${libdir}/pkgconfig")
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc DESTINATION "libdata/pkgconfig")
- install(FILES ${FCITX_GCLIENT_HEADERS} DESTINATION "${includedir}/fcitx-gclient")
- 
- if (ENABLE_GIR)
-@@ -86,4 +86,4 @@ install(TARGETS fcitx-gclient-static
- )
- endif (ENABLE_STATIC)
- 
--add_subdirectory(test)
-\ No newline at end of file
-+add_subdirectory(test)
diff --git a/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxclient.c b/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxclient.c
deleted file mode 100644
index 58826bbda24a..000000000000
--- a/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxclient.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/lib/fcitx-gclient/fcitxclient.c.orig	2012-09-19 14:25:18.000000000 +0800
-+++ src/lib/fcitx-gclient/fcitxclient.c	2012-09-19 14:29:55.000000000 +0800
-@@ -26,10 +26,14 @@
- #include "fcitxclient.h"
- #include "marshall.h"
- 
-+#ifdef _DEBUG
- #define fcitx_gclient_debug(...) g_log ("fcitx-client",       \
-                                       G_LOG_LEVEL_DEBUG,    \
-                                       __VA_ARGS__)
- 
-+#else
-+#define fcitx_gclient_debug(...)
-+#endif
- typedef struct _ProcessKeyStruct ProcessKeyStruct;
- 
- struct _ProcessKeyStruct {
diff --git a/chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt b/chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt
deleted file mode 100644
index c2855c686453..000000000000
--- a/chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/fcitx-utils/CMakeLists.txt.orig	2011-10-02 05:43:11.000000000 -0500
-+++ src/lib/fcitx-utils/CMakeLists.txt	2011-11-13 16:02:51.201489333 -0600
-@@ -34,7 +34,7 @@ endif (LIBKVM_FOUND)
- configure_file(fcitx-utils.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc)
- 
- install(TARGETS fcitx-utils LIBRARY DESTINATION "${libdir}")
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc DESTINATION "${libdir}/pkgconfig")
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc DESTINATION "libdata/pkgconfig")
- install(FILES ${FCITX_UTILS_HEADERS} DESTINATION "${includedir}/fcitx-utils")
- 
- if (ENABLE_STATIC)
diff --git a/chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt b/chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt
deleted file mode 100644
index 24826ca7f76c..000000000000
--- a/chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/fcitx/CMakeLists.txt.orig	2011-10-02 05:43:11.000000000 -0500
-+++ src/lib/fcitx/CMakeLists.txt	2011-11-13 16:01:32.246665458 -0600
-@@ -41,7 +41,7 @@ configure_file(fcitx.pc.in ${CMAKE_CURRE
- 
- target_link_libraries(fcitx-core fcitx-config fcitx-utils ${DL_LIBRARIES} ${PTHREAD_LIBRARIES})
- install(TARGETS fcitx-core LIBRARY DESTINATION "${libdir}")
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx.pc DESTINATION "${libdir}/pkgconfig")
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx.pc DESTINATION "libdata/pkgconfig")
- install(FILES ${FCITX_HEADERS} DESTINATION "${includedir}/fcitx")
- 
- if (ENABLE_STATIC)
diff --git a/chinese/fcitx/files/patch-tools__cli__CMakeLists.txt b/chinese/fcitx/files/patch-tools__cli__CMakeLists.txt
new file mode 100644
index 000000000000..eaad7bbd2805
--- /dev/null
+++ b/chinese/fcitx/files/patch-tools__cli__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./tools/cli/CMakeLists.txt.orig	2013-09-28 17:33:14.000000000 +0900
++++ ./tools/cli/CMakeLists.txt	2014-03-19 13:45:08.000000000 +0900
+@@ -1,3 +1,7 @@
++include_directories (
++  ${LIBICONV_INCLUDE_DIR}
++  )
++
+ set(createPYMB_SOURCES
+   createPYMB.c
+   ${PROJECT_SOURCE_DIR}/src/im/pinyin/pyParser.c
diff --git a/chinese/fcitx/files/patch-tools__gui__quickphrase-editor__CMakeLists.txt b/chinese/fcitx/files/patch-tools__gui__quickphrase-editor__CMakeLists.txt
new file mode 100644
index 000000000000..ca57467e012e
--- /dev/null
+++ b/chinese/fcitx/files/patch-tools__gui__quickphrase-editor__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./tools/gui/quickphrase-editor/CMakeLists.txt.orig	2013-09-28 17:33:14.000000000 +0900
++++ ./tools/gui/quickphrase-editor/CMakeLists.txt	2014-03-19 13:45:08.000000000 +0900
+@@ -17,6 +17,7 @@
+   ${QT_QTCORE_INCLUDE_DIR}
+   ${QT_QTGUI_INCLUDE_DIR}
+   ${CMAKE_CURRENT_BINARY_DIR}
++  ${LIBINTL_INCLUDE_DIR}
+   )
+ qt4_wrap_ui(QUICKPHRASE_EDITOR_SRCS editordialog.ui batchdialog.ui editor.ui)
+ add_library(fcitx-quickphrase-editor
diff --git a/chinese/fcitx/files/patch-tools__gui__wrapper__CMakeLists.txt b/chinese/fcitx/files/patch-tools__gui__wrapper__CMakeLists.txt
new file mode 100644
index 000000000000..100a305f2a5e
--- /dev/null
+++ b/chinese/fcitx/files/patch-tools__gui__wrapper__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./tools/gui/wrapper/CMakeLists.txt.orig	2013-09-28 17:33:14.000000000 +0900
++++ ./tools/gui/wrapper/CMakeLists.txt	2014-03-19 13:45:08.000000000 +0900
+@@ -14,6 +14,7 @@
+   ${QT_QTCORE_INCLUDE_DIR}
+   ${QT_QTGUI_INCLUDE_DIR}
+   ${CMAKE_CURRENT_BINARY_DIR}
++  ${LIBINTL_INCLUDE_DIR}
+   )
+ 
+ qt4_wrap_ui(QT_WRAPPER_SRCS mainwindow.ui)