diff options
| author | Michael Scheidell <scheidell@FreeBSD.org> | 2012-07-25 18:10:40 +0000 |
|---|---|---|
| committer | Michael Scheidell <scheidell@FreeBSD.org> | 2012-07-25 18:10:40 +0000 |
| commit | 47a32988e55e1924df8e9b4962c9b095833e8cbb (patch) | |
| tree | e20bc37590648220a8262213f03b698895eccb26 | |
| parent | 6dbd6baa2a3c1a2e309790688ff547d20c911273 (diff) | |
| download | ports-47a32988e55e1924df8e9b4962c9b095833e8cbb.tar.gz ports-47a32988e55e1924df8e9b4962c9b095833e8cbb.zip | |
- Update fcitx and addons to 4.2.5
- Remove textproc/fcitx-keyboard
PR: ports/170010
Submitted by: Zhihao Yuan <lichray@gmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=301526
26 files changed, 225 insertions, 159 deletions
@@ -3558,3 +3558,4 @@ devel/acpicatools||2012-07-22|Has expired: It's quite obsolete and is already in mail/mutt-devel|mail/mutt|2012-07-22|mail/mutt-devel is ready for primetime mail/mutt-devel-lite|mail/mutt-lite|2012-07-22|mail/mutt-devel is ready for primetime deskutils/phpgroupware|www/phpgroupware|2012-07-23|Moved to proper category +textproc/fcitx-keyboard||2012-07-25|Removed, merged into chinese/fcitx @@ -6,6 +6,22 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. 20120725: +AFFECTS: users of chinese/fcitx +AUTHOR: lichray@gmail.com + +The textproc/fcitx-keyboard port is merged into chinese/fcitx. +Before updating, be sure to + +# pkg_delete -f fcitx-keyboard-\* + +And make sure you have at least one keyboard layout based input method +enabled in fcitx-configtool, to keep the activation/deactivation of IM +panel working. + +And, since chinese/fcitx-sunpinyin depends on an update to +chinese/sunpinyin + +20120725: AFFECTS: users of www/py-beautifulsoup AUTHOR: rm@FreeBSD.org diff --git a/chinese/fcitx-cloudpinyin/Makefile b/chinese/fcitx-cloudpinyin/Makefile index 827be0bd027c..ba44fbd9d290 100644 --- a/chinese/fcitx-cloudpinyin/Makefile +++ b/chinese/fcitx-cloudpinyin/Makefile @@ -6,8 +6,7 @@ # PORTNAME= fcitx-cloudpinyin -PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTVERSION= 0.2.3 CATEGORIES= chinese MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DIST_SUBDIR= fcitx @@ -15,7 +14,7 @@ DIST_SUBDIR= fcitx MAINTAINER= lichray@gmail.com COMMENT= A cloud-based Pinyin module for Fcitx -LIB_DEPENDS= fcitx-config.4:${PORTSDIR}/chinese/fcitx \ +LIB_DEPENDS= fcitx-config:${PORTSDIR}/chinese/fcitx \ curl:${PORTSDIR}/ftp/curl USE_XZ= yes diff --git a/chinese/fcitx-cloudpinyin/distinfo b/chinese/fcitx-cloudpinyin/distinfo index 693c6e3d3660..12e98320f085 100644 --- a/chinese/fcitx-cloudpinyin/distinfo +++ b/chinese/fcitx-cloudpinyin/distinfo @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx-cloudpinyin-0.2.1.tar.xz) = 548a08a2a1585c5dc13c5bf6116197203dafc2c475efdf5b6e57bdb900cb2cac -SIZE (fcitx/fcitx-cloudpinyin-0.2.1.tar.xz) = 18388 +SHA256 (fcitx/fcitx-cloudpinyin-0.2.3.tar.xz) = 01a97c975e2485831d47bb9648f724683a89facba53d8d127bff950e61a77dff +SIZE (fcitx/fcitx-cloudpinyin-0.2.3.tar.xz) = 18636 diff --git a/chinese/fcitx-configtool/Makefile b/chinese/fcitx-configtool/Makefile index c51cb8b44ffe..2dbc21f35075 100644 --- a/chinese/fcitx-configtool/Makefile +++ b/chinese/fcitx-configtool/Makefile @@ -6,8 +6,7 @@ # PORTNAME= fcitx-configtool -PORTVERSION= 0.4.3 -PORTREVISION= 1 +PORTVERSION= 0.4.4 CATEGORIES= chinese x11 MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DIST_SUBDIR= fcitx @@ -17,7 +16,7 @@ COMMENT= Fcitx IM framework configure tool BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib -LIB_DEPENDS= fcitx-config.4:${PORTSDIR}/chinese/fcitx +LIB_DEPENDS= fcitx-config:${PORTSDIR}/chinese/fcitx USE_XZ= yes USE_GNOME= intltool gnomehack @@ -30,18 +29,18 @@ OPTIONS= GTK2 "Enable Gtk2 Version" on \ .include <bsd.port.options.mk> .if defined(WITH_GTK2) +CMAKE_ARGS+= -DENABLE_GTK2=ON USE_GNOME+= gtk20 PLIST_SUB+= GTK2="" .else -CMAKE_ARGS+= -DENABLE_GTK2=OFF PLIST_SUB+= GTK2="@comment " .endif .if defined(WITH_GTK3) USE_GNOME+= gtk30 -CMAKE_ARGS+= -DENABLE_GTK3=ON PLIST_SUB+= GTK3="" .else +CMAKE_ARGS+= -DENABLE_GTK3=OFF PLIST_SUB+= GTK3="@comment " .endif diff --git a/chinese/fcitx-configtool/distinfo b/chinese/fcitx-configtool/distinfo index e655d6dead07..3d42fd83c811 100644 --- a/chinese/fcitx-configtool/distinfo +++ b/chinese/fcitx-configtool/distinfo @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx-configtool-0.4.3.tar.xz) = 0b8722da441acd3deb841f6b389b02499bc99f61a711ce57ad0cccae359a53b9 -SIZE (fcitx/fcitx-configtool-0.4.3.tar.xz) = 34792 +SHA256 (fcitx/fcitx-configtool-0.4.4.tar.xz) = 66cae23c1e1555a5e8e8cb8696e562b0b58d28e16d2f0b9c64a0f274a6c06745 +SIZE (fcitx/fcitx-configtool-0.4.4.tar.xz) = 37764 diff --git a/chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt b/chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt index 411973106999..c607574e386e 100644 --- a/chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt +++ b/chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt @@ -1,6 +1,11 @@ ---- 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 +--- gtk/CMakeLists.txt.orig 2012-06-02 11:14:45.000000000 -0500 ++++ gtk/CMakeLists.txt 2012-07-18 02:00:53.555897529 -0500 +@@ -1,3 +1,4 @@ ++PKG_CHECK_MODULES (GTK2 "gtk+-2.0 >= 2.22" REQUIRED) + PKG_CHECK_MODULES (DBUS_GLIB "dbus-glib-1" REQUIRED) + PKG_CHECK_MODULES (UNIQUE "unique-1.0") + +@@ -49,6 +50,7 @@ target_link_libraries (fcitx-config-gtk ${FCITX4_FCITX_LIBRARIES} ${GLIB2_LIBRARIES} ${DBUS_GLIB_LIBRARIES} diff --git a/chinese/fcitx-sunpinyin/Makefile b/chinese/fcitx-sunpinyin/Makefile index ad0545dfbc36..58fb7cbbd19f 100644 --- a/chinese/fcitx-sunpinyin/Makefile +++ b/chinese/fcitx-sunpinyin/Makefile @@ -6,8 +6,7 @@ # PORTNAME= fcitx-sunpinyin -PORTVERSION= 0.3.6 -PORTREVISION= 1 +PORTVERSION= 0.3.8 CATEGORIES= chinese MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DIST_SUBDIR= fcitx @@ -15,8 +14,9 @@ DIST_SUBDIR= fcitx MAINTAINER= lichray@gmail.com COMMENT= SunPinyin support for Fcitx -LIB_DEPENDS= fcitx-config.4:${PORTSDIR}/chinese/fcitx \ - sunpinyin.3:${PORTSDIR}/chinese/sunpinyin +LIB_DEPENDS= fcitx-config:${PORTSDIR}/chinese/fcitx +BUILD_DEPENDS= zh-sunpinyin>=2.0.4.r2:${PORTSDIR}/chinese/sunpinyin +RUN_DEPENDS:= ${BUILD_DEPENDS} USE_XZ= yes USE_GETTEXT= yes diff --git a/chinese/fcitx-sunpinyin/distinfo b/chinese/fcitx-sunpinyin/distinfo index 69e34576c89a..d03594f55575 100644 --- a/chinese/fcitx-sunpinyin/distinfo +++ b/chinese/fcitx-sunpinyin/distinfo @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx-sunpinyin-0.3.6.tar.xz) = 6ed029860fe8df1e39bf8f36ada4473a94467887614e103d5832fd8a09cfa6a6 -SIZE (fcitx/fcitx-sunpinyin-0.3.6.tar.xz) = 40348 +SHA256 (fcitx/fcitx-sunpinyin-0.3.8.tar.xz) = 7a65087f9cc9136d5a64006f2d2a34fe81b3ac6e73f25326a62f5013d996431b +SIZE (fcitx/fcitx-sunpinyin-0.3.8.tar.xz) = 41376 diff --git a/chinese/fcitx-sunpinyin/files/patch-data_CMakeLists.txt b/chinese/fcitx-sunpinyin/files/patch-data_CMakeLists.txt new file mode 100644 index 000000000000..89260d964a59 --- /dev/null +++ b/chinese/fcitx-sunpinyin/files/patch-data_CMakeLists.txt @@ -0,0 +1,13 @@ +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 + diff --git a/chinese/fcitx-sunpinyin/pkg-plist b/chinese/fcitx-sunpinyin/pkg-plist index c6f71d4caa87..e15936380cc3 100644 --- a/chinese/fcitx-sunpinyin/pkg-plist +++ b/chinese/fcitx-sunpinyin/pkg-plist @@ -5,6 +5,7 @@ share/fcitx/inputmethod/sunpinyin.conf share/fcitx/skin/classic/sunpinyin.png share/fcitx/skin/dark/sunpinyin.png share/fcitx/skin/default/sunpinyin.png +share/fcitx/imicon/sunpinyin.png share/icons/hicolor/128x128/apps/fcitx-sunpinyin.png share/icons/hicolor/16x16/apps/fcitx-sunpinyin.png share/icons/hicolor/22x22/apps/fcitx-sunpinyin.png diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile index 06806f7da6a4..ff2db356f96d 100644 --- a/chinese/fcitx/Makefile +++ b/chinese/fcitx/Makefile @@ -6,8 +6,7 @@ # PORTNAME= fcitx -PORTVERSION= 4.2.3 -PORTREVISION= 3 +PORTVERSION= 4.2.5 CATEGORIES= chinese x11 MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz @@ -19,8 +18,11 @@ COMMENT= A Flexible Input Method Framework LICENSE= GPLv2 -LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ - dbus-1.3:${PORTSDIR}/devel/dbus +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 MAN1= createPYMB.1 fcitx-remote.1 fcitx.1 mb2org.1 mb2txt.1 \ @@ -28,10 +30,12 @@ MAN1= createPYMB.1 fcitx-remote.1 fcitx.1 mb2org.1 mb2txt.1 \ SUB_FILES= pkg-message SUB_LIST+= PORTSDIR=${PORTSDIR} +CONFLICTS= zh-scim-fcitx-3.* + USE_XZ= yes -USE_GNOME= pango intltool gnomehack +USE_GNOME= pango intltool libxml2 gnomehack USE_GETTEXT= yes -USE_XORG= x11 xext +USE_XORG= x11 xext xkbfile USE_LDCONFIG= yes USE_CMAKE= yes INSTALLS_ICONS= yes @@ -76,7 +80,7 @@ PLIST_SUB+= QT4="@comment " .endif .if ${PORT_OPTIONS:MOPENCC} -LIB_DEPENDS+= opencc.1:${PORTSDIR}/chinese/opencc +LIB_DEPENDS+= opencc:${PORTSDIR}/chinese/opencc .else CMAKE_ARGS+= -DENABLE_OPENCC=OFF .endif diff --git a/chinese/fcitx/distinfo b/chinese/fcitx/distinfo index 64cf1e08847f..20dba762ad49 100644 --- a/chinese/fcitx/distinfo +++ b/chinese/fcitx/distinfo @@ -1,5 +1,5 @@ -SHA256 (fcitx/fcitx-4.2.3.tar.xz) = 4b7d22ada50f7e375096094c2abcf09ad114ffb68521ccf0de37d71e1014183c -SIZE (fcitx/fcitx-4.2.3.tar.xz) = 612028 +SHA256 (fcitx/fcitx-4.2.5.tar.xz) = 478d311d3427e255729671f3a461762348bf5d83ed694d78021012778047140a +SIZE (fcitx/fcitx-4.2.5.tar.xz) = 1413724 SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 SIZE (fcitx/pinyin.tar.gz) = 1608886 SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7 diff --git a/chinese/fcitx/files/patch-data_CMakeLists.txt b/chinese/fcitx/files/patch-data_CMakeLists.txt index 8ed9375ad511..ddff9aa87b5b 100644 --- a/chinese/fcitx/files/patch-data_CMakeLists.txt +++ b/chinese/fcitx/files/patch-data_CMakeLists.txt @@ -1,6 +1,14 @@ ---- data/CMakeLists.txt~ 2011-10-02 05:43:11.000000000 -0500 -+++ data/CMakeLists.txt 2011-11-09 04:34:25.659393502 -0600 -@@ -43,7 +43,6 @@ intltool_merge_translation(${CMAKE_CURRE +--- 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} @@ -8,3 +16,12 @@ 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 diff --git a/chinese/fcitx/files/patch-data_script_CMakeLists.txt b/chinese/fcitx/files/patch-data_script_CMakeLists.txt new file mode 100644 index 000000000000..8ac82eaef643 --- /dev/null +++ b/chinese/fcitx/files/patch-data_script_CMakeLists.txt @@ -0,0 +1,11 @@ +--- 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 diff --git a/chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt b/chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt new file mode 100644 index 000000000000..c76228b80ae3 --- /dev/null +++ b/chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt @@ -0,0 +1,18 @@ +--- 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_fcitxinputmethod.c b/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxinputmethod.c new file mode 100644 index 000000000000..d936493eda16 --- /dev/null +++ b/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxinputmethod.c @@ -0,0 +1,16 @@ +--- 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); + diff --git a/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxkbd.c b/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxkbd.c new file mode 100644 index 000000000000..7a4138a39bd4 --- /dev/null +++ b/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxkbd.c @@ -0,0 +1,16 @@ +--- 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 * diff --git a/chinese/fcitx/files/patch-src_lib_fcitx-utils_utils.c b/chinese/fcitx/files/patch-src_lib_fcitx-utils_utils.c index 9553c0fff65a..de72b3b8a65e 100644 --- a/chinese/fcitx/files/patch-src_lib_fcitx-utils_utils.c +++ b/chinese/fcitx/files/patch-src_lib_fcitx-utils_utils.c @@ -1,78 +1,23 @@ -diff --git src/lib/fcitx-utils/utils.c src/lib/fcitx-utils/utils.c -index c97ff44..473abc3 100644 ---- src/lib/fcitx-utils/utils.c -+++ src/lib/fcitx-utils/utils.c -@@ -337,19 +337,23 @@ int fcitx_utils_pid_exists(pid_t pid) - if (vm == 0) // ignore all error - return 1; - -- int cnt; -- struct kinfo_proc * kp = kvm_getprocs(vm, KERN_PROC_PID, pid, &cnt); -- if (kp == 0) -- return 1; -- int i; -- for (i = 0; i < cnt; i++) -- if (kp->ki_pid == pid) -+ int result = 1; -+ do { -+ int cnt; -+ struct kinfo_proc * kp = kvm_getprocs(vm, KERN_PROC_PID, pid, &cnt); -+ if (kp == 0) { -+ result = 1; - break; -- int result; -- if (i != cnt) -- result = 1; -- else -- result = 0; -+ } -+ int i; -+ for (i = 0; i < cnt; i++) -+ if (kp->ki_pid == pid) -+ break; -+ if (i != cnt) -+ result = 1; -+ else -+ result = 0; -+ } while (0); - kvm_close(vm); - return result; - #else -@@ -386,21 +390,24 @@ char* fcitx_utils_get_process_name() - if (vm == 0) - return strdup(""); - -- int cnt; -- int mypid = getpid(); -- struct kinfo_proc * kp = kvm_getprocs(vm, KERN_PROC_PID, mypid, &cnt); -- if ((cnt != 1) || (kp == 0)) -- return strdup(""); -- int i; -- for (i = 0; i < cnt; i++) -- if (kp->ki_pid == mypid) -- break; - char* result = NULL; -- if (i != cnt) -- result = strdup(kp->ki_comm); -- else -- result = strdup(""); -+ do { -+ int cnt; -+ int mypid = getpid(); -+ struct kinfo_proc * kp = kvm_getprocs(vm, KERN_PROC_PID, mypid, &cnt); -+ if ((cnt != 1) || (kp == 0)) { -+ break; -+ } -+ int i; -+ for (i = 0; i < cnt; i++) -+ if (kp->ki_pid == mypid) -+ break; -+ if (i != cnt) -+ result = strdup(kp->ki_comm); -+ } while (0); - kvm_close(vm); -+ if (result == NULL) -+ result = strdup(""); - return result; - #else - return strdup(""); +--- ./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("/"); diff --git a/chinese/fcitx/files/patch-src_module_unicode_charselectdata.c b/chinese/fcitx/files/patch-src_module_unicode_charselectdata.c new file mode 100644 index 000000000000..ea11c6d22b6c --- /dev/null +++ b/chinese/fcitx/files/patch-src_module_unicode_charselectdata.c @@ -0,0 +1,11 @@ +--- 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> diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist index b4fe670eca1a..45a642eb2857 100644 --- a/chinese/fcitx/pkg-plist +++ b/chinese/fcitx/pkg-plist @@ -13,6 +13,11 @@ 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-utils/keysym.h include/fcitx-utils/log.h include/fcitx-utils/memory.h include/fcitx-utils/utarray.h @@ -36,6 +41,7 @@ include/fcitx/module/dbus/dbusstuff.h 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/x11/x11stuff.h include/fcitx/profile.h include/fcitx/ui.h @@ -44,6 +50,8 @@ 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-kimpanel-ui.so lib/fcitx/fcitx-pinyin.so @@ -52,18 +60,26 @@ lib/fcitx/fcitx-quickphrase.so lib/fcitx/fcitx-qw.so lib/fcitx/fcitx-remote-module.so lib/fcitx/fcitx-table.so +lib/fcitx/fcitx-unicode.so lib/fcitx/fcitx-vk.so lib/fcitx/fcitx-x11.so lib/fcitx/fcitx-xim.so +lib/fcitx/fcitx-xkb.so +lib/fcitx/fcitx-xkbdbus.so lib/libfcitx-config.so lib/libfcitx-config.so.4 lib/libfcitx-config.so.4.1 lib/libfcitx-core.so lib/libfcitx-core.so.0 lib/libfcitx-core.so.0.3 +lib/libfcitx-gclient.so +lib/libfcitx-gclient.so.0 +lib/libfcitx-gclient.so.0.1 lib/libfcitx-utils.so lib/libfcitx-utils.so.0 lib/libfcitx-utils.so.0.1 +lib/girepository-1.0/Fcitx-1.0.typelib +share/gir-1.0/Fcitx-1.0.gir %%GTK2%%lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-fcitx.so %%GTK2%%@exec gtk-query-immodules-2.0 > %%LOCALBASE%%/etc/gtk-2.0/gtk.immodules %%GTK2%%@unexec gtk-query-immodules-2.0 > %%LOCALBASE%%/etc/gtk-2.0/gtk.immodules @@ -74,6 +90,7 @@ lib/libfcitx-utils.so.0.1 %%QT4%%@dirrmtry lib/qt4/plugins/inputmethods %%QT4%%@dirrmtry lib/qt4/plugins libdata/pkgconfig/fcitx-config.pc +libdata/pkgconfig/fcitx-gclient.pc libdata/pkgconfig/fcitx-utils.pc libdata/pkgconfig/fcitx.pc share/applications/fcitx-configtool.desktop @@ -93,7 +110,9 @@ share/cmake/fcitx/FcitxMacro.cmake %%DATADIR%%/addon/fcitx-classic-ui.conf %%DATADIR%%/addon/fcitx-dbus.conf %%DATADIR%%/addon/fcitx-fullwidth-char.conf +%%DATADIR%%/addon/fcitx-imselector.conf %%DATADIR%%/addon/fcitx-ipc.conf +%%DATADIR%%/addon/fcitx-keyboard.conf %%DATADIR%%/addon/fcitx-kimpanel-ui.conf %%DATADIR%%/addon/fcitx-pinyin.conf %%DATADIR%%/addon/fcitx-punc.conf @@ -101,26 +120,42 @@ share/cmake/fcitx/FcitxMacro.cmake %%DATADIR%%/addon/fcitx-qw.conf %%DATADIR%%/addon/fcitx-remote-module.conf %%DATADIR%%/addon/fcitx-table.conf +%%DATADIR%%/addon/fcitx-unicode.conf %%DATADIR%%/addon/fcitx-vk.conf %%DATADIR%%/addon/fcitx-x11.conf %%DATADIR%%/addon/fcitx-xim.conf +%%DATADIR%%/addon/fcitx-xkb.conf +%%DATADIR%%/addon/fcitx-xkbdbus.conf %%DATADIR%%/configdesc/addon.desc %%DATADIR%%/configdesc/config.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.desc %%DATADIR%%/configdesc/fcitx-quickphrase.desc +%%DATADIR%%/configdesc/fcitx-table.desc +%%DATADIR%%/configdesc/fcitx-unicode.desc %%DATADIR%%/configdesc/fcitx-xim.desc +%%DATADIR%%/configdesc/fcitx-xkb.desc %%DATADIR%%/configdesc/inputmethod.desc %%DATADIR%%/configdesc/profile.desc %%DATADIR%%/configdesc/skin.desc %%DATADIR%%/configdesc/table.desc %%DATADIR%%/data/AutoEng.dat +%%DATADIR%%/data/charselectdata %%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%%/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 @@ -315,13 +350,14 @@ share/mime/packages/x-fskin.xml @dirrmtry share/icons/gnome @dirrmtry share/icons/hicolor/scalable/status @dirrmtry share/icons/hicolor/scalable -@dirrm %%DATADIR%%/table +@dirrmtry %%DATADIR%%/table @dirrm %%DATADIR%%/skin/default @dirrm %%DATADIR%%/skin/dark @dirrm %%DATADIR%%/skin/classic -@dirrm %%DATADIR%%/skin +@dirrmtry %%DATADIR%%/skin @dirrm %%DATADIR%%/pinyin @dirrm %%DATADIR%%/inputmethod +@dirrm %%DATADIR%%/imicon @dirrm %%DATADIR%%/data @dirrm %%DATADIR%%/configdesc @dirrm %%DATADIR%%/addon @@ -330,9 +366,11 @@ share/mime/packages/x-fskin.xml @dirrm share/cmake/fcitx @dirrm lib/fcitx @dirrm include/fcitx/module/x11 +@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 @@ -340,3 +378,5 @@ share/mime/packages/x-fskin.xml @dirrm include/fcitx-utils @dirrm include/fcitx-config @dirrm include/fcitx +@dirrmtry lib/girepository-1.0 +@dirrmtry share/gir-1.0 diff --git a/textproc/Makefile b/textproc/Makefile index 565ad93d66a7..443ee3faa2cb 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -175,7 +175,6 @@ SUBDIR += exslt SUBDIR += ezxml SUBDIR += fa-aspell - SUBDIR += fcitx-keyboard SUBDIR += fex SUBDIR += ffe SUBDIR += fi-aspell diff --git a/textproc/fcitx-keyboard/Makefile b/textproc/fcitx-keyboard/Makefile deleted file mode 100644 index 0c9718a04b42..000000000000 --- a/textproc/fcitx-keyboard/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# New ports collection makefile for: fcitx-keyboard -# Date created: 6 Feb 2012 -# Whom: Zhihao Yuan <lichray@gmail.com> -# -# $FreeBSD$ -# - -PORTNAME= fcitx-keyboard -PORTVERSION= 0.1.3 -PORTREVISION= 1 -CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} -DIST_SUBDIR= fcitx - -MAINTAINER= lichray@gmail.com -COMMENT= X Keyboard Integration wtih Fcitx - -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -LIB_DEPENDS= fcitx-config.4:${PORTSDIR}/chinese/fcitx \ - enchant.1:${PORTSDIR}/textproc/enchant \ - icuuc.48:${PORTSDIR}/devel/icu - -USE_XZ= yes -USE_GETTEXT= yes -USE_CMAKE= yes -USE_GNOME= intltool libxml2 -USE_XORG= x11 xkbfile - -PROJECTHOST= fcitx - -.include <bsd.port.mk> diff --git a/textproc/fcitx-keyboard/distinfo b/textproc/fcitx-keyboard/distinfo deleted file mode 100644 index 146eeeacd32b..000000000000 --- a/textproc/fcitx-keyboard/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (fcitx/fcitx-keyboard-0.1.3.tar.xz) = 3df3bc35eb1cb564a29fb71b4fef441c95432766b686514374805b841cbca3ef -SIZE (fcitx/fcitx-keyboard-0.1.3.tar.xz) = 42588 diff --git a/textproc/fcitx-keyboard/pkg-descr b/textproc/fcitx-keyboard/pkg-descr deleted file mode 100644 index d55a37957b01..000000000000 --- a/textproc/fcitx-keyboard/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -fcitx-keyboard provides an input method featuring word completion -based on different keyboard layouts. - -WWW: http://code.google.com/p/fcitx/ diff --git a/textproc/fcitx-keyboard/pkg-plist b/textproc/fcitx-keyboard/pkg-plist deleted file mode 100644 index 21945f435ed8..000000000000 --- a/textproc/fcitx-keyboard/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -lib/fcitx/fcitx-keyboard.so -lib/fcitx/fcitx-xkb.so -share/fcitx/addon/fcitx-keyboard.conf -share/fcitx/addon/fcitx-xkb.conf -share/fcitx/configdesc/fcitx-keyboard.desc -share/fcitx/configdesc/fcitx-xkb.desc -share/locale/zh_CN/LC_MESSAGES/fcitx-keyboard.mo -share/locale/zh_TW/LC_MESSAGES/fcitx-keyboard.mo |