Index: chinese/fcitx/Makefile =================================================================== --- chinese/fcitx/Makefile (revision 481405) +++ chinese/fcitx/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= fcitx -PORTVERSION= 4.2.9.1 -PORTREVISION= 4 +PORTVERSION= 4.2.9.6 CATEGORIES= chinese x11 MASTER_SITES= http://download.fcitx-im.org/fcitx/:fcitx \ http://download.fcitx-im.org/data/:data @@ -21,14 +20,18 @@ LICENSE= GPLv2 -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ + bash:shells/bash \ + ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:x11/xkeyboard-config LIB_DEPENDS= libcairo.so:graphics/cairo \ libdbus-1.so:devel/dbus \ libXfixes.so:x11/libXfixes \ libXinerama.so:x11/libXinerama \ libXrender.so:x11/libXrender \ - libxkbcommon.so:x11/libxkbcommon -RUN_DEPENDS= xdg-open:devel/xdg-utils + libxkbcommon.so:x11/libxkbcommon \ + libuuid.so:misc/e2fsprogs-libuuid +RUN_DEPENDS= xdg-open:devel/xdg-utils \ + xkeyboard-config>=0:x11/xkeyboard-config SUB_FILES= pkg-message SUB_LIST+= PORTSDIR=${PORTSDIR} @@ -39,7 +42,7 @@ USE_KDE= ecm USE_XORG= x11 xext xkbfile sm ice USE_LDCONFIG= yes -USES= qt:4 tar:xz cmake:noninja desktop-file-utils \ +USES= gnome qt:4 tar:xz cmake:noninja desktop-file-utils \ gettext-tools:build,run gettext-runtime iconv:wchar_t \ kde:5 pkgconfig shared-mime-info INSTALLS_ICONS= yes Index: chinese/fcitx/distinfo =================================================================== --- chinese/fcitx/distinfo (revision 481405) +++ chinese/fcitx/distinfo (working copy) @@ -1,6 +1,6 @@ -TIMESTAMP = 1464749421 -SHA256 (fcitx/fcitx-4.2.9.1.tar.xz) = 25661907903e4ccaa4cf62cc389c006e280d31bce84147e203d7310fb4cd42ed -SIZE (fcitx/fcitx-4.2.9.1.tar.xz) = 1655504 +TIMESTAMP = 1536473770 +SHA256 (fcitx/fcitx-4.2.9.6.tar.xz) = d55eee3f094037b5c32f0c5397d585fdf932cbc7d2091ed6f78fd7a9ae512c47 +SIZE (fcitx/fcitx-4.2.9.6.tar.xz) = 1706336 SHA256 (fcitx/en_dict-20121020.tar.gz) = c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb SIZE (fcitx/en_dict-20121020.tar.gz) = 630491 SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 Index: chinese/fcitx/files/patch-src_frontend_qt_fcitxwatcher.cpp =================================================================== --- chinese/fcitx/files/patch-src_frontend_qt_fcitxwatcher.cpp (nonexistent) +++ chinese/fcitx/files/patch-src_frontend_qt_fcitxwatcher.cpp (working copy) @@ -0,0 +1,10 @@ +--- src/frontend/qt/fcitxwatcher.cpp.orig 2018-09-09 06:32:17 UTC ++++ src/frontend/qt/fcitxwatcher.cpp +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + // utils function in fcitx-utils and fcitx-config + bool _pid_exists(pid_t pid) { Property changes on: chinese/fcitx/files/patch-src_frontend_qt_fcitxwatcher.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: chinese/fcitx/files/patch-tools__gui__quickphrase-editor__CMakeLists.txt =================================================================== --- chinese/fcitx/files/patch-tools__gui__quickphrase-editor__CMakeLists.txt (revision 481405) +++ chinese/fcitx/files/patch-tools__gui__quickphrase-editor__CMakeLists.txt (nonexistent) @@ -1,10 +0,0 @@ ---- tools/gui/quickphrase-editor/CMakeLists.txt.orig 2015-12-12 08:02:09 UTC -+++ tools/gui/quickphrase-editor/CMakeLists.txt -@@ -18,6 +18,7 @@ include_directories( - ${QT_QTGUI_INCLUDE_DIR} - ${LIBINTL_INCLUDE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} -+ ${LIBINTL_INCLUDE_DIR} - ) - qt4_wrap_ui(QUICKPHRASE_EDITOR_SRCS editordialog.ui batchdialog.ui editor.ui) - add_library(fcitx-quickphrase-editor Property changes on: chinese/fcitx/files/patch-tools__gui__quickphrase-editor__CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: chinese/fcitx/pkg-plist =================================================================== --- chinese/fcitx/pkg-plist (revision 481405) +++ chinese/fcitx/pkg-plist (working copy) @@ -82,6 +82,7 @@ include/fcitx/module/x11/x11stuff.h include/fcitx/module/xkb/fcitx-xkb.h include/fcitx/module/xkb/xkb.h +include/fcitx/module/xkbdbus/fcitx-xkbdbus.h include/fcitx/profile.h include/fcitx/ui.h lib/fcitx/fcitx-autoeng.so @@ -93,6 +94,7 @@ lib/fcitx/fcitx-fullwidth-char.so lib/fcitx/fcitx-imselector.so lib/fcitx/fcitx-ipc.so +lib/fcitx/fcitx-ipcportal.so lib/fcitx/fcitx-keyboard.so lib/fcitx/fcitx-kimpanel-ui.so lib/fcitx/fcitx-notificationitem.so @@ -114,7 +116,6 @@ lib/fcitx/libexec/fcitx-po-parser %%QT4%%lib/fcitx/libexec/fcitx-qt-gui-wrapper lib/fcitx/libexec/fcitx-scanner -%%QT4%%lib/fcitx/qt/libfcitx-quickphrase-editor.so lib/girepository-1.0/Fcitx-1.0.typelib %%GTK2%%lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-fcitx.so %%GTK2%%@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache @@ -130,8 +131,8 @@ 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-gclient.so.1 +lib/libfcitx-gclient.so.0.2 %%QT4%%lib/libfcitx-qt.so %%QT4%%lib/libfcitx-qt.so.0 %%QT4%%lib/libfcitx-qt.so.0.1 @@ -184,6 +185,7 @@ %%DATADIR%%/addon/fcitx-fullwidth-char.conf %%DATADIR%%/addon/fcitx-imselector.conf %%DATADIR%%/addon/fcitx-ipc.conf +%%DATADIR%%/addon/fcitx-ipcportal.conf %%DATADIR%%/addon/fcitx-keyboard.conf %%DATADIR%%/addon/fcitx-kimpanel-ui.conf %%DATADIR%%/addon/fcitx-notificationitem.conf @@ -229,6 +231,7 @@ %%DATADIR%%/data/punc.mb.zh_HK %%DATADIR%%/data/punc.mb.zh_TW %%DATADIR%%/data/quickphrase.d/emoji.mb +%%DATADIR%%/data/quickphrase.d/emoji-eac.mb %%DATADIR%%/data/quickphrase.d/latex.mb %%DATADIR%%/data/vk.conf %%DATADIR%%/dbus/daemon.conf @@ -242,8 +245,10 @@ %%DATADIR%%/inputmethod/pinyin.conf %%DATADIR%%/inputmethod/qw.conf %%DATADIR%%/inputmethod/shuangpin.conf +%%DATADIR%%/pinyin/pySym.mb %%DATADIR%%/pinyin/pybase.mb %%DATADIR%%/pinyin/pyphrase.mb +%%DATADIR%%/pinyin/sp.dat %%DATADIR%%/py-enhance/py_stroke.mb %%DATADIR%%/py-enhance/py_table.mb %%DATADIR%%/skin/classic/active.png @@ -432,10 +437,14 @@ share/icons/hicolor/scalable/apps/fcitx-vk-inactive-symbolic.svg share/icons/hicolor/scalable/apps/fcitx-vk-inactive.svg share/icons/hicolor/scalable/apps/fcitx.svg +share/locale/ca/LC_MESSAGES/fcitx.mo +share/locale/da/LC_MESSAGES/fcitx.mo share/locale/de/LC_MESSAGES/fcitx.mo share/locale/es/LC_MESSAGES/fcitx.mo +share/locale/fr/LC_MESSAGES/fcitx.mo share/locale/ja/LC_MESSAGES/fcitx.mo share/locale/ko/LC_MESSAGES/fcitx.mo +share/locale/ru/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