View | Details | Raw Unified | Return to bug 231612 | Differences between
and this patch

Collapse All | Expand All

(-)chinese/fcitx/Makefile (-7 / +10 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	fcitx
4
PORTNAME=	fcitx
5
PORTVERSION=	4.2.9.1
5
PORTVERSION=	4.2.9.6
6
PORTREVISION=	4
7
CATEGORIES=	chinese x11
6
CATEGORIES=	chinese x11
8
MASTER_SITES=	http://download.fcitx-im.org/fcitx/:fcitx \
7
MASTER_SITES=	http://download.fcitx-im.org/fcitx/:fcitx \
9
		http://download.fcitx-im.org/data/:data
8
		http://download.fcitx-im.org/data/:data
Lines 21-34 Link Here
21
20
22
LICENSE=	GPLv2
21
LICENSE=	GPLv2
23
22
24
BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
23
BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
24
		bash:shells/bash \
25
		${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:x11/xkeyboard-config
25
LIB_DEPENDS=	libcairo.so:graphics/cairo \
26
LIB_DEPENDS=	libcairo.so:graphics/cairo \
26
		libdbus-1.so:devel/dbus \
27
		libdbus-1.so:devel/dbus \
27
		libXfixes.so:x11/libXfixes \
28
		libXfixes.so:x11/libXfixes \
28
		libXinerama.so:x11/libXinerama \
29
		libXinerama.so:x11/libXinerama \
29
		libXrender.so:x11/libXrender \
30
		libXrender.so:x11/libXrender \
30
		libxkbcommon.so:x11/libxkbcommon
31
		libxkbcommon.so:x11/libxkbcommon \
31
RUN_DEPENDS=	xdg-open:devel/xdg-utils
32
		libuuid.so:misc/e2fsprogs-libuuid
33
RUN_DEPENDS=	xdg-open:devel/xdg-utils \
34
		xkeyboard-config>=0:x11/xkeyboard-config
32
35
33
SUB_FILES=	pkg-message
36
SUB_FILES=	pkg-message
34
SUB_LIST+=	PORTSDIR=${PORTSDIR}
37
SUB_LIST+=	PORTSDIR=${PORTSDIR}
Lines 39-47 Link Here
39
USE_KDE=	ecm
42
USE_KDE=	ecm
40
USE_XORG=	x11 xext xkbfile sm ice
43
USE_XORG=	x11 xext xkbfile sm ice
41
USE_LDCONFIG=	yes
44
USE_LDCONFIG=	yes
42
USES=		qt:4 tar:xz cmake:noninja desktop-file-utils \
45
USES=		gnome qt:4 tar:xz cmake:noninja desktop-file-utils \
43
		gettext-tools:build,run gettext-runtime iconv:wchar_t \
46
		gettext-tools:build,run gettext-runtime iconv:wchar_t \
44
		kde:5 pkgconfig shared-mime-info
47
		kde:5 pkgconfig shared-mime-info compiler:c++14-lang
45
INSTALLS_ICONS=	yes
48
INSTALLS_ICONS=	yes
46
49
47
OPTIONS_DEFINE=	GTK2 GTK3 QT4 OPENCC TPUNC DOCS
50
OPTIONS_DEFINE=	GTK2 GTK3 QT4 OPENCC TPUNC DOCS
(-)chinese/fcitx/distinfo (-3 / +3 lines)
Lines 1-6 Link Here
1
TIMESTAMP = 1464749421
1
TIMESTAMP = 1536473770
2
SHA256 (fcitx/fcitx-4.2.9.1.tar.xz) = 25661907903e4ccaa4cf62cc389c006e280d31bce84147e203d7310fb4cd42ed
2
SHA256 (fcitx/fcitx-4.2.9.6.tar.xz) = d55eee3f094037b5c32f0c5397d585fdf932cbc7d2091ed6f78fd7a9ae512c47
3
SIZE (fcitx/fcitx-4.2.9.1.tar.xz) = 1655504
3
SIZE (fcitx/fcitx-4.2.9.6.tar.xz) = 1706336
4
SHA256 (fcitx/en_dict-20121020.tar.gz) = c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb
4
SHA256 (fcitx/en_dict-20121020.tar.gz) = c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb
5
SIZE (fcitx/en_dict-20121020.tar.gz) = 630491
5
SIZE (fcitx/en_dict-20121020.tar.gz) = 630491
6
SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1
6
SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1
(-)chinese/fcitx/files/patch-src_frontend_qt_fcitxwatcher.cpp (+10 lines)
Line 0 Link Here
1
--- src/frontend/qt/fcitxwatcher.cpp.orig	2018-09-09 06:32:17 UTC
2
+++ src/frontend/qt/fcitxwatcher.cpp
3
@@ -24,6 +24,7 @@
4
 #include <QDir>
5
 #include <QFileSystemWatcher>
6
 #include <signal.h>
7
+#include <errno.h>
8
 
9
 // utils function in fcitx-utils and fcitx-config
10
 bool _pid_exists(pid_t pid) {
(-)chinese/fcitx/files/patch-tools__gui__quickphrase-editor__CMakeLists.txt (-10 lines)
Lines 1-10 Link Here
1
--- tools/gui/quickphrase-editor/CMakeLists.txt.orig	2015-12-12 08:02:09 UTC
2
+++ tools/gui/quickphrase-editor/CMakeLists.txt
3
@@ -18,6 +18,7 @@ include_directories(
4
   ${QT_QTGUI_INCLUDE_DIR}
5
   ${LIBINTL_INCLUDE_DIR}
6
   ${CMAKE_CURRENT_BINARY_DIR}
7
+  ${LIBINTL_INCLUDE_DIR}
8
   )
9
 qt4_wrap_ui(QUICKPHRASE_EDITOR_SRCS editordialog.ui batchdialog.ui editor.ui)
10
 add_library(fcitx-quickphrase-editor
(-)chinese/fcitx/pkg-plist (-3 / +12 lines)
Lines 82-87 Link Here
82
include/fcitx/module/x11/x11stuff.h
82
include/fcitx/module/x11/x11stuff.h
83
include/fcitx/module/xkb/fcitx-xkb.h
83
include/fcitx/module/xkb/fcitx-xkb.h
84
include/fcitx/module/xkb/xkb.h
84
include/fcitx/module/xkb/xkb.h
85
include/fcitx/module/xkbdbus/fcitx-xkbdbus.h
85
include/fcitx/profile.h
86
include/fcitx/profile.h
86
include/fcitx/ui.h
87
include/fcitx/ui.h
87
lib/fcitx/fcitx-autoeng.so
88
lib/fcitx/fcitx-autoeng.so
Lines 93-98 Link Here
93
lib/fcitx/fcitx-fullwidth-char.so
94
lib/fcitx/fcitx-fullwidth-char.so
94
lib/fcitx/fcitx-imselector.so
95
lib/fcitx/fcitx-imselector.so
95
lib/fcitx/fcitx-ipc.so
96
lib/fcitx/fcitx-ipc.so
97
lib/fcitx/fcitx-ipcportal.so
96
lib/fcitx/fcitx-keyboard.so
98
lib/fcitx/fcitx-keyboard.so
97
lib/fcitx/fcitx-kimpanel-ui.so
99
lib/fcitx/fcitx-kimpanel-ui.so
98
lib/fcitx/fcitx-notificationitem.so
100
lib/fcitx/fcitx-notificationitem.so
Lines 114-120 Link Here
114
lib/fcitx/libexec/fcitx-po-parser
116
lib/fcitx/libexec/fcitx-po-parser
115
%%QT4%%lib/fcitx/libexec/fcitx-qt-gui-wrapper
117
%%QT4%%lib/fcitx/libexec/fcitx-qt-gui-wrapper
116
lib/fcitx/libexec/fcitx-scanner
118
lib/fcitx/libexec/fcitx-scanner
117
%%QT4%%lib/fcitx/qt/libfcitx-quickphrase-editor.so
118
lib/girepository-1.0/Fcitx-1.0.typelib
119
lib/girepository-1.0/Fcitx-1.0.typelib
119
%%GTK2%%lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-fcitx.so
120
%%GTK2%%lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-fcitx.so
120
%%GTK2%%@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
121
%%GTK2%%@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
Lines 130-137 Link Here
130
lib/libfcitx-core.so.0
131
lib/libfcitx-core.so.0
131
lib/libfcitx-core.so.0.3
132
lib/libfcitx-core.so.0.3
132
lib/libfcitx-gclient.so
133
lib/libfcitx-gclient.so
133
lib/libfcitx-gclient.so.0
134
lib/libfcitx-gclient.so.1
134
lib/libfcitx-gclient.so.0.1
135
lib/libfcitx-gclient.so.0.2
135
%%QT4%%lib/libfcitx-qt.so
136
%%QT4%%lib/libfcitx-qt.so
136
%%QT4%%lib/libfcitx-qt.so.0
137
%%QT4%%lib/libfcitx-qt.so.0
137
%%QT4%%lib/libfcitx-qt.so.0.1
138
%%QT4%%lib/libfcitx-qt.so.0.1
Lines 184-189 Link Here
184
%%DATADIR%%/addon/fcitx-fullwidth-char.conf
185
%%DATADIR%%/addon/fcitx-fullwidth-char.conf
185
%%DATADIR%%/addon/fcitx-imselector.conf
186
%%DATADIR%%/addon/fcitx-imselector.conf
186
%%DATADIR%%/addon/fcitx-ipc.conf
187
%%DATADIR%%/addon/fcitx-ipc.conf
188
%%DATADIR%%/addon/fcitx-ipcportal.conf
187
%%DATADIR%%/addon/fcitx-keyboard.conf
189
%%DATADIR%%/addon/fcitx-keyboard.conf
188
%%DATADIR%%/addon/fcitx-kimpanel-ui.conf
190
%%DATADIR%%/addon/fcitx-kimpanel-ui.conf
189
%%DATADIR%%/addon/fcitx-notificationitem.conf
191
%%DATADIR%%/addon/fcitx-notificationitem.conf
Lines 229-234 Link Here
229
%%DATADIR%%/data/punc.mb.zh_HK
231
%%DATADIR%%/data/punc.mb.zh_HK
230
%%DATADIR%%/data/punc.mb.zh_TW
232
%%DATADIR%%/data/punc.mb.zh_TW
231
%%DATADIR%%/data/quickphrase.d/emoji.mb
233
%%DATADIR%%/data/quickphrase.d/emoji.mb
234
%%DATADIR%%/data/quickphrase.d/emoji-eac.mb
232
%%DATADIR%%/data/quickphrase.d/latex.mb
235
%%DATADIR%%/data/quickphrase.d/latex.mb
233
%%DATADIR%%/data/vk.conf
236
%%DATADIR%%/data/vk.conf
234
%%DATADIR%%/dbus/daemon.conf
237
%%DATADIR%%/dbus/daemon.conf
Lines 242-249 Link Here
242
%%DATADIR%%/inputmethod/pinyin.conf
245
%%DATADIR%%/inputmethod/pinyin.conf
243
%%DATADIR%%/inputmethod/qw.conf
246
%%DATADIR%%/inputmethod/qw.conf
244
%%DATADIR%%/inputmethod/shuangpin.conf
247
%%DATADIR%%/inputmethod/shuangpin.conf
248
%%DATADIR%%/pinyin/pySym.mb
245
%%DATADIR%%/pinyin/pybase.mb
249
%%DATADIR%%/pinyin/pybase.mb
246
%%DATADIR%%/pinyin/pyphrase.mb
250
%%DATADIR%%/pinyin/pyphrase.mb
251
%%DATADIR%%/pinyin/sp.dat
247
%%DATADIR%%/py-enhance/py_stroke.mb
252
%%DATADIR%%/py-enhance/py_stroke.mb
248
%%DATADIR%%/py-enhance/py_table.mb
253
%%DATADIR%%/py-enhance/py_table.mb
249
%%DATADIR%%/skin/classic/active.png
254
%%DATADIR%%/skin/classic/active.png
Lines 432-441 Link Here
432
share/icons/hicolor/scalable/apps/fcitx-vk-inactive-symbolic.svg
437
share/icons/hicolor/scalable/apps/fcitx-vk-inactive-symbolic.svg
433
share/icons/hicolor/scalable/apps/fcitx-vk-inactive.svg
438
share/icons/hicolor/scalable/apps/fcitx-vk-inactive.svg
434
share/icons/hicolor/scalable/apps/fcitx.svg
439
share/icons/hicolor/scalable/apps/fcitx.svg
440
share/locale/ca/LC_MESSAGES/fcitx.mo
441
share/locale/da/LC_MESSAGES/fcitx.mo
435
share/locale/de/LC_MESSAGES/fcitx.mo
442
share/locale/de/LC_MESSAGES/fcitx.mo
436
share/locale/es/LC_MESSAGES/fcitx.mo
443
share/locale/es/LC_MESSAGES/fcitx.mo
444
share/locale/fr/LC_MESSAGES/fcitx.mo
437
share/locale/ja/LC_MESSAGES/fcitx.mo
445
share/locale/ja/LC_MESSAGES/fcitx.mo
438
share/locale/ko/LC_MESSAGES/fcitx.mo
446
share/locale/ko/LC_MESSAGES/fcitx.mo
447
share/locale/ru/LC_MESSAGES/fcitx.mo
439
share/locale/zh_CN/LC_MESSAGES/fcitx.mo
448
share/locale/zh_CN/LC_MESSAGES/fcitx.mo
440
share/locale/zh_TW/LC_MESSAGES/fcitx.mo
449
share/locale/zh_TW/LC_MESSAGES/fcitx.mo
441
share/mime/packages/x-fskin.xml
450
share/mime/packages/x-fskin.xml

Return to bug 231612