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

Collapse All | Expand All

(-)chinese/fcitx-sunpinyin/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (fcitx/fcitx-sunpinyin-0.3.6.tar.xz) = 6ed029860fe8df1e39bf8f36ada4473a94467887614e103d5832fd8a09cfa6a6
1
SHA256 (fcitx/fcitx-sunpinyin-0.3.8.tar.xz) = 7a65087f9cc9136d5a64006f2d2a34fe81b3ac6e73f25326a62f5013d996431b
2
SIZE (fcitx/fcitx-sunpinyin-0.3.6.tar.xz) = 40348
2
SIZE (fcitx/fcitx-sunpinyin-0.3.8.tar.xz) = 41376
(-)chinese/fcitx-sunpinyin/files/patch-data_CMakeLists.txt (+13 lines)
Line 0 Link Here
1
diff data/CMakeLists.txt.orig data/CMakeLists.txt
2
index d5e9ae1..9c05fce 100644
3
--- data/CMakeLists.txt.orig
4
+++ data/CMakeLists.txt
5
@@ -9,3 +9,5 @@ endforeach(size 16 22 24 32 48 128)
6
 install(FILES sunpinyin-logo-22.png DESTINATION share/fcitx/skin/dark RENAME sunpinyin.png)
7
 install(FILES sunpinyin-logo-16.png DESTINATION share/fcitx/skin/default RENAME sunpinyin.png)
8
 install(FILES sunpinyin-logo-16.png DESTINATION share/fcitx/skin/classic RENAME sunpinyin.png)
