Date: Wed, 19 Sep 2012 07:01:25 +0000 (UTC) From: Wen Heping <wen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304478 - in head/chinese/fcitx: . files Message-ID: <201209190701.q8J71P0S044050@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wen Date: Wed Sep 19 07:01:24 2012 New Revision: 304478 URL: http://svn.freebsd.org/changeset/ports/304478 Log: - Update to 4.2.6 PR: 171608 Submitted by: Zhihao Yuan <lichray@gmail.com> (maintainer) Added: head/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxclient.c (contents, props changed) Deleted: head/chinese/fcitx/files/patch-data_CMakeLists.txt head/chinese/fcitx/files/patch-data_script_CMakeLists.txt head/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxinputmethod.c head/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxkbd.c head/chinese/fcitx/files/patch-src_lib_fcitx-utils_utils.c head/chinese/fcitx/files/patch-src_lib_fcitx_instance-internal.h head/chinese/fcitx/files/patch-src_module_unicode_charselectdata.c Modified: head/chinese/fcitx/Makefile head/chinese/fcitx/distinfo head/chinese/fcitx/files/pkg-message.in head/chinese/fcitx/pkg-plist Modified: head/chinese/fcitx/Makefile ============================================================================== --- head/chinese/fcitx/Makefile Wed Sep 19 04:38:13 2012 (r304477) +++ head/chinese/fcitx/Makefile Wed Sep 19 07:01:24 2012 (r304478) @@ -6,10 +6,11 @@ # PORTNAME= fcitx -PORTVERSION= 4.2.5 +PORTVERSION= 4.2.6 CATEGORIES= chinese x11 MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + pinyin.tar.gz table.tar.gz en_dict-${_DICT_VER}.tar.gz DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -21,7 +22,6 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ dbus-1:${PORTSDIR}/devel/dbus \ - enchant:${PORTSDIR}/textproc/enchant \ icuuc:${PORTSDIR}/devel/icu RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils @@ -50,6 +50,8 @@ TPUNC_DESC= Use traditional quotation ma .include <bsd.port.options.mk> +CMAKE_ARGS+= -DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON + .if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 PLIST_SUB+= GTK2="" @@ -101,9 +103,12 @@ EXTRA_PATCHES+= ${FILESDIR}/nodocs-doc_C IGNORE= code tables are required, undefine NOPORTDATA .endif +_DICT_VER= 20120815 + post-patch: @${CP} ${_DISTDIR}/pinyin.tar.gz ${WRKSRC}/data @${CP} ${_DISTDIR}/table.tar.gz ${WRKSRC}/data/table + @${CP} ${_DISTDIR}/en_dict-${_DICT_VER}.tar.gz ${WRKSRC}/data .if ${OSVERSION} < 800067 # getline() is GNU extension which FreeBSD only recently adopted EXTRA_PATCHES+= ${FILESDIR}/getline-src_lib_fcitx-utils_utils.c \ Modified: head/chinese/fcitx/distinfo ============================================================================== --- head/chinese/fcitx/distinfo Wed Sep 19 04:38:13 2012 (r304477) +++ head/chinese/fcitx/distinfo Wed Sep 19 07:01:24 2012 (r304478) @@ -1,6 +1,8 @@ -SHA256 (fcitx/fcitx-4.2.5.tar.xz) = 478d311d3427e255729671f3a461762348bf5d83ed694d78021012778047140a -SIZE (fcitx/fcitx-4.2.5.tar.xz) = 1413724 +SHA256 (fcitx/fcitx-4.2.6.tar.xz) = 13479bca8d7f420f486f1e2ea733dc9a0060f18c0f08b415c3c56694f2fd775e +SIZE (fcitx/fcitx-4.2.6.tar.xz) = 1439664 SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 SIZE (fcitx/pinyin.tar.gz) = 1608886 SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7 SIZE (fcitx/table.tar.gz) = 4144686 +SHA256 (fcitx/en_dict-20120815.tar.gz) = a73c989eae586a681a0e64bd7e8a43d45fc6dfbfd45b98e4b83f715a87639945 +SIZE (fcitx/en_dict-20120815.tar.gz) = 679983 Added: head/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxclient.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxclient.c Wed Sep 19 07:01:24 2012 (r304478) @@ -0,0 +1,17 @@ +--- 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 { Modified: head/chinese/fcitx/files/pkg-message.in ============================================================================== --- head/chinese/fcitx/files/pkg-message.in Wed Sep 19 04:38:13 2012 (r304477) +++ head/chinese/fcitx/files/pkg-message.in Wed Sep 19 07:01:24 2012 (r304478) @@ -23,7 +23,4 @@ To start fcitx with your desktop, just cp %%PREFIX%%/share/applications/fcitx.desktop \ ~/.config/autostart/ -if your desktop environment is XDG-compatible. Otherwise, you have to -make sure fcitx is started AFTER dbus-launch. - ************************************************************************ Modified: head/chinese/fcitx/pkg-plist ============================================================================== --- head/chinese/fcitx/pkg-plist Wed Sep 19 04:38:13 2012 (r304477) +++ head/chinese/fcitx/pkg-plist Wed Sep 19 07:01:24 2012 (r304478) @@ -1,6 +1,7 @@ bin/createPYMB bin/fcitx bin/fcitx-configtool +bin/fcitx-dbus-watcher bin/fcitx-remote bin/fcitx-skin-installer bin/fcitx4-config @@ -13,11 +14,12 @@ bin/txt2mb include/fcitx-config/fcitx-config.h include/fcitx-config/hotkey.h include/fcitx-config/xdg.h -include/fcitx-gclient/fcitxkbd.h include/fcitx-gclient/fcitxclient.h include/fcitx-gclient/fcitxinputmethod.h -include/fcitx-utils/keysymgen.h +include/fcitx-gclient/fcitxkbd.h +include/fcitx-utils/bitset.h include/fcitx-utils/keysym.h +include/fcitx-utils/keysymgen.h include/fcitx-utils/log.h include/fcitx-utils/memory.h include/fcitx-utils/utarray.h @@ -42,6 +44,7 @@ include/fcitx/module/ipc/ipc.h include/fcitx/module/pinyin/pydef.h include/fcitx/module/punc/punc.h include/fcitx/module/quickphrase/quickphrase.h +include/fcitx/module/spell/spell.h include/fcitx/module/x11/x11stuff.h include/fcitx/profile.h include/fcitx/ui.h @@ -50,15 +53,17 @@ lib/fcitx/fcitx-chttrans.so lib/fcitx/fcitx-classic-ui.so lib/fcitx/fcitx-dbus.so lib/fcitx/fcitx-fullwidth-char.so -lib/fcitx/fcitx-keyboard.so lib/fcitx/fcitx-imselector.so lib/fcitx/fcitx-ipc.so +lib/fcitx/fcitx-keyboard.so lib/fcitx/fcitx-kimpanel-ui.so +lib/fcitx/fcitx-pinyin-enhance.so lib/fcitx/fcitx-pinyin.so lib/fcitx/fcitx-punc.so lib/fcitx/fcitx-quickphrase.so lib/fcitx/fcitx-qw.so lib/fcitx/fcitx-remote-module.so +lib/fcitx/fcitx-spell.so lib/fcitx/fcitx-table.so lib/fcitx/fcitx-unicode.so lib/fcitx/fcitx-vk.so @@ -99,10 +104,10 @@ share/applications/fcitx.desktop share/cmake/fcitx/FcitxConfig.cmake share/cmake/fcitx/FcitxConfigVersion.cmake share/cmake/fcitx/FcitxMacro.cmake +share/cmake/fcitx/getdescpo %%PORTDOCS%%%%DOCSDIR%%/API.txt %%PORTDOCS%%%%DOCSDIR%%/Develop_Readme %%PORTDOCS%%%%DOCSDIR%%/cjkvinput.txt -%%PORTDOCS%%%%DOCSDIR%%/disable-table.conf.template %%PORTDOCS%%%%DOCSDIR%%/pinyin.txt %%PORTDOCS%%%%DOCSDIR%%/wb_fh.htm %%DATADIR%%/addon/fcitx-autoeng.conf @@ -114,11 +119,13 @@ share/cmake/fcitx/FcitxMacro.cmake %%DATADIR%%/addon/fcitx-ipc.conf %%DATADIR%%/addon/fcitx-keyboard.conf %%DATADIR%%/addon/fcitx-kimpanel-ui.conf +%%DATADIR%%/addon/fcitx-pinyin-enhance.conf %%DATADIR%%/addon/fcitx-pinyin.conf %%DATADIR%%/addon/fcitx-punc.conf %%DATADIR%%/addon/fcitx-quickphrase.conf %%DATADIR%%/addon/fcitx-qw.conf %%DATADIR%%/addon/fcitx-remote-module.conf +%%DATADIR%%/addon/fcitx-spell.conf %%DATADIR%%/addon/fcitx-table.conf %%DATADIR%%/addon/fcitx-unicode.conf %%DATADIR%%/addon/fcitx-vk.conf @@ -128,12 +135,15 @@ share/cmake/fcitx/FcitxMacro.cmake %%DATADIR%%/addon/fcitx-xkbdbus.conf %%DATADIR%%/configdesc/addon.desc %%DATADIR%%/configdesc/config.desc +%%DATADIR%%/configdesc/fcitx-autoeng.desc %%DATADIR%%/configdesc/fcitx-chttrans.desc %%DATADIR%%/configdesc/fcitx-classic-ui.desc %%DATADIR%%/configdesc/fcitx-imselector.desc %%DATADIR%%/configdesc/fcitx-keyboard.desc +%%DATADIR%%/configdesc/fcitx-pinyin-enhance.desc %%DATADIR%%/configdesc/fcitx-pinyin.desc %%DATADIR%%/configdesc/fcitx-quickphrase.desc +%%DATADIR%%/configdesc/fcitx-spell.desc %%DATADIR%%/configdesc/fcitx-table.desc %%DATADIR%%/configdesc/fcitx-unicode.desc %%DATADIR%%/configdesc/fcitx-xim.desc @@ -144,18 +154,20 @@ share/cmake/fcitx/FcitxMacro.cmake %%DATADIR%%/configdesc/table.desc %%DATADIR%%/data/AutoEng.dat %%DATADIR%%/data/charselectdata +%%DATADIR%%/data/en_dict.fscd %%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%%/imicon/wbpy.png -%%DATADIR%%/imicon/ziranma.png +%%DATADIR%%/dbus/daemon.conf +%%DATADIR%%/imicon/cangjie.png %%DATADIR%%/imicon/erbi.png -%%DATADIR%%/imicon/wubi.png -%%DATADIR%%/imicon/shuangpin.png %%DATADIR%%/imicon/pinyin.png -%%DATADIR%%/imicon/cangjie.png +%%DATADIR%%/imicon/shuangpin.png +%%DATADIR%%/imicon/wbpy.png +%%DATADIR%%/imicon/wubi.png +%%DATADIR%%/imicon/ziranma.png %%DATADIR%%/inputmethod/pinyin.conf %%DATADIR%%/inputmethod/qw.conf %%DATADIR%%/inputmethod/shuangpin.conf @@ -358,6 +370,7 @@ share/mime/packages/x-fskin.xml @dirrm %%DATADIR%%/pinyin @dirrm %%DATADIR%%/inputmethod @dirrm %%DATADIR%%/imicon +@dirrm %%DATADIR%%/dbus @dirrm %%DATADIR%%/data @dirrm %%DATADIR%%/configdesc @dirrm %%DATADIR%%/addon @@ -366,16 +379,17 @@ share/mime/packages/x-fskin.xml @dirrm share/cmake/fcitx @dirrm lib/fcitx @dirrm include/fcitx/module/x11 +@dirrm include/fcitx/module/spell @dirrm include/fcitx/module/quickphrase @dirrm include/fcitx/module/punc @dirrm include/fcitx/module/pinyin @dirrm include/fcitx/module/ipc -@dirrm include/fcitx-gclient @dirrm include/fcitx/module/dbus @dirrm include/fcitx/module/classicui @dirrm include/fcitx/module/chttrans @dirrm include/fcitx/module @dirrm include/fcitx-utils +@dirrm include/fcitx-gclient @dirrm include/fcitx-config @dirrm include/fcitx @dirrmtry lib/girepository-1.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209190701.q8J71P0S044050>