Date: Thursday, March 26, 2015 @ 03:23:25 Author: fyan Revision: 129927
upgpkg: fcitx 4.2.8.6-1 Modified: fcitx/trunk/PKGBUILD Deleted: fcitx/trunk/custom-translation-install-dir.patch fcitx/trunk/opencc-1.0.patch --------------------------------------+ PKGBUILD | 19 ++--------- custom-translation-install-dir.patch | 33 -------------------- opencc-1.0.patch | 53 --------------------------------- 3 files changed, 4 insertions(+), 101 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-03-26 02:16:37 UTC (rev 129926) +++ PKGBUILD 2015-03-26 02:23:25 UTC (rev 129927) @@ -5,8 +5,8 @@ pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4') -pkgver=4.2.8.5 -pkgrel=6 +pkgver=4.2.8.6 +pkgrel=1 groups=('fcitx-im') arch=('i686' 'x86_64') url="http://fcitx-im.org" @@ -13,20 +13,9 @@ license=('GPL' 'LGPL') makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' 'opencc' \ 'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant' 'python2') -source=(http://download.fcitx-im.org/$pkgbase/$pkgbase-${pkgver}_dict.tar.xz - custom-translation-install-dir.patch - opencc-1.0.patch) -sha512sums=('ee6612a34087135065537fa14f09078bad9f029f69b636fb2221193f23d86c5431a9d8a848b264bdcb259680f6bda41d08d58dcf67d19e5a200cb11fa4a26ffe' - 'c57ef118b72accdfc42a0035a5318bf4b0ebe082af46efff7bfea4b063d382cc92bef0205555e42d140a6ffcbbdb87d43db833e1a221c5d3a97f12c8720e759a' - 'f652e81e5a28107903b3a65601a507eace59aa147ffc19fa6471c902241110209dceb902d659de312c9b16e0efd1b2873316aca652534ba6fb27af81d9f4c08d') +source=(http://download.fcitx-im.org/$pkgbase/$pkgbase-${pkgver}_dict.tar.xz) +sha512sums=('822e448932e735fe3087384eaf91c6b029b06d3461aa3798501bfbf8f79b8ebc5ea3ac57f01ec32674cc3cb74fcb34b6e285ef265bb49be54543f34dcaf624e4') -prepare() { - cd ${pkgbase}-${pkgver} - - patch -p1 -i ../custom-translation-install-dir.patch - patch -p1 -i ../opencc-1.0.patch -} - build() { mkdir -p build cd build Deleted: custom-translation-install-dir.patch =================================================================== --- custom-translation-install-dir.patch 2015-03-26 02:16:37 UTC (rev 129926) +++ custom-translation-install-dir.patch 2015-03-26 02:23:25 UTC (rev 129927) @@ -1,33 +0,0 @@ -From 7a75b84ea330af7f64bed1db34ce45ef10d0015c Mon Sep 17 00:00:00 2001 -From: Yichao Yu <yyc1...@gmail.com> -Date: Sun, 28 Sep 2014 10:00:53 -0400 -Subject: [PATCH] [cmake] add option for translation install dir - ---- - cmake/FcitxMacro.cmake | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/cmake/FcitxMacro.cmake b/cmake/FcitxMacro.cmake -index ca46497..05f3830 100644 ---- a/cmake/FcitxMacro.cmake -+++ b/cmake/FcitxMacro.cmake -@@ -638,6 +638,10 @@ function(fcitx_translate_add_apply_source in_file out_file) - "Cannot find a rule to convert ${in_file} to ${out_file}") - endfunction() - -+if(NOT DEFINED FCITX_PO_INSTALL_DIR) -+ set(FCITX_PO_INSTALL_DIR share/locale/) -+endif() -+ - # Should be used in cmake modules, add a handler script to update a set of - # certain type of files from the translated mo files. - # The script must be executable. -@@ -719,7 +723,7 @@ function(fcitx_translate_set_pot_target target domain pot_file) - -o "${po_dir}/${domain}.mo" "${po_file}" - DEPENDS "${po_file}") - install(FILES "${po_dir}/${domain}.mo" -- DESTINATION "share/locale/${po_lang}/LC_MESSAGES") -+ DESTINATION "${FCITX_PO_INSTALL_DIR}/${po_lang}/LC_MESSAGES") - list(APPEND all_mo_files "${po_dir}/${domain}.mo") - list(APPEND all_po_files "${po_file}") - endforeach() Deleted: opencc-1.0.patch =================================================================== --- opencc-1.0.patch 2015-03-26 02:16:37 UTC (rev 129926) +++ opencc-1.0.patch 2015-03-26 02:23:25 UTC (rev 129927) @@ -1,53 +0,0 @@ -From 3b931e059ffa28066363cd53feae0221cf71714c Mon Sep 17 00:00:00 2001 -From: Weng Xuetian <wen...@gmail.com> -Date: Wed, 5 Nov 2014 13:11:23 -0500 -Subject: [PATCH] [chttrans] add support for new opencc - ---- - src/module/chttrans/chttrans-opencc.c | 26 ++++++++++++++++++++++++-- - 1 file changed, 24 insertions(+), 2 deletions(-) - -diff --git a/src/module/chttrans/chttrans-opencc.c b/src/module/chttrans/chttrans-opencc.c -index a6eb0cd..57ce03b 100644 ---- a/src/module/chttrans/chttrans-opencc.c -+++ b/src/module/chttrans/chttrans-opencc.c -@@ -6,8 +6,13 @@ - #include <stdlib.h> - #include <dlfcn.h> - --#define _OPENCC_DEFAULT_CONFIG_SIMP_TO_TRAD "zhs2zht.ini" --#define _OPENCC_DEFAULT_CONFIG_TRAD_TO_SIMP "zht2zhs.ini" -+#define _OPENCC_DEFAULT_CONFIG_SIMP_TO_TRAD_OLD "zhs2zht.ini" -+#define _OPENCC_DEFAULT_CONFIG_TRAD_TO_SIMP_OLD "zht2zhs.ini" -+ -+#define _OPENCC_DEFAULT_CONFIG_SIMP_TO_TRAD "s2t.json" -+#define _OPENCC_DEFAULT_CONFIG_TRAD_TO_SIMP "t2s.json" -+ -+ - static void* _opencc_handle = NULL; - static void* (*_opencc_open)(const char* config_file) = NULL; - static char* (*_opencc_convert_utf8)(void* opencc, const char* inbuf, size_t length) = NULL; -@@ -49,6 +54,23 @@ OpenCCInit(FcitxChttrans* transState) - return false; - transState->ods2t = _opencc_open(_OPENCC_DEFAULT_CONFIG_SIMP_TO_TRAD); - transState->odt2s = _opencc_open(_OPENCC_DEFAULT_CONFIG_TRAD_TO_SIMP); -+ -+ if (transState->ods2t == (void*) -1) { -+ transState->ods2t = _opencc_open(_OPENCC_DEFAULT_CONFIG_SIMP_TO_TRAD_OLD); -+ } -+ if (transState->odt2s == (void*) -1) { -+ transState->odt2s = _opencc_open(_OPENCC_DEFAULT_CONFIG_TRAD_TO_SIMP_OLD); -+ } -+ -+ // stupid opencc use -1 as failure -+ if (transState->ods2t == (void*) -1) { -+ transState->ods2t = NULL; -+ } -+ -+ if (transState->odt2s == (void*) -1) { -+ transState->odt2s = NULL; -+ } -+ - if (!transState->ods2t && !transState->odt2s) - return false; - return true;