9
+
10
+install(FILES sunpinyin-logo-48.png DESTINATION share/fcitx/imicon RENAME sunpinyin.png)
11
-- 
12
1.7.10
13
(-)chinese/fcitx-sunpinyin/pkg-plist (+1 lines)
Lines 5-10 Link Here
5
share/fcitx/skin/classic/sunpinyin.png
5
share/fcitx/skin/classic/sunpinyin.png
6
share/fcitx/skin/dark/sunpinyin.png
6
share/fcitx/skin/dark/sunpinyin.png
7
share/fcitx/skin/default/sunpinyin.png
7
share/fcitx/skin/default/sunpinyin.png
8
share/fcitx/imicon/sunpinyin.png
8
share/icons/hicolor/128x128/apps/fcitx-sunpinyin.png
9
share/icons/hicolor/128x128/apps/fcitx-sunpinyin.png
9
share/icons/hicolor/16x16/apps/fcitx-sunpinyin.png
10
share/icons/hicolor/16x16/apps/fcitx-sunpinyin.png
10
share/icons/hicolor/22x22/apps/fcitx-sunpinyin.png
11
share/icons/hicolor/22x22/apps/fcitx-sunpinyin.png
(-)chinese/fcitx-sunpinyin/Makefile (-4 / +3 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	fcitx-sunpinyin
8
PORTNAME=	fcitx-sunpinyin
9
PORTVERSION=	0.3.6
9
PORTVERSION=	0.3.8
10
PORTREVISION=	1
11
CATEGORIES=	chinese
10
CATEGORIES=	chinese
12
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
11
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
13
DIST_SUBDIR=	fcitx
12
DIST_SUBDIR=	fcitx
Lines 15-22 Link Here
15
MAINTAINER=	lichray@gmail.com
14
MAINTAINER=	lichray@gmail.com
16
COMMENT=	SunPinyin support for Fcitx
15
COMMENT=	SunPinyin support for Fcitx
17
16
18
LIB_DEPENDS=	fcitx-config.4:${PORTSDIR}/chinese/fcitx \
17
LIB_DEPENDS=	fcitx-config:${PORTSDIR}/chinese/fcitx \
19
		sunpinyin.3:${PORTSDIR}/chinese/sunpinyin
18
		sunpinyin:${PORTSDIR}/chinese/sunpinyin
20
19
21
USE_XZ=		yes
20
USE_XZ=		yes
22
USE_GETTEXT=	yes
21
USE_GETTEXT=	yes
(-)chinese/fcitx-cloudpinyin/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (fcitx/fcitx-cloudpinyin-0.2.1.tar.xz) = 548a08a2a1585c5dc13c5bf6116197203dafc2c475efdf5b6e57bdb900cb2cac
1
SHA256 (fcitx/fcitx-cloudpinyin-0.2.3.tar.xz) = 01a97c975e2485831d47bb9648f724683a89facba53d8d127bff950e61a77dff
2
SIZE (fcitx/fcitx-cloudpinyin-0.2.1.tar.xz) = 18388
2
SIZE (fcitx/fcitx-cloudpinyin-0.2.3.tar.xz) = 18636
(-)chinese/fcitx-cloudpinyin/Makefile (-3 / +2 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	fcitx-cloudpinyin
8
PORTNAME=	fcitx-cloudpinyin
9
PORTVERSION=	0.2.1
9
PORTVERSION=	0.2.3
10
PORTREVISION=	1
11
CATEGORIES=	chinese
10
CATEGORIES=	chinese
12
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
11
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
13
DIST_SUBDIR=	fcitx
12
DIST_SUBDIR=	fcitx
Lines 15-21 Link Here
15
MAINTAINER=	lichray@gmail.com
14
MAINTAINER=	lichray@gmail.com
16
COMMENT=	A cloud-based Pinyin module for Fcitx
15
COMMENT=	A cloud-based Pinyin module for Fcitx
17
16
18
LIB_DEPENDS=	fcitx-config.4:${PORTSDIR}/chinese/fcitx \
17
LIB_DEPENDS=	fcitx-config:${PORTSDIR}/chinese/fcitx \
19
		curl:${PORTSDIR}/ftp/curl
18
		curl:${PORTSDIR}/ftp/curl
20
19
21
USE_XZ=		yes
20
USE_XZ=		yes
(-)chinese/fcitx/distinfo (-2 / +2 lines)
Lines 1-5 Link Here
1
SHA256 (fcitx/fcitx-4.2.3.tar.xz) = 4b7d22ada50f7e375096094c2abcf09ad114ffb68521ccf0de37d71e1014183c
1
SHA256 (fcitx/fcitx-4.2.5.tar.xz) = 478d311d3427e255729671f3a461762348bf5d83ed694d78021012778047140a
2
SIZE (fcitx/fcitx-4.2.3.tar.xz) = 612028
2
SIZE (fcitx/fcitx-4.2.5.tar.xz) = 1413724
3
SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1
3
SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1
4
SIZE (fcitx/pinyin.tar.gz) = 1608886
4
SIZE (fcitx/pinyin.tar.gz) = 1608886
5
SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
5
SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
(-)chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt (+18 lines)
Line 0 Link Here
1
--- src/lib/fcitx-gclient/CMakeLists.txt~	2012-07-17 15:21:04.000000000 -0500
2
+++ src/lib/fcitx-gclient/CMakeLists.txt	2012-07-18 00:46:13.209418264 -0500
3
@@ -46,7 +46,7 @@ target_link_libraries(fcitx-gclient ${GI
4
 configure_file(fcitx-gclient.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc)
5
 
6
 install(TARGETS fcitx-gclient LIBRARY DESTINATION "${libdir}")
7
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc DESTINATION "${libdir}/pkgconfig")
8
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc DESTINATION "libdata/pkgconfig")
9
 install(FILES ${FCITX_GCLIENT_HEADERS} DESTINATION "${includedir}/fcitx-gclient")
10
 
11
 if (ENABLE_GIR)
12
@@ -86,4 +86,4 @@ install(TARGETS fcitx-gclient-static
13
 )
14
 endif (ENABLE_STATIC)
15
 
16
-add_subdirectory(test)
17
\ No newline at end of file
18
+add_subdirectory(test)
(-)chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxinputmethod.c (+16 lines)
Line 0 Link Here
1
--- src/lib/fcitx-gclient/fcitxinputmethod.c~	2012-07-17 15:21:04.000000000 -0500
2
+++ src/lib/fcitx-gclient/fcitxinputmethod.c	2012-07-18 00:24:39.533453747 -0500
3
@@ -58,11 +58,11 @@ enum {
4
 
5
 static guint signals[LAST_SIGNAL] = {0};
6
 
7
-G_DEFINE_TYPE(FcitxInputMethod, fcitx_input_method, G_TYPE_DBUS_PROXY);
8
-
9
 FCITX_EXPORT_API
10
 GType        fcitx_input_method_get_type(void) G_GNUC_CONST;
11
 
12
+G_DEFINE_TYPE(FcitxInputMethod, fcitx_input_method, G_TYPE_DBUS_PROXY);
13
+
14
 static GDBusInterfaceInfo * _fcitx_input_method_get_interface_info(void);
15
 static void _fcitx_im_item_foreach_cb(gpointer data, gpointer user_data);
16
 
(-)chinese/fcitx/files/patch-data_script_CMakeLists.txt (+11 lines)
Line 0 Link Here
1
--- data/script/CMakeLists.txt~	2012-07-17 15:21:04.000000000 -0500
2
+++ data/script/CMakeLists.txt	2012-07-18 03:16:21.077945464 -0500
3
@@ -2,7 +2,3 @@ install(FILES fcitx-configtool DESTINATI
4
 
5
 configure_file(fcitx4-config.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx4-config)
6
 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)
7
-
8
-if (_ENABLE_DBUS)
9
-install(FILES fcitx-autostart DESTINATION ${bindir}  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
10
-endif (_ENABLE_DBUS)
11
\ No newline at end of file
(-)chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxkbd.c (+16 lines)
Line 0 Link Here
1
--- src/lib/fcitx-gclient/fcitxkbd.c~	2012-07-17 15:21:04.000000000 -0500
2
+++ src/lib/fcitx-gclient/fcitxkbd.c	2012-07-18 00:25:05.368996486 -0500
3
@@ -45,11 +45,11 @@ static const gchar introspection_xml[] =
4
 "</node>";
5
 
6
 
7
-G_DEFINE_TYPE(FcitxKbd, fcitx_kbd, G_TYPE_DBUS_PROXY);
8
-
9
 FCITX_EXPORT_API
10
 GType        fcitx_kbd_get_type(void) G_GNUC_CONST;
11
 
12
+G_DEFINE_TYPE(FcitxKbd, fcitx_kbd, G_TYPE_DBUS_PROXY);
13
+
14
 static GDBusInterfaceInfo * _fcitx_kbd_get_interface_info(void);
15
 
16
 static GDBusInterfaceInfo *
(-)chinese/fcitx/files/patch-src_lib_fcitx-utils_utils.c (-78 / +23 lines)
Lines 1-78 Link Here
1
diff --git src/lib/fcitx-utils/utils.c src/lib/fcitx-utils/utils.c
1
--- ./src/lib/fcitx-utils/utils.c~	2012-07-17 15:21:04.000000000 -0500
2
index c97ff44..473abc3 100644
2
+++ ./src/lib/fcitx-utils/utils.c	2012-07-18 00:14:56.901797676 -0500
3
--- src/lib/fcitx-utils/utils.c
3
@@ -113,13 +113,13 @@ void fcitx_utils_init_as_daemon()
4
+++ src/lib/fcitx-utils/utils.c
4
         exit(0);
5
@@ -337,19 +337,23 @@ int fcitx_utils_pid_exists(pid_t pid)
5
     }
6
     if (vm == 0) // ignore all error
6
     setsid();
7
         return 1;
7
-    sighandler_t oldint = signal(SIGINT, SIG_IGN);
8
 
8
-    sighandler_t oldhup  =signal(SIGHUP, SIG_IGN);
9
-    int cnt;
9
-    sighandler_t oldquit = signal(SIGQUIT, SIG_IGN);
10
-    struct kinfo_proc * kp = kvm_getprocs(vm, KERN_PROC_PID, pid, &cnt);
10
-    sighandler_t oldpipe = signal(SIGPIPE, SIG_IGN);
11
-    if (kp == 0)
11
-    sighandler_t oldttou = signal(SIGTTOU, SIG_IGN);
12
-        return 1;
12
-    sighandler_t oldttin = signal(SIGTTIN, SIG_IGN);
13
-    int i;
13
-    sighandler_t oldchld = signal(SIGCHLD, SIG_IGN);
14
-    for (i = 0; i < cnt; i++)
14
+    sig_t oldint = signal(SIGINT, SIG_IGN);
15
-        if (kp->ki_pid == pid)
15
+    sig_t oldhup  =signal(SIGHUP, SIG_IGN);
16
+    int result = 1;
16
+    sig_t oldquit = signal(SIGQUIT, SIG_IGN);
17
+    do {
17
+    sig_t oldpipe = signal(SIGPIPE, SIG_IGN);
18
+        int cnt;
18
+    sig_t oldttou = signal(SIGTTOU, SIG_IGN);
19
+        struct kinfo_proc * kp = kvm_getprocs(vm, KERN_PROC_PID, pid, &cnt);
19
+    sig_t oldttin = signal(SIGTTIN, SIG_IGN);
20
+        if (kp == 0) {
20
+    sig_t oldchld = signal(SIGCHLD, SIG_IGN);
21
+            result = 1;
21
     if (fork() > 0)
22
             break;
22
         exit(0);
23
-    int result;
23
     chdir("/");
24
-    if (i != cnt)
25
-        result = 1;
26
-    else
27
-        result = 0;
28
+        }
29
+        int i;
30
+        for (i = 0; i < cnt; i++)
31
+            if (kp->ki_pid == pid)
32
+                break;
33
+        if (i != cnt)
34
+            result = 1;
35
+        else
36
+            result = 0;
37
+    } while (0);
38
     kvm_close(vm);
39
     return result;
40
 #else
41
@@ -386,21 +390,24 @@ char* fcitx_utils_get_process_name()
42
     if (vm == 0)
43
         return strdup("");
44
 
45
-    int cnt;
46
-    int mypid = getpid();
47
-    struct kinfo_proc * kp = kvm_getprocs(vm, KERN_PROC_PID, mypid, &cnt);
48
-    if ((cnt != 1) || (kp == 0))
49
-        return strdup("");
50
-    int i;
51
-    for (i = 0; i < cnt; i++)
52
-        if (kp->ki_pid == mypid)
53
-            break;
54
     char* result = NULL;
55
-    if (i != cnt)
56
-        result = strdup(kp->ki_comm);
57
-    else
58
-        result = strdup("");
59
+    do {
60
+        int cnt;
61
+        int mypid = getpid();
62
+        struct kinfo_proc * kp = kvm_getprocs(vm, KERN_PROC_PID, mypid, &cnt);
63
+        if ((cnt != 1) || (kp == 0)) {
64
+            break;
65
+        }
66
+        int i;
67
+        for (i = 0; i < cnt; i++)
68
+            if (kp->ki_pid == mypid)
69
+                break;
70
+        if (i != cnt)
71
+            result = strdup(kp->ki_comm);
72
+    } while (0);
73
     kvm_close(vm);
74
+    if (result == NULL)
75
+        result = strdup("");
76
     return result;
77
 #else
78
     return strdup("");
(-)chinese/fcitx/files/patch-src_module_unicode_charselectdata.c (+11 lines)
Line 0 Link Here
1
--- src/module/unicode/charselectdata.c~	2012-07-17 15:21:04.000000000 -0500
2
+++ src/module/unicode/charselectdata.c	2012-07-18 00:20:19.447890414 -0500
3
@@ -4,7 +4,7 @@
4
  * original file is licensed under GPLv2+
5
  */
6
 
7
-#include <endian.h>
8
+#include <sys/endian.h>
9
 #include <ctype.h>
10
 #include <libintl.h>
11
 #include <fcitx-utils/uthash.h>
(-)chinese/fcitx/pkg-plist (-2 / +38 lines)
Lines 13-18 Link Here
13
include/fcitx-config/fcitx-config.h
13
include/fcitx-config/fcitx-config.h
14
include/fcitx-config/hotkey.h
14
include/fcitx-config/hotkey.h
15
include/fcitx-config/xdg.h
15
include/fcitx-config/xdg.h
16
include/fcitx-gclient/fcitxkbd.h
17
include/fcitx-gclient/fcitxclient.h
18
include/fcitx-gclient/fcitxinputmethod.h
19
include/fcitx-utils/keysymgen.h
20
include/fcitx-utils/keysym.h
16
include/fcitx-utils/log.h
21
include/fcitx-utils/log.h
17
include/fcitx-utils/memory.h
22
include/fcitx-utils/memory.h
18
include/fcitx-utils/utarray.h
23
include/fcitx-utils/utarray.h
Lines 36-41 Link Here
36
include/fcitx/module/ipc/ipc.h
41
include/fcitx/module/ipc/ipc.h
37
include/fcitx/module/pinyin/pydef.h
42
include/fcitx/module/pinyin/pydef.h
38
include/fcitx/module/punc/punc.h
43
include/fcitx/module/punc/punc.h
44
include/fcitx/module/quickphrase/quickphrase.h
39
include/fcitx/module/x11/x11stuff.h
45
include/fcitx/module/x11/x11stuff.h
40
include/fcitx/profile.h
46
include/fcitx/profile.h
41
include/fcitx/ui.h
47
include/fcitx/ui.h
Lines 44-49 Link Here
44
lib/fcitx/fcitx-classic-ui.so
50
lib/fcitx/fcitx-classic-ui.so
45
lib/fcitx/fcitx-dbus.so
51
lib/fcitx/fcitx-dbus.so
46
lib/fcitx/fcitx-fullwidth-char.so
52
lib/fcitx/fcitx-fullwidth-char.so
53
lib/fcitx/fcitx-keyboard.so
54
lib/fcitx/fcitx-imselector.so
47
lib/fcitx/fcitx-ipc.so
55
lib/fcitx/fcitx-ipc.so
48
lib/fcitx/fcitx-kimpanel-ui.so
56
lib/fcitx/fcitx-kimpanel-ui.so
49
lib/fcitx/fcitx-pinyin.so
57
lib/fcitx/fcitx-pinyin.so
Lines 52-66 Link Here
52
lib/fcitx/fcitx-qw.so
60
lib/fcitx/fcitx-qw.so
53
lib/fcitx/fcitx-remote-module.so
61
lib/fcitx/fcitx-remote-module.so
54
lib/fcitx/fcitx-table.so
62
lib/fcitx/fcitx-table.so
63
lib/fcitx/fcitx-unicode.so
55
lib/fcitx/fcitx-vk.so
64
lib/fcitx/fcitx-vk.so
56
lib/fcitx/fcitx-x11.so
65
lib/fcitx/fcitx-x11.so
57
lib/fcitx/fcitx-xim.so
66
lib/fcitx/fcitx-xim.so
67
lib/fcitx/fcitx-xkb.so
68
lib/fcitx/fcitx-xkbdbus.so
58
lib/libfcitx-config.so
69
lib/libfcitx-config.so
59
lib/libfcitx-config.so.4
70
lib/libfcitx-config.so.4
60
lib/libfcitx-config.so.4.1
71
lib/libfcitx-config.so.4.1
61
lib/libfcitx-core.so
72
lib/libfcitx-core.so
62
lib/libfcitx-core.so.0
73
lib/libfcitx-core.so.0
63
lib/libfcitx-core.so.0.3
74
lib/libfcitx-core.so.0.3
75
lib/libfcitx-gclient.so
76
lib/libfcitx-gclient.so.0
77
lib/libfcitx-gclient.so.0.1
64
lib/libfcitx-utils.so
78
lib/libfcitx-utils.so
65
lib/libfcitx-utils.so.0
79
lib/libfcitx-utils.so.0
66
lib/libfcitx-utils.so.0.1
80
lib/libfcitx-utils.so.0.1
Lines 74-79 Link Here
74
%%QT4%%@dirrmtry lib/qt4/plugins/inputmethods
88
%%QT4%%@dirrmtry lib/qt4/plugins/inputmethods
75
%%QT4%%@dirrmtry lib/qt4/plugins
89
%%QT4%%@dirrmtry lib/qt4/plugins
76
libdata/pkgconfig/fcitx-config.pc
90
libdata/pkgconfig/fcitx-config.pc
91
libdata/pkgconfig/fcitx-gclient.pc
77
libdata/pkgconfig/fcitx-utils.pc
92
libdata/pkgconfig/fcitx-utils.pc
78
libdata/pkgconfig/fcitx.pc
93
libdata/pkgconfig/fcitx.pc
79
share/applications/fcitx-configtool.desktop
94
share/applications/fcitx-configtool.desktop
Lines 93-99 Link Here
93
%%DATADIR%%/addon/fcitx-classic-ui.conf
108
%%DATADIR%%/addon/fcitx-classic-ui.conf
94
%%DATADIR%%/addon/fcitx-dbus.conf
109
%%DATADIR%%/addon/fcitx-dbus.conf
95
%%DATADIR%%/addon/fcitx-fullwidth-char.conf
110
%%DATADIR%%/addon/fcitx-fullwidth-char.conf
111
%%DATADIR%%/addon/fcitx-imselector.conf
96
%%DATADIR%%/addon/fcitx-ipc.conf
112
%%DATADIR%%/addon/fcitx-ipc.conf
113
%%DATADIR%%/addon/fcitx-keyboard.conf
97
%%DATADIR%%/addon/fcitx-kimpanel-ui.conf
114
%%DATADIR%%/addon/fcitx-kimpanel-ui.conf
98
%%DATADIR%%/addon/fcitx-pinyin.conf
115
%%DATADIR%%/addon/fcitx-pinyin.conf
99
%%DATADIR%%/addon/fcitx-punc.conf
116
%%DATADIR%%/addon/fcitx-punc.conf
Lines 101-126 Link Here
101
%%DATADIR%%/addon/fcitx-qw.conf
118
%%DATADIR%%/addon/fcitx-qw.conf
102
%%DATADIR%%/addon/fcitx-remote-module.conf
119
%%DATADIR%%/addon/fcitx-remote-module.conf
103
%%DATADIR%%/addon/fcitx-table.conf
120
%%DATADIR%%/addon/fcitx-table.conf
121
%%DATADIR%%/addon/fcitx-unicode.conf
104
%%DATADIR%%/addon/fcitx-vk.conf
122
%%DATADIR%%/addon/fcitx-vk.conf
105
%%DATADIR%%/addon/fcitx-x11.conf
123
%%DATADIR%%/addon/fcitx-x11.conf
106
%%DATADIR%%/addon/fcitx-xim.conf
124
%%DATADIR%%/addon/fcitx-xim.conf
125
%%DATADIR%%/addon/fcitx-xkb.conf
126
%%DATADIR%%/addon/fcitx-xkbdbus.conf
107
%%DATADIR%%/configdesc/addon.desc
127
%%DATADIR%%/configdesc/addon.desc
108
%%DATADIR%%/configdesc/config.desc
128
%%DATADIR%%/configdesc/config.desc
109
%%DATADIR%%/configdesc/fcitx-chttrans.desc
129
%%DATADIR%%/configdesc/fcitx-chttrans.desc
110
%%DATADIR%%/configdesc/fcitx-classic-ui.desc
130
%%DATADIR%%/configdesc/fcitx-classic-ui.desc
131
%%DATADIR%%/configdesc/fcitx-imselector.desc
132
%%DATADIR%%/configdesc/fcitx-keyboard.desc
111
%%DATADIR%%/configdesc/fcitx-pinyin.desc
133
%%DATADIR%%/configdesc/fcitx-pinyin.desc
112
%%DATADIR%%/configdesc/fcitx-quickphrase.desc
134
%%DATADIR%%/configdesc/fcitx-quickphrase.desc
135
%%DATADIR%%/configdesc/fcitx-table.desc
136
%%DATADIR%%/configdesc/fcitx-unicode.desc
113
%%DATADIR%%/configdesc/fcitx-xim.desc
137
%%DATADIR%%/configdesc/fcitx-xim.desc
138
%%DATADIR%%/configdesc/fcitx-xkb.desc
114
%%DATADIR%%/configdesc/inputmethod.desc
139
%%DATADIR%%/configdesc/inputmethod.desc
115
%%DATADIR%%/configdesc/profile.desc
140
%%DATADIR%%/configdesc/profile.desc
116
%%DATADIR%%/configdesc/skin.desc
141
%%DATADIR%%/configdesc/skin.desc
117
%%DATADIR%%/configdesc/table.desc
142
%%DATADIR%%/configdesc/table.desc
118
%%DATADIR%%/data/AutoEng.dat
143
%%DATADIR%%/data/AutoEng.dat
144
%%DATADIR%%/data/charselectdata
119
%%DATADIR%%/data/gbks2t.tab
145
%%DATADIR%%/data/gbks2t.tab
120
%%DATADIR%%/data/punc.mb.zh_CN
146
%%DATADIR%%/data/punc.mb.zh_CN
121
%%DATADIR%%/data/punc.mb.zh_HK
147
%%DATADIR%%/data/punc.mb.zh_HK
122
%%DATADIR%%/data/punc.mb.zh_TW
148
%%DATADIR%%/data/punc.mb.zh_TW
123
%%DATADIR%%/data/vk.conf
149
%%DATADIR%%/data/vk.conf
150
%%DATADIR%%/imicon/wbpy.png
151
%%DATADIR%%/imicon/ziranma.png
152
%%DATADIR%%/imicon/erbi.png
153
%%DATADIR%%/imicon/wubi.png
154
%%DATADIR%%/imicon/shuangpin.png
155
%%DATADIR%%/imicon/pinyin.png
156
%%DATADIR%%/imicon/cangjie.png
124
%%DATADIR%%/inputmethod/pinyin.conf
157
%%DATADIR%%/inputmethod/pinyin.conf
125
%%DATADIR%%/inputmethod/qw.conf
158
%%DATADIR%%/inputmethod/qw.conf
126
%%DATADIR%%/inputmethod/shuangpin.conf
159
%%DATADIR%%/inputmethod/shuangpin.conf
Lines 315-327 Link Here
315
@dirrmtry share/icons/gnome
348
@dirrmtry share/icons/gnome
316
@dirrmtry share/icons/hicolor/scalable/status
349
@dirrmtry share/icons/hicolor/scalable/status
317
@dirrmtry share/icons/hicolor/scalable
350
@dirrmtry share/icons/hicolor/scalable
318
@dirrm %%DATADIR%%/table
351
@dirrmtry %%DATADIR%%/table
319
@dirrm %%DATADIR%%/skin/default
352
@dirrm %%DATADIR%%/skin/default
320
@dirrm %%DATADIR%%/skin/dark
353
@dirrm %%DATADIR%%/skin/dark
321
@dirrm %%DATADIR%%/skin/classic
354
@dirrm %%DATADIR%%/skin/classic
322
@dirrm %%DATADIR%%/skin
355
@dirrmtry %%DATADIR%%/skin
323
@dirrm %%DATADIR%%/pinyin
356
@dirrm %%DATADIR%%/pinyin
324
@dirrm %%DATADIR%%/inputmethod
357
@dirrm %%DATADIR%%/inputmethod
358
@dirrm %%DATADIR%%/imicon
325
@dirrm %%DATADIR%%/data
359
@dirrm %%DATADIR%%/data
326
@dirrm %%DATADIR%%/configdesc
360
@dirrm %%DATADIR%%/configdesc
327
@dirrm %%DATADIR%%/addon
361
@dirrm %%DATADIR%%/addon
Lines 330-338 Link Here
330
@dirrm share/cmake/fcitx
364
@dirrm share/cmake/fcitx
331
@dirrm lib/fcitx
365
@dirrm lib/fcitx
332
@dirrm include/fcitx/module/x11
366
@dirrm include/fcitx/module/x11
367
@dirrm include/fcitx/module/quickphrase
333
@dirrm include/fcitx/module/punc
368
@dirrm include/fcitx/module/punc
334
@dirrm include/fcitx/module/pinyin
369
@dirrm include/fcitx/module/pinyin
335
@dirrm include/fcitx/module/ipc
370
@dirrm include/fcitx/module/ipc
371
@dirrm include/fcitx-gclient
336
@dirrm include/fcitx/module/dbus
372
@dirrm include/fcitx/module/dbus
337
@dirrm include/fcitx/module/classicui
373
@dirrm include/fcitx/module/classicui
338
@dirrm include/fcitx/module/chttrans
374
@dirrm include/fcitx/module/chttrans
(-)chinese/fcitx/Makefile (-7 / +11 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	fcitx
8
PORTNAME=	fcitx
9
PORTVERSION=	4.2.3
9
PORTVERSION=	4.2.5
10
PORTREVISION=	3
11
CATEGORIES=	chinese x11
10
CATEGORIES=	chinese x11
12
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
11
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
13
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz
12
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz
Lines 19-26 Link Here
19
18
20
LICENSE=	GPLv2
19
LICENSE=	GPLv2
21
20
22
LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
21
BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
23
		dbus-1.3:${PORTSDIR}/devel/dbus
22
LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
23
		dbus-1:${PORTSDIR}/devel/dbus \
24
		enchant:${PORTSDIR}/textproc/enchant \
25
		icuuc:${PORTSDIR}/devel/icu
24
RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
26
RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
25
27
26
MAN1=		createPYMB.1 fcitx-remote.1 fcitx.1 mb2org.1 mb2txt.1 \
28
MAN1=		createPYMB.1 fcitx-remote.1 fcitx.1 mb2org.1 mb2txt.1 \
Lines 28-37 Link Here
28
SUB_FILES=	pkg-message
30
SUB_FILES=	pkg-message
29
SUB_LIST+=	PORTSDIR=${PORTSDIR}
31
SUB_LIST+=	PORTSDIR=${PORTSDIR}
30
32
33
CONFLICTS=	zh-scim-fcitx-3.*
34
31
USE_XZ=		yes
35
USE_XZ=		yes
32
USE_GNOME=	pango intltool gnomehack
36
USE_GNOME=	pango intltool libxml2 gnomehack
33
USE_GETTEXT=	yes
37
USE_GETTEXT=	yes
34
USE_XORG=	x11 xext
38
USE_XORG=	x11 xext xkbfile
35
USE_LDCONFIG=	yes
39
USE_LDCONFIG=	yes
36
USE_CMAKE=	yes
40
USE_CMAKE=	yes
37
INSTALLS_ICONS=	yes
41
INSTALLS_ICONS=	yes
Lines 76-82 Link Here
76
.endif
80
.endif
77
81
78
.if ${PORT_OPTIONS:MOPENCC}
82
.if ${PORT_OPTIONS:MOPENCC}
79
LIB_DEPENDS+=	opencc.1:${PORTSDIR}/chinese/opencc
83
LIB_DEPENDS+=	opencc:${PORTSDIR}/chinese/opencc
80
.else
84
.else
81
CMAKE_ARGS+=	-DENABLE_OPENCC=OFF
85
CMAKE_ARGS+=	-DENABLE_OPENCC=OFF
82
.endif
86
.endif
(-)chinese/fcitx-configtool/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (fcitx/fcitx-configtool-0.4.3.tar.xz) = 0b8722da441acd3deb841f6b389b02499bc99f61a711ce57ad0cccae359a53b9
1
SHA256 (fcitx/fcitx-configtool-0.4.4.tar.xz) = 66cae23c1e1555a5e8e8cb8696e562b0b58d28e16d2f0b9c64a0f274a6c06745
2
SIZE (fcitx/fcitx-configtool-0.4.3.tar.xz) = 34792
2
SIZE (fcitx/fcitx-configtool-0.4.4.tar.xz) = 37764
(-)chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt (-3 / +8 lines)
Lines 1-6 Link Here
1
--- gtk/CMakeLists.txt~	2012-05-03 01:21:57.000000000 -0500
1
--- gtk/CMakeLists.txt.orig	2012-06-02 11:14:45.000000000 -0500
2
+++ gtk/CMakeLists.txt	2012-05-14 01:56:06.761294523 -0500
2
+++ gtk/CMakeLists.txt	2012-07-18 02:00:53.555897529 -0500
3
@@ -49,6 +49,7 @@ target_link_libraries (fcitx-config-gtk
3
@@ -1,3 +1,4 @@
4
+PKG_CHECK_MODULES (GTK2 "gtk+-2.0 >= 2.22" REQUIRED)
5
 PKG_CHECK_MODULES (DBUS_GLIB "dbus-glib-1" REQUIRED)
6
 PKG_CHECK_MODULES (UNIQUE "unique-1.0")
7
 
8
@@ -49,6 +50,7 @@ target_link_libraries (fcitx-config-gtk
4
                        ${FCITX4_FCITX_LIBRARIES}
9
                        ${FCITX4_FCITX_LIBRARIES}
5
                        ${GLIB2_LIBRARIES}
10
                        ${GLIB2_LIBRARIES}
6
                        ${DBUS_GLIB_LIBRARIES}
11
                        ${DBUS_GLIB_LIBRARIES}
(-)chinese/fcitx-configtool/Makefile (-5 / +4 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	fcitx-configtool
8
PORTNAME=	fcitx-configtool
9
PORTVERSION=	0.4.3
9
PORTVERSION=	0.4.4
10
PORTREVISION=	1
11
CATEGORIES=	chinese x11
10
CATEGORIES=	chinese x11
12
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
11
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
13
DIST_SUBDIR=	fcitx
12
DIST_SUBDIR=	fcitx
Lines 17-23 Link Here
17
16
18
BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
17
BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
19
		${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
18
		${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
20
LIB_DEPENDS=	fcitx-config.4:${PORTSDIR}/chinese/fcitx
19
LIB_DEPENDS=	fcitx-config:${PORTSDIR}/chinese/fcitx
21
20
22
USE_XZ=		yes
21
USE_XZ=		yes
23
USE_GNOME=	intltool gnomehack
22
USE_GNOME=	intltool gnomehack
Lines 30-47 Link Here
30
.include <bsd.port.options.mk>
29
.include <bsd.port.options.mk>
31
30
32
.if defined(WITH_GTK2)
31
.if defined(WITH_GTK2)
32
CMAKE_ARGS+=	-DENABLE_GTK2=ON
33
USE_GNOME+=	gtk20
33
USE_GNOME+=	gtk20
34
PLIST_SUB+=	GTK2=""
34
PLIST_SUB+=	GTK2=""
35
.else
35
.else
36
CMAKE_ARGS+=	-DENABLE_GTK2=OFF
37
PLIST_SUB+=	GTK2="@comment "
36
PLIST_SUB+=	GTK2="@comment "
38
.endif
37
.endif
39
38
40
.if defined(WITH_GTK3)
39
.if defined(WITH_GTK3)
41
USE_GNOME+=	gtk30
40
USE_GNOME+=	gtk30
42
CMAKE_ARGS+=	-DENABLE_GTK3=ON
43
PLIST_SUB+=	GTK3=""
41
PLIST_SUB+=	GTK3=""
44
.else
42
.else
43
CMAKE_ARGS+=	-DENABLE_GTK3=OFF
45
PLIST_SUB+=	GTK3="@comment "
44
PLIST_SUB+=	GTK3="@comment "
46
.endif
45
.endif
47
46

Return to bug 170010