From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 14 07:40:02 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DE66106564A for ; Mon, 14 May 2012 07:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1F5EC8FC14 for ; Mon, 14 May 2012 07:40:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q4E7e2AZ052445 for ; Mon, 14 May 2012 07:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q4E7e2ST052444; Mon, 14 May 2012 07:40:02 GMT (envelope-from gnats) Resent-Date: Mon, 14 May 2012 07:40:02 GMT Resent-Message-Id: <201205140740.q4E7e2ST052444@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Zhihao Yuan Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 19561106566B for ; Mon, 14 May 2012 07:39:46 +0000 (UTC) (envelope-from lichray@gmail.com) Received: from mail-gg0-f182.google.com (mail-gg0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id BC6758FC0A for ; Mon, 14 May 2012 07:39:45 +0000 (UTC) Received: by ggnm2 with SMTP id m2so3645747ggn.13 for ; Mon, 14 May 2012 00:39:45 -0700 (PDT) Received: by 10.50.191.231 with SMTP id hb7mr3569777igc.26.1336981184769; Mon, 14 May 2012 00:39:44 -0700 (PDT) Received: from localhost (c-98-228-191-105.hsd1.il.comcast.net. [98.228.191.105]) by mx.google.com with ESMTPS id vp3sm17149414igb.3.2012.05.14.00.39.43 (version=SSLv3 cipher=OTHER); Mon, 14 May 2012 00:39:44 -0700 (PDT) Message-Id: <4fb0b6c0.a39a320a.70ca.1a57@mx.google.com> Date: Mon, 14 May 2012 00:39:44 -0700 (PDT) From: Zhihao Yuan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/167863: [UPDATE] chinese/fcitx-* to 4.2.3; chinese/sunpinyin to 2.0.4rc1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Zhihao Yuan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2012 07:40:02 -0000 >Number: 167863 >Category: ports >Synopsis: [UPDATE] chinese/fcitx-* to 4.2.3; chinese/sunpinyin to 2.0.4rc1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon May 14 07:40:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Zhihao Yuan >Release: FreeBSD 8.3-STABLE amd64 >Organization: Northern Illinois University >Environment: System: FreeBSD elitebook.hp 8.3-STABLE FreeBSD 8.3-STABLE #1 r235265: Fri May 11 07:06:26 CDT 2012 lichray@elitebook.hp:/usr/obj/usr/src/sys/HOUKAGO amd64 >Description: sunpinyin, fcitx-sunpinyin: sunpinyin-2.0.3 was released 15 months ago, and the version 2.0.4 appeared in git 10 months ago, but 2.0.4 is still not released yet. https://github.com/sunpinyin/sunpinyin However, fcitx-sunpinyin requires some features in 2.0.4, and that's why I made the patch-2.0.4-compatible. But now I think the git version is stable enough, so I packaged it personally. The distfile can be obtained from https://docs.google.com/open?id=0B5749ux4jowQZnJzNjc4aEFyMlE and I hope the committer who takes this PR can host the distfile (MASTER_SITES needs to be changed accordingly). fcitx: fcitx itself has a Japanese translation now. fcitx-configtool, fcitx-chewing, fcitx-keyboard: Just some regular updates. >How-To-Repeat: >Fix: --- fcitx_4.2.3_all.patch begins here --- diff -rupN chinese/sunpinyin.orig/Makefile chinese/sunpinyin/Makefile --- chinese/sunpinyin.orig/Makefile 2011-11-11 09:38:55.000000000 -0600 +++ chinese/sunpinyin/Makefile 2012-05-13 23:01:32.391285907 -0500 @@ -6,8 +6,7 @@ # PORTNAME= sunpinyin -PORTVERSION= 2.0.3 -PORTREVISION= 1 +DISTVERSION= 2.0.4rc1 CATEGORIES= chinese devel MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}:1 \ http://open-gram.googlecode.com/files/:2 @@ -27,6 +26,7 @@ BUILD_DEPENDS= pkg-config:${PORTSDIR}/de LICENSE_FILE_LGPL21= ${WRKSRC}/LGPL.LICENSE LICENSE_FILE_CDDL= ${WRKSRC}/OPENSOLARIS.LICENSE +USE_XZ= yes USE_SCONS= yes SCONS_ARGS+= --prefix=${PREFIX} --libdatadir=${PREFIX}/share USE_LDCONFIG= yes diff -rupN chinese/sunpinyin.orig/distinfo chinese/sunpinyin/distinfo --- chinese/sunpinyin.orig/distinfo 2011-11-10 20:46:15.000000000 -0600 +++ chinese/sunpinyin/distinfo 2012-05-13 23:02:48.233869513 -0500 @@ -1,6 +1,6 @@ -SHA256 (sunpinyin-2.0.3.tar.gz) = 4ab776e7563f69f8dbda8fac7cfaa42bd0db1ea68bab15f756094ce5398d83d1 -SIZE (sunpinyin-2.0.3.tar.gz) = 169394 -SHA256 (lm_sc.t3g.arpa.tar.bz2) = e66380518ba51c5c666babc09e91c253c8bb5809f6d853e9a56f0368f057659e -SIZE (lm_sc.t3g.arpa.tar.bz2) = 35959362 -SHA256 (dict.utf8.tar.bz2) = 42f8eb6e8e4de809022069f25ff82a20c09f43b705fa2946162a92960857c97c -SIZE (dict.utf8.tar.bz2) = 496006 +SHA256 (sunpinyin-2.0.4rc1.tar.xz) = e8d752ca3fdf475cb097e71dfae3fbf7e118c373a3ea98d3742fc12ae838594e +SIZE (sunpinyin-2.0.4rc1.tar.xz) = 969976 +SHA256 (lm_sc.t3g.arpa.tar.bz2) = 5fcbb6264befd03a75fad1301b8804a8df52972b2ea91045c7f2613904bbc6c7 +SIZE (lm_sc.t3g.arpa.tar.bz2) = 36280876 +SHA256 (dict.utf8.tar.bz2) = d0bcbc5b7005823e69c490a178d456d476069c640bf292028282e9a94d784418 +SIZE (dict.utf8.tar.bz2) = 583655 diff -rupN chinese/sunpinyin.orig/files/patch-2.0.4-compatible chinese/sunpinyin/files/patch-2.0.4-compatible --- chinese/sunpinyin.orig/files/patch-2.0.4-compatible 2011-11-11 09:38:55.000000000 -0600 +++ chinese/sunpinyin/files/patch-2.0.4-compatible 1969-12-31 18:00:00.000000000 -0600 @@ -1,88 +0,0 @@ ---- src/ime-core/imi_view_classic.h.orig 2011-02-17 21:39:52.000000000 -0600 -+++ src/ime-core/imi_view_classic.h 2011-11-10 23:00:20.374788681 -0600 -@@ -61,6 +61,9 @@ public: - virtual int onCandidatePageRequest(int pgno, bool relative); - virtual int onCandidateSelectRequest(int index); - -+ void makeSelection(int candiIdx, unsigned& mask); -+ void deleteCandidate(int candiIdx, unsigned& mask); -+ - private: - unsigned m_cursorFrIdx; - unsigned m_candiFrIdx; -@@ -75,8 +78,6 @@ private: - inline void _erase (bool backward, unsigned& mask); - - inline void _getCandidates (); -- inline void _makeSelection (int candiIdx, unsigned& mask); -- inline void _deleteCandidate (int candiIdx, unsigned& mask); - - inline void _commitChar (TWCHAR ch); - inline void _commitString (const wstring& wstr); ---- src/ime-core/imi_view_classic.cpp.orig 2011-02-17 21:39:52.000000000 -0600 -+++ src/ime-core/imi_view_classic.cpp 2011-11-10 23:01:01.213605402 -0600 -@@ -168,7 +168,7 @@ CIMIClassicView::onKeyEvent(const CKeyEv - !m_pIC->isEmpty ()) { - changeMasks |= KEYEVENT_USED; - unsigned sel = (keyvalue == '0'? 9: keyvalue-'1'); -- _deleteCandidate (sel, changeMasks); -+ deleteCandidate (sel, changeMasks); - goto PROCESSED; - - } else if ((modifiers & (IM_CTRL_MASK | IM_ALT_MASK | IM_SUPER_MASK | IM_RELEASE_MASK)) == 0) { -@@ -177,7 +177,7 @@ CIMIClassicView::onKeyEvent(const CKeyEv - if (!m_pIC->isEmpty ()) { - changeMasks |= KEYEVENT_USED; - unsigned sel = (keyvalue == '0'? 9: keyvalue-'1'); -- _makeSelection (sel, changeMasks); -+ makeSelection (sel, changeMasks); - } else { - m_numeric_mode = true; - } -@@ -216,7 +216,7 @@ CIMIClassicView::onKeyEvent(const CKeyEv - } else if (keycode == IM_VK_SPACE) { - if (!m_pIC->isEmpty ()) { - changeMasks |= KEYEVENT_USED; -- _makeSelection (0, changeMasks); -+ makeSelection (0, changeMasks); - } else { - wstring wstr = (m_pIC->fullPuncOp()) (keyvalue); - if (wstr.size()) { -@@ -327,7 +327,7 @@ CIMIClassicView::onCandidateSelectReques - unsigned changeMasks = 0; - - if (!m_pIC->isEmpty()) -- _makeSelection(index, changeMasks); -+ makeSelection(index, changeMasks); - - updateWindows(changeMasks); - return 0; -@@ -612,7 +612,7 @@ CIMIClassicView::_moveEnd (unsigned& mas - } - - void --CIMIClassicView::_makeSelection (int candiIdx, unsigned& mask) -+CIMIClassicView::makeSelection (int candiIdx, unsigned& mask) - { - candiIdx += m_candiPageFirst; - if (!m_tailSentence.empty ()) --candiIdx; -@@ -655,7 +655,7 @@ CIMIClassicView::_makeSelection (int can - } - - void --CIMIClassicView::_deleteCandidate (int candiIdx, unsigned& mask) -+CIMIClassicView::deleteCandidate (int candiIdx, unsigned& mask) - { - candiIdx += m_candiPageFirst; - if (!m_tailSentence.empty ()) --candiIdx; ---- src/ime-core/imi_view.h.orig 2011-02-17 21:39:52.000000000 -0600 -+++ src/ime-core/imi_view.h 2011-11-10 23:05:14.515633839 -0600 -@@ -188,7 +188,7 @@ public: - CIMIWinHandler* getWinHandler(void) {return m_pWinHandler;} - - void setHotkeyProfile (CHotkeyProfile *prof) { m_pHotkeyProfile = prof;} -- void setCandiWindowSize (unsigned size) {m_candiWindowSize = size<10? size: 10;} -+ void setCandiWindowSize (unsigned size) {m_candiWindowSize = size;} - CHotkeyProfile* getHotkeyProfile() { return m_pHotkeyProfile; } - unsigned getCandiWindowSize() { return m_candiWindowSize; } - diff -rupN chinese/sunpinyin.orig/files/patch-xdg chinese/sunpinyin/files/patch-xdg --- chinese/sunpinyin.orig/files/patch-xdg 2011-11-11 09:38:55.000000000 -0600 +++ chinese/sunpinyin/files/patch-xdg 2012-05-13 23:09:30.712288305 -0500 @@ -1,17 +1,24 @@ -diff -uNr src/ime-core/imi_options.cpp src/ime-core/imi_options.cpp ---- src/ime-core/imi_options.cpp 2010-09-22 13:14:32.876000000 +0800 -+++ src/ime-core/imi_options.cpp 2010-09-22 13:21:48.181000000 +0800 -@@ -73,8 +73,11 @@ +--- src/ime-core/imi_options.cpp~ 2012-05-13 22:55:19.000000000 -0500 ++++ src/ime-core/imi_options.cpp 2012-05-13 23:08:27.566965023 -0500 +@@ -73,12 +73,15 @@ CSimplifiedChinesePolicy::loadResources( if (!m_user_data_dir.size()) { char path[256]; -- const char *home = getenv ("HOME"); -- snprintf (path, sizeof(path), "%s/%s", home, SUNPINYIN_USERDATA_DIR_PREFIX); -+ const char *home = getenv ("XDG_CONFIG_HOME"); -+ if(home == NULL) -+ snprintf (path, sizeof(path), "%s/.config/%s", getenv("HOME"), SUNPINYIN_USERDATA_DIR_PREFIX); +- const char *home = getenv("HOME"); +- snprintf(path, +- sizeof(path), +- "%s/%s", +- home, +- SUNPINYIN_USERDATA_DIR_PREFIX); ++ const char *home = getenv("XDG_CONFIG_HOME"); ++ if (home == NULL) ++ snprintf(path, sizeof(path), ++ "%s/.config/%s", getenv("HOME"), ++ SUNPINYIN_USERDATA_DIR_PREFIX); + else -+ snprintf (path, sizeof(path), "%s/%s", home, SUNPINYIN_USERDATA_DIR_PREFIX); ++ snprintf(path, sizeof(path), ++ "%s/%s", home, ++ SUNPINYIN_USERDATA_DIR_PREFIX); m_user_data_dir = path; } @@ -27,3 +34,4 @@ diff -uNr src/ime-core/imi_options.h src #endif struct CSimplifiedChinesePolicy : public IConfigurable + diff -rupN chinese/sunpinyin.orig/pkg-plist chinese/sunpinyin/pkg-plist --- chinese/sunpinyin.orig/pkg-plist 2011-11-10 20:46:15.000000000 -0600 +++ chinese/sunpinyin/pkg-plist 2012-05-13 23:12:58.267628511 -0500 @@ -3,10 +3,12 @@ include/sunpinyin-2.0/ime-core/imi_conte include/sunpinyin-2.0/ime-core/imi_data.h include/sunpinyin-2.0/ime-core/imi_defines.h include/sunpinyin-2.0/ime-core/imi_funcobjs.h +include/sunpinyin-2.0/ime-core/imi_glibHandler.h include/sunpinyin-2.0/ime-core/imi_keys.h include/sunpinyin-2.0/ime-core/imi_option_event.h include/sunpinyin-2.0/ime-core/imi_option_keys.h include/sunpinyin-2.0/ime-core/imi_options.h +include/sunpinyin-2.0/ime-core/imi_plugin.h include/sunpinyin-2.0/ime-core/imi_uiobjects.h include/sunpinyin-2.0/ime-core/imi_view.h include/sunpinyin-2.0/ime-core/imi_view_classic.h diff -rupN chinese/fcitx.orig/Makefile chinese/fcitx/Makefile --- chinese/fcitx.orig/Makefile 2012-04-30 17:57:37.000000000 -0500 +++ chinese/fcitx/Makefile 2012-05-14 00:15:21.107857402 -0500 @@ -6,7 +6,7 @@ # PORTNAME= fcitx -PORTVERSION= 4.2.2 +PORTVERSION= 4.2.3 CATEGORIES= chinese x11 MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz diff -rupN chinese/fcitx.orig/distinfo chinese/fcitx/distinfo --- chinese/fcitx.orig/distinfo 2012-04-30 17:57:37.000000000 -0500 +++ chinese/fcitx/distinfo 2012-05-14 00:15:31.971085141 -0500 @@ -1,5 +1,5 @@ -SHA256 (fcitx/fcitx-4.2.2.tar.xz) = 1d18096232a700ddcf059e737b6acb2b292e5a4ae5d4bc2714e4f599e4e6daa6 -SIZE (fcitx/fcitx-4.2.2.tar.xz) = 585936 +SHA256 (fcitx/fcitx-4.2.3.tar.xz) = 4b7d22ada50f7e375096094c2abcf09ad114ffb68521ccf0de37d71e1014183c +SIZE (fcitx/fcitx-4.2.3.tar.xz) = 612028 SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 SIZE (fcitx/pinyin.tar.gz) = 1608886 SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7 diff -rupN chinese/fcitx.orig/pkg-plist chinese/fcitx/pkg-plist --- chinese/fcitx.orig/pkg-plist 2012-04-30 17:57:37.000000000 -0500 +++ chinese/fcitx/pkg-plist 2012-05-14 00:17:31.296580932 -0500 @@ -109,6 +109,7 @@ share/cmake/fcitx/FcitxMacro.cmake %%DATADIR%%/data/AutoEng.dat %%DATADIR%%/data/gbks2t.tab %%DATADIR%%/data/punc.mb.zh_CN +%%DATADIR%%/data/punc.mb.zh_HK %%DATADIR%%/data/punc.mb.zh_TW %%DATADIR%%/data/vk.conf %%DATADIR%%/inputmethod/pinyin.conf @@ -295,6 +296,7 @@ share/icons/hicolor/scalable/status/fcit share/icons/hicolor/scalable/status/fcitx-punc-inactive.svg share/icons/hicolor/scalable/status/fcitx-vk-active.svg share/icons/hicolor/scalable/status/fcitx-vk-inactive.svg +share/locale/ja/LC_MESSAGES/fcitx.mo share/locale/zh_CN/LC_MESSAGES/fcitx.mo share/locale/zh_TW/LC_MESSAGES/fcitx.mo share/mime/packages/x-fskin.xml diff -rupN chinese/fcitx-chewing.orig/Makefile chinese/fcitx-chewing/Makefile --- chinese/fcitx-chewing.orig/Makefile 2012-02-08 19:02:07.000000000 -0600 +++ chinese/fcitx-chewing/Makefile 2012-05-14 02:01:02.687509771 -0500 @@ -6,7 +6,7 @@ # PORTNAME= fcitx-chewing -PORTVERSION= 0.1.0 +PORTVERSION= 0.1.2 CATEGORIES= chinese MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DIST_SUBDIR= fcitx @@ -17,7 +17,7 @@ COMMENT= Chewing support for Fcitx LIB_DEPENDS= fcitx-config.4:${PORTSDIR}/chinese/fcitx \ chewing.3:${PORTSDIR}/chinese/libchewing -USE_BZIP2= yes +USE_XZ= yes USE_GETTEXT= yes USE_CMAKE= yes USE_GNOME= intltool diff -rupN chinese/fcitx-chewing.orig/distinfo chinese/fcitx-chewing/distinfo --- chinese/fcitx-chewing.orig/distinfo 2012-02-07 15:03:14.000000000 -0600 +++ chinese/fcitx-chewing/distinfo 2012-05-14 02:02:10.103926967 -0500 @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx-chewing-0.1.0.tar.bz2) = 6b9f7bb00fc1d8b7a5f888589665f185b906b83a68d630605cb0cc649f2a2352 -SIZE (fcitx/fcitx-chewing-0.1.0.tar.bz2) = 15867 +SHA256 (fcitx/fcitx-chewing-0.1.2.tar.xz) = d7e44f76a69c34c9c5e27fc2dd97e52290e8efe28ca008899735f992bbdcc5d2 +SIZE (fcitx/fcitx-chewing-0.1.2.tar.xz) = 15120 diff -rupN chinese/fcitx-chewing.orig/pkg-descr chinese/fcitx-chewing/pkg-descr --- chinese/fcitx-chewing.orig/pkg-descr 2012-02-07 15:03:14.000000000 -0600 +++ chinese/fcitx-chewing/pkg-descr 2012-05-14 02:01:47.739456608 -0500 @@ -1,4 +1,4 @@ fcitx-chewing provides Chewing, an intelligent phonetic input method -engine, as a back-end to the Fcitx IM server. +engine, as a back-end to the Fcitx IM framework. WWW: http://code.google.com/p/fcitx/ diff -rupN chinese/fcitx-configtool.orig/Makefile chinese/fcitx-configtool/Makefile --- chinese/fcitx-configtool.orig/Makefile 2012-04-30 17:57:38.000000000 -0500 +++ chinese/fcitx-configtool/Makefile 2012-05-14 00:21:54.654078095 -0500 @@ -6,7 +6,7 @@ # PORTNAME= fcitx-configtool -PORTVERSION= 0.4.2 +PORTVERSION= 0.4.3 CATEGORIES= chinese x11 MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DIST_SUBDIR= fcitx diff -rupN chinese/fcitx-configtool.orig/distinfo chinese/fcitx-configtool/distinfo --- chinese/fcitx-configtool.orig/distinfo 2012-04-30 17:57:38.000000000 -0500 +++ chinese/fcitx-configtool/distinfo 2012-05-14 00:22:02.745246908 -0500 @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx-configtool-0.4.2.tar.xz) = 98e1c14c3737e13a6340eb093f7f5391e4cd973e147aec8c9e49f41b3a1904b7 -SIZE (fcitx/fcitx-configtool-0.4.2.tar.xz) = 33724 +SHA256 (fcitx/fcitx-configtool-0.4.3.tar.xz) = 0b8722da441acd3deb841f6b389b02499bc99f61a711ce57ad0cccae359a53b9 +SIZE (fcitx/fcitx-configtool-0.4.3.tar.xz) = 34792 diff -rupN chinese/fcitx-configtool.orig/files/patch-gtk3_CMakeLists.txt chinese/fcitx-configtool/files/patch-gtk3_CMakeLists.txt --- chinese/fcitx-configtool.orig/files/patch-gtk3_CMakeLists.txt 2012-02-07 14:57:07.000000000 -0600 +++ chinese/fcitx-configtool/files/patch-gtk3_CMakeLists.txt 2012-05-14 01:55:25.798434047 -0500 @@ -1,10 +1,9 @@ ---- gtk3/CMakeLists.txt~ 2012-01-30 04:51:25.000000000 -0600 -+++ gtk3/CMakeLists.txt 2012-02-06 03:22:50.184481579 -0600 -@@ -45,6 +45,7 @@ target_link_libraries (fcitx-config-gtk3 - ${FCITX4_FCITX_CONFIG_LIBRARIES} +--- gtk3/CMakeLists.txt~ 2012-05-03 01:21:57.000000000 -0500 ++++ gtk3/CMakeLists.txt 2012-05-14 01:55:09.806098826 -0500 +@@ -42,5 +42,6 @@ target_link_libraries (fcitx-config-gtk3 ${FCITX4_FCITX_LIBRARIES} + ${GLIB2_LIBRARIES} ${GIO2_LIBRARIES} -+ -lintl ++ -lintl ) - if (UNIQUE3_FOUND) diff -rupN chinese/fcitx-configtool.orig/files/patch-gtk_CMakeLists.txt chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt --- chinese/fcitx-configtool.orig/files/patch-gtk_CMakeLists.txt 2012-02-07 14:57:07.000000000 -0600 +++ chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt 2012-05-14 01:56:18.122533133 -0500 @@ -1,10 +1,10 @@ ---- gtk/CMakeLists.txt~ 2012-01-30 04:51:25.000000000 -0600 -+++ gtk/CMakeLists.txt 2012-02-06 03:19:28.808521532 -0600 -@@ -44,6 +44,7 @@ target_link_libraries (fcitx-config-gtk - ${FCITX4_FCITX_CONFIG_LIBRARIES} +--- gtk/CMakeLists.txt~ 2012-05-03 01:21:57.000000000 -0500 ++++ gtk/CMakeLists.txt 2012-05-14 01:56:06.761294523 -0500 +@@ -49,6 +49,7 @@ target_link_libraries (fcitx-config-gtk ${FCITX4_FCITX_LIBRARIES} - ${GIO2_LIBRARIES} -+ -lintl + ${GLIB2_LIBRARIES} + ${DBUS_GLIB_LIBRARIES} ++ -lintl ) if (UNIQUE_FOUND) diff -rupN textproc/fcitx-keyboard.orig/Makefile textproc/fcitx-keyboard/Makefile --- textproc/fcitx-keyboard.orig/Makefile 2012-04-30 17:57:37.000000000 -0500 +++ textproc/fcitx-keyboard/Makefile 2012-05-14 02:07:57.595231697 -0500 @@ -6,7 +6,7 @@ # PORTNAME= fcitx-keyboard -PORTVERSION= 0.1.2 +PORTVERSION= 0.1.3 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DIST_SUBDIR= fcitx diff -rupN textproc/fcitx-keyboard.orig/distinfo textproc/fcitx-keyboard/distinfo --- textproc/fcitx-keyboard.orig/distinfo 2012-04-30 17:57:37.000000000 -0500 +++ textproc/fcitx-keyboard/distinfo 2012-05-14 02:08:07.137431578 -0500 @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx-keyboard-0.1.2.tar.xz) = de62e60f9a2e23836885f893f8c475b02ce5c6b93fcc8af7ec5b626a1c0b0a95 -SIZE (fcitx/fcitx-keyboard-0.1.2.tar.xz) = 42060 +SHA256 (fcitx/fcitx-keyboard-0.1.3.tar.xz) = 3df3bc35eb1cb564a29fb71b4fef441c95432766b686514374805b841cbca3ef +SIZE (fcitx/fcitx-keyboard-0.1.3.tar.xz) = 42588 diff -rupN chinese/fcitx-sunpinyin.orig/Makefile chinese/fcitx-sunpinyin/Makefile --- chinese/fcitx-sunpinyin.orig/Makefile 2012-04-30 17:57:38.000000000 -0500 +++ chinese/fcitx-sunpinyin/Makefile 2012-05-14 02:04:41.705112329 -0500 @@ -6,7 +6,7 @@ # PORTNAME= fcitx-sunpinyin -PORTVERSION= 0.3.5 +PORTVERSION= 0.3.6 CATEGORIES= chinese MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DIST_SUBDIR= fcitx diff -rupN chinese/fcitx-sunpinyin.orig/distinfo chinese/fcitx-sunpinyin/distinfo --- chinese/fcitx-sunpinyin.orig/distinfo 2012-04-30 17:57:38.000000000 -0500 +++ chinese/fcitx-sunpinyin/distinfo 2012-05-14 02:04:46.735218999 -0500 @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx-sunpinyin-0.3.5.tar.xz) = 932b74eafb86f9051400a311c4da09ad4888190015e667eea3c4019934f67b62 -SIZE (fcitx/fcitx-sunpinyin-0.3.5.tar.xz) = 40248 +SHA256 (fcitx/fcitx-sunpinyin-0.3.6.tar.xz) = 6ed029860fe8df1e39bf8f36ada4473a94467887614e103d5832fd8a09cfa6a6 +SIZE (fcitx/fcitx-sunpinyin-0.3.6.tar.xz) = 40348 diff -rupN chinese/fcitx-sunpinyin.orig/files/patch-cmake_FindSunpinyin.cmake chinese/fcitx-sunpinyin/files/patch-cmake_FindSunpinyin.cmake --- chinese/fcitx-sunpinyin.orig/files/patch-cmake_FindSunpinyin.cmake 2012-04-30 17:57:38.000000000 -0500 +++ chinese/fcitx-sunpinyin/files/patch-cmake_FindSunpinyin.cmake 1969-12-31 18:00:00.000000000 -0600 @@ -1,11 +0,0 @@ ---- cmake/FindSunpinyin.cmake~ 2012-03-04 21:43:53.000000000 -0600 -+++ cmake/FindSunpinyin.cmake 2012-04-06 02:14:47.564463773 -0500 -@@ -16,7 +16,7 @@ if(SUNPINYIN_INCLUDE_DIR AND SUNPINYIN_L - endif(SUNPINYIN_INCLUDE_DIR AND SUNPINYIN_LIBRARIES) - - find_package(PkgConfig REQUIRED) --pkg_check_modules(PC_LIBSUNPINYIN "sunpinyin-2.0 >= 2.0.4") -+pkg_check_modules(PC_LIBSUNPINYIN "sunpinyin-2.0 >= 2.0.3") - - find_path(SUNPINYIN_MAIN_INCLUDE_DIR - NAMES sunpinyin.h --- fcitx_4.2.3_all.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: