|
0 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
1 |
index b3a7bc2..22418c9 100644
|
|
2 |
--- a/CMakeLists.txt
|
|
3 |
+++ b/CMakeLists.txt
|
|
4 |
@@ -57,6 +57,7 @@ find_package(XkbFile REQUIRED)
|
|
5 |
find_package(Enchant REQUIRED)
|
|
6 |
find_package(IsoCodes REQUIRED)
|
|
7 |
find_package(Presage)
|
|
8 |
+find_package(ICU REQUIRED)
|
|
9 |
FIND_PACKAGE(X11 REQUIRED)
|
|
10 |
|
|
11 |
if (NOT X11_Xkb_FOUND)
|
|
12 |
diff --git a/cmake/GObjectIntrospection.cmake b/cmake/GObjectIntrospection.cmake
|
|
13 |
index e9099de..7c0d588 100644
|
|
14 |
--- a/cmake/GObjectIntrospection.cmake
|
|
15 |
+++ b/cmake/GObjectIntrospection.cmake
|
|
16 |
@@ -141,6 +141,15 @@ function(gobject_introspection _FIRST_ARG)
|
|
17 |
_gir_list_prefix(GIR_REAL_INCLUDE GIR_INCLUDE "--include=")
|
|
18 |
endif(GIR_INCLUDE)
|
|
19 |
|
|
20 |
+ if (GIR_SOURCES)
|
|
21 |
+ set(GIR_REAL_SOURCES)
|
|
22 |
+
|
|
23 |
+ foreach(ITEM ${GIR_SOURCES})
|
|
24 |
+ get_source_file_property(LOCATION ${ITEM} LOCATION)
|
|
25 |
+ list(APPEND GIR_REAL_SOURCES "${LOCATION}")
|
|
26 |
+ endforeach(ITEM)
|
|
27 |
+ endif(GIR_SOURCES)
|
|
28 |
+
|
|
29 |
# if the user specified BUILT_SOURCES, we need to get their paths since
|
|
30 |
# they could be in CMAKE_CURRENT_BUILD_DIR
|
|
31 |
if(GIR_BUILT_SOURCES)
|
|
32 |
@@ -170,15 +179,15 @@ function(gobject_introspection _FIRST_ARG)
|
|
33 |
${GIR_REAL_PACKAGES}
|
|
34 |
${GIR_REAL_INCLUDE}
|
|
35 |
--no-libtool
|
|
36 |
- -L${CMAKE_CURRENT_BINARY_DIR}
|
|
37 |
+ -L ${CMAKE_CURRENT_BINARY_DIR}
|
|
38 |
--output=${CMAKE_CURRENT_BINARY_DIR}/${GIR_FILENAME}
|
|
39 |
${GIR_PACKAGE_EXPORT}
|
|
40 |
${GIR_SCANNER_FLAGS}
|
|
41 |
- ${GIR_SOURCES}
|
|
42 |
+ ${GIR_REAL_SOURCES}
|
|
43 |
${GIR_REAL_BUILT_SOURCES}
|
|
44 |
OUTPUT ${GIR_FILENAME}
|
|
45 |
DEPENDS ${GIR_LIBRARY}
|
|
46 |
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
47 |
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
|
48 |
VERBATIM
|
|
49 |
)
|
|
50 |
|
|
51 |
diff --git a/src/frontend/qt/CMakeLists.txt b/src/frontend/qt/CMakeLists.txt
|
|
52 |
index c26ce12..d30d3f3 100644
|
|
53 |
--- a/src/frontend/qt/CMakeLists.txt
|
|
54 |
+++ b/src/frontend/qt/CMakeLists.txt
|
|
55 |
@@ -1,6 +1,5 @@
|
|
56 |
if (ENABLE_QT_IM_MODULE)
|
|
57 |
find_package(Qt4 4.5 COMPONENTS QtCore QtGui QtDBus REQUIRED)
|
|
58 |
-find_package(ICU REQUIRED)
|
|
59 |
|
|
60 |
# use newer macro from Qt4Macro.cmake
|
|
61 |
MACRO(FCITX_QT4_ADD_DBUS_INTERFACE _sources _interface _basename)
|
|
62 |
diff --git a/src/frontend/qt/fcitx-input-context.cpp b/src/frontend/qt/fcitx-input-context.cpp
|
|
63 |
index b7f15e3..7b5cb04 100644
|
|
64 |
--- a/src/frontend/qt/fcitx-input-context.cpp
|
|
65 |
+++ b/src/frontend/qt/fcitx-input-context.cpp
|
|
66 |
@@ -51,6 +51,14 @@ static const int XKeyRelease = KeyRelease;
|
|
67 |
#undef FocusOut
|
|
68 |
#endif
|
|
69 |
|
|
70 |
+#ifndef Q_LIKELY
|
|
71 |
+#define Q_LIKELY(x) (x)
|
|
72 |
+#endif
|
|
73 |
+
|
|
74 |
+#ifndef Q_UNLIKELY
|
|
75 |
+#define Q_UNLIKELY(x) (x)
|
|
76 |
+#endif
|
|
77 |
+
|
|
78 |
typedef struct _FcitxComposeTableCompact FcitxComposeTableCompact;
|
|
79 |
struct _FcitxComposeTableCompact {
|
|
80 |
const quint32 *data;
|
|
81 |
diff --git a/src/frontend/xim/ximhandler.c b/src/frontend/xim/ximhandler.c
|
|
82 |
index 9e0fa51..2e34090 100644
|
|
83 |
--- a/src/frontend/xim/ximhandler.c
|
|
84 |
+++ b/src/frontend/xim/ximhandler.c
|
|
85 |
@@ -260,8 +260,6 @@ void XimForwardKeyInternal(FcitxXimFrontend *xim,
|
|
86 |
{
|
|
87 |
IMForwardEventStruct* forwardEvent = fcitx_utils_new(IMForwardEventStruct);
|
|
88 |
|
|
89 |
- FcitxLog(INFO, "2: %d %d", ic->connect_id, ic->id);
|
|
90 |
-
|
|
91 |
forwardEvent->connect_id = ic->connect_id;
|
|
92 |
forwardEvent->icid = ic->id;
|
|
93 |
forwardEvent->major_code = XIM_FORWARD_EVENT;
|
|
94 |
diff --git a/src/frontend/xim/ximqueue.c b/src/frontend/xim/ximqueue.c
|
|
95 |
index 1d9411b..2c35b4a 100644
|
|
96 |
--- a/src/frontend/xim/ximqueue.c
|
|
97 |
+++ b/src/frontend/xim/ximqueue.c
|
|
98 |
@@ -36,8 +36,6 @@ void* XimConsumeQueue(void* arg, FcitxModuleFunctionArg args)
|
|
99 |
switch(item->type) {
|
|
100 |
case XCT_FORWARD:
|
|
101 |
{
|
|
102 |
- IMForwardEventStruct* fes = (IMForwardEventStruct*) item->ptr;
|
|
103 |
- FcitxLog(INFO, "%d %d", fes->connect_id, fes->icid);
|
|
104 |
IMForwardEvent(xim->ims, item->ptr);
|
|
105 |
}
|
|
106 |
break;
|