ports/171608: [UPDATE] fcitx to 4.2.6 along with its addons
Zhihao Yuan
lichray at gmail.com
Thu Sep 13 13:30:02 UTC 2012
>Number: 171608
>Category: ports
>Synopsis: [UPDATE] fcitx to 4.2.6 along with its addons
>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: Thu Sep 13 13:30: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 #4 r240363: Tue Sep 11 10:40:15 CDT 2012 lichray at elitebook.hp:/usr/obj/usr/src/sys/HOUKAGO amd64
>Description:
The upstream merged many patches this time.
The patch updates the following ports:
chinese/fcitx (now it starts dbus session internally).
chinese/fcitx-configtool
chinese/fcitx-sunpinyin
chinese/fcitx-cloudpinyin
chinese/fcitx-chewing
chinese/fcitx-table-extra
japanese/fcitx-anthy
Changes:
https://www.csslayer.info/wordpress/diary/fcitx-4-2-6/
>How-To-Repeat:
>Fix:
--- fcitx_4.2.6_svn.diff begins here ---
Index: chinese/fcitx-sunpinyin/files/patch-data_CMakeLists.txt
===================================================================
--- chinese/fcitx-sunpinyin/files/patch-data_CMakeLists.txt (revision 304190)
+++ chinese/fcitx-sunpinyin/files/patch-data_CMakeLists.txt (working copy)
@@ -1,13 +0,0 @@
-diff data/CMakeLists.txt.orig data/CMakeLists.txt
-index d5e9ae1..9c05fce 100644
---- data/CMakeLists.txt.orig
-+++ data/CMakeLists.txt
-@@ -9,3 +9,5 @@ endforeach(size 16 22 24 32 48 128)
- install(FILES sunpinyin-logo-22.png DESTINATION share/fcitx/skin/dark RENAME sunpinyin.png)
- install(FILES sunpinyin-logo-16.png DESTINATION share/fcitx/skin/default RENAME sunpinyin.png)
- install(FILES sunpinyin-logo-16.png DESTINATION share/fcitx/skin/classic RENAME sunpinyin.png)
-+
-+install(FILES sunpinyin-logo-48.png DESTINATION share/fcitx/imicon RENAME sunpinyin.png)
---
-1.7.10
-
Index: chinese/fcitx-sunpinyin/Makefile
===================================================================
--- chinese/fcitx-sunpinyin/Makefile (revision 304197)
+++ chinese/fcitx-sunpinyin/Makefile (working copy)
@@ -6,7 +6,7 @@
#
PORTNAME= fcitx-sunpinyin
-PORTVERSION= 0.3.8
+PORTVERSION= 0.3.9
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
Index: chinese/fcitx-sunpinyin/distinfo
===================================================================
--- chinese/fcitx-sunpinyin/distinfo (revision 304197)
+++ chinese/fcitx-sunpinyin/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-sunpinyin-0.3.8.tar.xz) = 7a65087f9cc9136d5a64006f2d2a34fe81b3ac6e73f25326a62f5013d996431b
-SIZE (fcitx/fcitx-sunpinyin-0.3.8.tar.xz) = 41376
+SHA256 (fcitx/fcitx-sunpinyin-0.3.9.tar.xz) = 7bf5f70c3653b5aebbbde96fd731ecbbce74cfd4d211620a5156b2700a63e47e
+SIZE (fcitx/fcitx-sunpinyin-0.3.9.tar.xz) = 41268
Index: chinese/fcitx-cloudpinyin/Makefile
===================================================================
--- chinese/fcitx-cloudpinyin/Makefile (revision 304197)
+++ chinese/fcitx-cloudpinyin/Makefile (working copy)
@@ -6,7 +6,7 @@
#
PORTNAME= fcitx-cloudpinyin
-PORTVERSION= 0.2.3
+PORTVERSION= 0.3.0
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
Index: chinese/fcitx-cloudpinyin/distinfo
===================================================================
--- chinese/fcitx-cloudpinyin/distinfo (revision 304197)
+++ chinese/fcitx-cloudpinyin/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-cloudpinyin-0.2.3.tar.xz) = 01a97c975e2485831d47bb9648f724683a89facba53d8d127bff950e61a77dff
-SIZE (fcitx/fcitx-cloudpinyin-0.2.3.tar.xz) = 18636
+SHA256 (fcitx/fcitx-cloudpinyin-0.3.0.tar.xz) = a68f27d9785bb1e31610424acb81faa933bfe9b7e93140c9895cd34987547b84
+SIZE (fcitx/fcitx-cloudpinyin-0.3.0.tar.xz) = 19344
Index: chinese/fcitx-cloudpinyin/files/patch-CMakeLists.txt
===================================================================
--- chinese/fcitx-cloudpinyin/files/patch-CMakeLists.txt (revision 0)
+++ chinese/fcitx-cloudpinyin/files/patch-CMakeLists.txt (working copy)
@@ -0,0 +1,8 @@
+--- CMakeLists.txt~ 2012-09-12 09:00:12.000000000 -0500
++++ CMakeLists.txt 2012-09-13 07:26:56.469619000 -0500
+@@ -33,4 +33,3 @@ enable_testing()
+
+ add_subdirectory(src)
+ add_subdirectory(po)
+-add_subdirectory(test)
+\ No newline at end of file
Index: chinese/fcitx/pkg-plist
===================================================================
--- chinese/fcitx/pkg-plist (revision 304202)
+++ chinese/fcitx/pkg-plist (working copy)
@@ -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 @@
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-gclient/fcitxkbd.h
+include/fcitx-utils/bitset.h
+include/fcitx-utils/keysym.h
include/fcitx-utils/keysymgen.h
-include/fcitx-utils/keysym.h
include/fcitx-utils/log.h
include/fcitx-utils/memory.h
include/fcitx-utils/utarray.h
@@ -42,6 +44,7 @@
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-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/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 @@
%%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 @@
%%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 @@
%%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%%/dbus/daemon.conf
+%%DATADIR%%/imicon/cangjie.png
+%%DATADIR%%/imicon/erbi.png
+%%DATADIR%%/imicon/pinyin.png
+%%DATADIR%%/imicon/shuangpin.png
%%DATADIR%%/imicon/wbpy.png
+%%DATADIR%%/imicon/wubi.png
%%DATADIR%%/imicon/ziranma.png
-%%DATADIR%%/imicon/erbi.png
-%%DATADIR%%/imicon/wubi.png
-%%DATADIR%%/imicon/shuangpin.png
-%%DATADIR%%/imicon/pinyin.png
-%%DATADIR%%/imicon/cangjie.png
%%DATADIR%%/inputmethod/pinyin.conf
%%DATADIR%%/inputmethod/qw.conf
%%DATADIR%%/inputmethod/shuangpin.conf
@@ -358,6 +370,7 @@
@dirrm %%DATADIR%%/pinyin
@dirrm %%DATADIR%%/inputmethod
@dirrm %%DATADIR%%/imicon
+ at dirrm %%DATADIR%%/dbus
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%/configdesc
@dirrm %%DATADIR%%/addon
@@ -366,16 +379,17 @@
@dirrm share/cmake/fcitx
@dirrm lib/fcitx
@dirrm include/fcitx/module/x11
+ at 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
- at 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
+ at dirrm include/fcitx-gclient
@dirrm include/fcitx-config
@dirrm include/fcitx
@dirrmtry lib/girepository-1.0
Index: chinese/fcitx/Makefile
===================================================================
--- chinese/fcitx/Makefile (revision 304202)
+++ chinese/fcitx/Makefile (working copy)
@@ -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 @@
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 @@
.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 @@
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 \
Index: chinese/fcitx/distinfo
===================================================================
--- chinese/fcitx/distinfo (revision 304202)
+++ chinese/fcitx/distinfo (working copy)
@@ -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
Index: chinese/fcitx/files/patch-data_script_CMakeLists.txt
===================================================================
--- chinese/fcitx/files/patch-data_script_CMakeLists.txt (revision 304190)
+++ chinese/fcitx/files/patch-data_script_CMakeLists.txt (working copy)
@@ -1,11 +0,0 @@
---- data/script/CMakeLists.txt~ 2012-07-17 15:21:04.000000000 -0500
-+++ data/script/CMakeLists.txt 2012-07-18 03:16:21.077945464 -0500
-@@ -2,7 +2,3 @@ install(FILES fcitx-configtool DESTINATI
-
- configure_file(fcitx4-config.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx4-config)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx4-config DESTINATION ${bindir} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
--
--if (_ENABLE_DBUS)
--install(FILES fcitx-autostart DESTINATION ${bindir} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
--endif (_ENABLE_DBUS)
-\ No newline at end of file
Index: chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxinputmethod.c
===================================================================
--- chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxinputmethod.c (revision 304190)
+++ chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxinputmethod.c (working copy)
@@ -1,16 +0,0 @@
---- src/lib/fcitx-gclient/fcitxinputmethod.c~ 2012-07-17 15:21:04.000000000 -0500
-+++ src/lib/fcitx-gclient/fcitxinputmethod.c 2012-07-18 00:24:39.533453747 -0500
-@@ -58,11 +58,11 @@ enum {
-
- static guint signals[LAST_SIGNAL] = {0};
-
--G_DEFINE_TYPE(FcitxInputMethod, fcitx_input_method, G_TYPE_DBUS_PROXY);
--
- FCITX_EXPORT_API
- GType fcitx_input_method_get_type(void) G_GNUC_CONST;
-
-+G_DEFINE_TYPE(FcitxInputMethod, fcitx_input_method, G_TYPE_DBUS_PROXY);
-+
- static GDBusInterfaceInfo * _fcitx_input_method_get_interface_info(void);
- static void _fcitx_im_item_foreach_cb(gpointer data, gpointer user_data);
-
Index: chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxkbd.c
===================================================================
--- chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxkbd.c (revision 304190)
+++ chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxkbd.c (working copy)
@@ -1,16 +0,0 @@
---- src/lib/fcitx-gclient/fcitxkbd.c~ 2012-07-17 15:21:04.000000000 -0500
-+++ src/lib/fcitx-gclient/fcitxkbd.c 2012-07-18 00:25:05.368996486 -0500
-@@ -45,11 +45,11 @@ static const gchar introspection_xml[] =
- "</node>";
-
-
--G_DEFINE_TYPE(FcitxKbd, fcitx_kbd, G_TYPE_DBUS_PROXY);
--
- FCITX_EXPORT_API
- GType fcitx_kbd_get_type(void) G_GNUC_CONST;
-
-+G_DEFINE_TYPE(FcitxKbd, fcitx_kbd, G_TYPE_DBUS_PROXY);
-+
- static GDBusInterfaceInfo * _fcitx_kbd_get_interface_info(void);
-
- static GDBusInterfaceInfo *
Index: chinese/fcitx/files/patch-src_lib_fcitx_instance-internal.h
===================================================================
--- chinese/fcitx/files/patch-src_lib_fcitx_instance-internal.h (revision 304190)
+++ chinese/fcitx/files/patch-src_lib_fcitx_instance-internal.h (working copy)
@@ -1,11 +0,0 @@
---- src/lib/fcitx/instance-internal.h~ 2011-10-02 05:43:11.000000000 -0500
-+++ src/lib/fcitx/instance-internal.h 2011-11-09 04:34:08.305040197 -0600
-@@ -26,6 +26,8 @@
- #define _FCITX_INSTANCE_INTERNAL_H_
-
- #include <semaphore.h>
-+#include <sys/select.h>
-+#include <pthread.h>
-
- #include "fcitx-utils/utarray.h"
- #include "configfile.h"
Index: chinese/fcitx/files/patch-data_CMakeLists.txt
===================================================================
--- chinese/fcitx/files/patch-data_CMakeLists.txt (revision 304190)
+++ chinese/fcitx/files/patch-data_CMakeLists.txt (working copy)
@@ -1,27 +0,0 @@
---- data/CMakeLists.txt.orig 2012-07-17 15:21:04.000000000 -0500
-+++ data/CMakeLists.txt 2012-07-25 09:15:36.331202614 -0500
-@@ -29,7 +29,6 @@ set(FCITX_PY_FILES
- set(FCITX_DSEKTOP_FILES
- fcitx.desktop
- fcitx-configtool.desktop
-- fcitx-autostart.desktop
- )
-
- set(PY_ORGDATA pyPhrase.org)
-@@ -45,7 +44,6 @@ intltool_merge_translation(${CMAKE_CURRE
- add_custom_target(pinyin_data ALL DEPENDS ${PY_DATA})
-
- add_custom_command(OUTPUT ${PY_ORGDATA}
-- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/download.sh "${WGET}" "${PY_URL}" "${PY_TAR}"
- COMMAND ${TAR} xzmvf ${PY_TAR})
- add_custom_command(OUTPUT ${PY_DATA}
- DEPENDS ${PY_ORGDATA}
-@@ -60,7 +58,3 @@ fcitx_add_configdesc_file(${FCITX_DESC_F
- install(FILES ${FCITX_PY_FILES} ${CMAKE_CURRENT_BINARY_DIR}/pybase.mb ${CMAKE_CURRENT_BINARY_DIR}/pyphrase.mb DESTINATION ${pkgdatadir}/pinyin)
-
- set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/pyERROR,${CMAKE_CURRENT_BINARY_DIR}/pyPhrase.ok")
--
--if (_ENABLE_DBUS)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-autostart.desktop DESTINATION /etc/xdg/autostart)
--endif (_ENABLE_DBUS)
-\ No newline at end of file
Index: chinese/fcitx/files/patch-src_lib_fcitx-utils_utils.c
===================================================================
--- chinese/fcitx/files/patch-src_lib_fcitx-utils_utils.c (revision 304190)
+++ chinese/fcitx/files/patch-src_lib_fcitx-utils_utils.c (working copy)
@@ -1,23 +0,0 @@
---- ./src/lib/fcitx-utils/utils.c~ 2012-07-17 15:21:04.000000000 -0500
-+++ ./src/lib/fcitx-utils/utils.c 2012-07-18 00:14:56.901797676 -0500
-@@ -113,13 +113,13 @@ void fcitx_utils_init_as_daemon()
- exit(0);
- }
- setsid();
-- sighandler_t oldint = signal(SIGINT, SIG_IGN);
-- sighandler_t oldhup =signal(SIGHUP, SIG_IGN);
-- sighandler_t oldquit = signal(SIGQUIT, SIG_IGN);
-- sighandler_t oldpipe = signal(SIGPIPE, SIG_IGN);
-- sighandler_t oldttou = signal(SIGTTOU, SIG_IGN);
-- sighandler_t oldttin = signal(SIGTTIN, SIG_IGN);
-- sighandler_t oldchld = signal(SIGCHLD, SIG_IGN);
-+ sig_t oldint = signal(SIGINT, SIG_IGN);
-+ sig_t oldhup =signal(SIGHUP, SIG_IGN);
-+ sig_t oldquit = signal(SIGQUIT, SIG_IGN);
-+ sig_t oldpipe = signal(SIGPIPE, SIG_IGN);
-+ sig_t oldttou = signal(SIGTTOU, SIG_IGN);
-+ sig_t oldttin = signal(SIGTTIN, SIG_IGN);
-+ sig_t oldchld = signal(SIGCHLD, SIG_IGN);
- if (fork() > 0)
- exit(0);
- chdir("/");
Index: chinese/fcitx/files/patch-src_module_unicode_charselectdata.c
===================================================================
--- chinese/fcitx/files/patch-src_module_unicode_charselectdata.c (revision 304190)
+++ chinese/fcitx/files/patch-src_module_unicode_charselectdata.c (working copy)
@@ -1,11 +0,0 @@
---- src/module/unicode/charselectdata.c~ 2012-07-17 15:21:04.000000000 -0500
-+++ src/module/unicode/charselectdata.c 2012-07-18 00:20:19.447890414 -0500
-@@ -4,7 +4,7 @@
- * original file is licensed under GPLv2+
- */
-
--#include <endian.h>
-+#include <sys/endian.h>
- #include <ctype.h>
- #include <libintl.h>
- #include <fcitx-utils/uthash.h>
Index: chinese/fcitx/files/pkg-message.in
===================================================================
--- chinese/fcitx/files/pkg-message.in (revision 304202)
+++ chinese/fcitx/files/pkg-message.in (working copy)
@@ -23,7 +23,4 @@
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.
-
************************************************************************
Index: chinese/fcitx-chewing/Makefile
===================================================================
--- chinese/fcitx-chewing/Makefile (revision 304202)
+++ chinese/fcitx-chewing/Makefile (working copy)
@@ -6,8 +6,7 @@
#
PORTNAME= fcitx-chewing
-PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTVERSION= 0.1.3
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
@@ -15,8 +14,8 @@
MAINTAINER= lichray at gmail.com
COMMENT= Chewing support for Fcitx
-LIB_DEPENDS= fcitx-config.4:${PORTSDIR}/chinese/fcitx \
- chewing.3:${PORTSDIR}/chinese/libchewing
+LIB_DEPENDS= fcitx-config:${PORTSDIR}/chinese/fcitx \
+ chewing:${PORTSDIR}/chinese/libchewing
USE_XZ= yes
USE_GETTEXT= yes
Index: chinese/fcitx-chewing/distinfo
===================================================================
--- chinese/fcitx-chewing/distinfo (revision 304202)
+++ chinese/fcitx-chewing/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-chewing-0.1.2.tar.xz) = d7e44f76a69c34c9c5e27fc2dd97e52290e8efe28ca008899735f992bbdcc5d2
-SIZE (fcitx/fcitx-chewing-0.1.2.tar.xz) = 15120
+SHA256 (fcitx/fcitx-chewing-0.1.3.tar.xz) = d9cdac1469ffe7e60f1d13f11257708361fdc4bfea487a8162b5a22aa23d775c
+SIZE (fcitx/fcitx-chewing-0.1.3.tar.xz) = 15160
Index: chinese/fcitx-configtool/Makefile
===================================================================
--- chinese/fcitx-configtool/Makefile (revision 304197)
+++ chinese/fcitx-configtool/Makefile (working copy)
@@ -6,7 +6,7 @@
#
PORTNAME= fcitx-configtool
-PORTVERSION= 0.4.4
+PORTVERSION= 0.4.5
CATEGORIES= chinese x11
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
Index: chinese/fcitx-configtool/distinfo
===================================================================
--- chinese/fcitx-configtool/distinfo (revision 304197)
+++ chinese/fcitx-configtool/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-configtool-0.4.4.tar.xz) = 66cae23c1e1555a5e8e8cb8696e562b0b58d28e16d2f0b9c64a0f274a6c06745
-SIZE (fcitx/fcitx-configtool-0.4.4.tar.xz) = 37764
+SHA256 (fcitx/fcitx-configtool-0.4.5.tar.xz) = 474ff8635e29e29b6b6f37efe698e2b4264efaba55448a13d0b46d696887c8c1
+SIZE (fcitx/fcitx-configtool-0.4.5.tar.xz) = 42036
Index: chinese/fcitx-table-extra/Makefile
===================================================================
--- chinese/fcitx-table-extra/Makefile (revision 304202)
+++ chinese/fcitx-table-extra/Makefile (working copy)
@@ -6,7 +6,7 @@
#
PORTNAME= fcitx-table-extra
-PORTVERSION= 0.3.2
+PORTVERSION= 0.3.3
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
@@ -14,7 +14,7 @@
MAINTAINER= lichray at gmail.com
COMMENT= Table-based input methods for Fcitx
-LIB_DEPENDS= fcitx-config.4:${PORTSDIR}/chinese/fcitx
+LIB_DEPENDS= fcitx-config:${PORTSDIR}/chinese/fcitx
USE_XZ= yes
USE_GETTEXT= yes
Index: chinese/fcitx-table-extra/distinfo
===================================================================
--- chinese/fcitx-table-extra/distinfo (revision 304202)
+++ chinese/fcitx-table-extra/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-table-extra-0.3.2.tar.xz) = fb118f365818ddaa8d29fdfea5492805dad51ee3d8e87fe45016a760e5ee1c7a
-SIZE (fcitx/fcitx-table-extra-0.3.2.tar.xz) = 3354240
+SHA256 (fcitx/fcitx-table-extra-0.3.3.tar.xz) = ae2bbf9146dfdeafb6220c9a738ddc1f0437da2c5f2da0d578ba4970bc74767d
+SIZE (fcitx/fcitx-table-extra-0.3.3.tar.xz) = 3350592
Index: japanese/fcitx-anthy/distinfo
===================================================================
--- japanese/fcitx-anthy/distinfo (revision 304197)
+++ japanese/fcitx-anthy/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-anthy-0.1.0.tar.xz) = 63d811cd356b9f6054a6552f516f019024d655036615d532de6a966d6daef523
-SIZE (fcitx/fcitx-anthy-0.1.0.tar.xz) = 74684
+SHA256 (fcitx/fcitx-anthy-0.1.1.tar.xz) = c508068c7c9a56c26ea44b8e6ddb90a2ea75860031f89e171dcda8ec4cd08955
+SIZE (fcitx/fcitx-anthy-0.1.1.tar.xz) = 68604
Index: japanese/fcitx-anthy/Makefile
===================================================================
--- japanese/fcitx-anthy/Makefile (revision 304197)
+++ japanese/fcitx-anthy/Makefile (working copy)
@@ -6,7 +6,7 @@
#
PORTNAME= fcitx-anthy
-PORTVERSION= 0.1.0
+PORTVERSION= 0.1.1
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
--- fcitx_4.2.6_svn.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list