rpm/fcitx
SHA256
1
0
Fork 0
forked from pool/fcitx
Code Pull Requests Activity

Accepting request 150047 from M17N

Browse Source 
update 4.2.7 for 12.3 (forwarded request 150046 from MargueriteSu)

OBS-URL: https://build.opensuse.org/request/show/150047
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fcitx?expand=0&rev=18
This commit is contained in:
Stephan Kulow 2013-01-29 11:07:16 +00:00 committed by Git OBS Bridge
commit 620917800c
12 changed files with 213 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
baselibs.conf
View File

@ -1,4 +1,4 @@
libfcitx-4_2_6
libfcitx-4_2_7
fcitx-gtk2
fcitx-gtk3
fcitx-qt4

3
fcitx-4.2.6.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:02cd766be443deeeeefec04900498c941e9034172dad2165a6ad04dd4d442864
size 8476186

60
fcitx-4.2.7-compat-12.2.patch Normal file
View File

@ -0,0 +1,60 @@
diff --git a/src/frontend/gtk2/client.c b/src/frontend/gtk2/client.c
index 8329071..52c5c9a 100644
--- a/src/frontend/gtk2/client.c
+++ b/src/frontend/gtk2/client.c
@@ -31,7 +31,6 @@
#include "client.h"
#include "marshall.h"
-#define LOG_LEVEL DEBUG
#define IC_NAME_MAX 64
#define PREEDIT_TYPE_STRING_INT \
@@ -129,7 +128,7 @@ FcitxIMClient* FcitxIMClientOpen(FcitxIMClientConnectCallback connectcb, FcitxIM
static void _changed_cb(DBusGProxy* proxy, char* service, char* old_owner, char* new_owner, gpointer user_data)
{
- FcitxLog(LOG_LEVEL, "_changed_cb");
+ FcitxLog(DEBUG, "_changed_cb");
FcitxIMClient* client = (FcitxIMClient*) user_data;
if (g_str_equal(service, client->servicename)) {
gboolean new_owner_good = new_owner && (new_owner[0] != '\0');
@@ -151,7 +150,7 @@ static void _changed_cb(DBusGProxy* proxy, char* service, char* old_owner, char*
static void _destroy_cb(DBusGProxy *proxy, gpointer user_data)
{
- FcitxLog(LOG_LEVEL, "_destroy_cb");
+ FcitxLog(DEBUG, "_destroy_cb");
FcitxIMClient* client = (FcitxIMClient*) user_data;
if (client->proxy == proxy) {
g_object_unref(client->proxy);
diff --git a/src/frontend/ipc/ipc.c b/src/frontend/ipc/ipc.c
index a29b1de..e126c4f 100644
--- a/src/frontend/ipc/ipc.c
+++ b/src/frontend/ipc/ipc.c
@@ -33,6 +33,10 @@
#define GetIPCIC(ic) ((FcitxIPCIC*) (ic)->privateic)
+#ifndef DBUS_ERROR_UNKNOWN_PROPERTY
+#define DBUS_ERROR_UNKNOWN_PROPERTY "org.freedesktop.DBus.Error.UnknownProperty"
+#endif
+
typedef struct _FcitxIPCCreateICPriv {
DBusMessage* message;
DBusConnection* conn;
diff --git a/src/lib/fcitx-qt/fcitxqtconnection.cpp b/src/lib/fcitx-qt/fcitxqtconnection.cpp
index 24fc6b6..08a17ea 100644
--- a/src/lib/fcitx-qt/fcitxqtconnection.cpp
+++ b/src/lib/fcitx-qt/fcitxqtconnection.cpp
@@ -28,8 +28,9 @@
#include "fcitx-utils/utils.h"
#include <QX11Info>
#include <QFile>
-#include <qtimer.h>
+#include <QTimer>
#include <QDir>
+#include <QCoreApplication>
#include <X11/Xlib.h>
FcitxQtConnection::FcitxQtConnection(QObject* parent): QObject(parent)

31
fcitx-4.2.7-compat-gcc46.patch Normal file
View File

@ -0,0 +1,31 @@
diff --git a/src/lib/fcitx/module.h b/src/lib/fcitx/module.h
index 28de64f..bae6601 100644
--- a/src/lib/fcitx/module.h
+++ b/src/lib/fcitx/module.h
@@ -109,7 +109,7 @@ extern "C" {
void* FcitxModuleInvokeFunction(FcitxAddon* addon, int functionId, FcitxModuleFunctionArg args);
#define FcitxModuleInvokeVaArgs(addon, functionId, ARGV...) \
(FcitxModuleInvokeFunction(addon, functionId, \
- (FcitxModuleFunctionArg){ .args = {ARGV} }))
+ (FcitxModuleFunctionArg){ {ARGV} }))
/**
* invoke inter module function with addon name, returns NULL when fails (the function itself can also return NULL)
@@ -133,7 +133,7 @@ extern "C" {
#define InvokeVaArgs(INST, MODULE, FUNC, ARGV...) \
((MODULE##_##FUNC##_RETURNTYPE)FcitxModuleInvokeFunctionByName( \
INST, MODULE##_NAME, MODULE##_##FUNC, \
- (FcitxModuleFunctionArg){ .args = {ARGV} }))
+ (FcitxModuleFunctionArg){ {ARGV} }))
/** add a function to a addon */
#define AddFunction(ADDON, Realname) \
@@ -215,7 +215,7 @@ extern "C" {
}
#define FCITX_DEF_MODULE_ARGS(var, ARGV...) \
- FcitxModuleFunctionArg var = { .args = {ARGV} }
+ FcitxModuleFunctionArg var = { {ARGV} }
/* void *__##var##_array[] = {ARGV}; \ */
/* size_t __##var##_length = sizeof(__##var##_array) / sizeof(void*); \ */
/* FcitxModuleFunctionArg var[] = { { .n = __##var##_length, \ */

41
fcitx-4.2.7-compat-qt474.patch Normal file
View File

@ -0,0 +1,41 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 370aa7a..26c86c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,8 +17,9 @@ option(ENABLE_DEBUG "Enable Debug" OFF)
option(ENABLE_TABLE "Enable Table IM" ON)
option(ENABLE_GTK2_IM_MODULE "Enable GTK2 IM Module" ON)
option(ENABLE_GTK3_IM_MODULE "Enable GTK3 IM Module" OFF)
-option(ENABLE_QT "Enable Qt-based lib and configuration GUI" On)
+option(ENABLE_QT "Enable Qt-based lib" On)
option(ENABLE_QT_IM_MODULE "Enable Qt IM Module" ON)
+option(ENABLE_QT_GUI "Enable Qt-based configuration GUI" On)
option(ENABLE_OPENCC "Enable OpenCC for Chinese Transform" ON)
option(FORCE_OPENCC
"Enable opencc even if the library is not found at compile time" Off)
diff --git a/tools/gui/quickphrase-editor/CMakeLists.txt b/tools/gui/quickphrase-editor/CMakeLists.txt
index 9ef7e86..3fff180 100644
--- a/tools/gui/quickphrase-editor/CMakeLists.txt
+++ b/tools/gui/quickphrase-editor/CMakeLists.txt
@@ -16,7 +16,7 @@ fcitx_translate_add_sources(
${QUICKPHRASE_EDITOR_HDRS}
${QUICKPHRASE_EDITOR_SRCS})
-if(NOT ENABLE_QT)
+if(NOT (ENABLE_QT AND ENABLE_QT_GUI))
return()
endif()
diff --git a/tools/gui/wrapper/CMakeLists.txt b/tools/gui/wrapper/CMakeLists.txt
index ab1fbaa..b5bad62 100644
--- a/tools/gui/wrapper/CMakeLists.txt
+++ b/tools/gui/wrapper/CMakeLists.txt
@@ -11,7 +11,7 @@ fcitx_translate_add_sources(
${QT_WRAPPER_SRCS}
${QT_WRAPPER_HDRS})
-if(NOT ENABLE_QT)
+if(NOT (ENABLE_QT AND ENABLE_QT_GUI))
return()
endif()

3
fcitx-4.2.7.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a1ed16698cff1688cb57f3a19774895b391c04b46003c25a74f4657394fa403c
size 9149517

45
fcitx.changes
View File

@ -1,3 +1,48 @@
-------------------------------------------------------------------
Sat Jan 26 05:03:20 UTC 2013 - i@marguerite.su
- update to 4.2.7
* new feature for user:
+ qt im module support per window input context.
+ quickphrase add new custom ui editor.
+ all pinyin now support stroke.
+ add clipboard input support (Ctrl + ; to use it)
+ fcitx-diagnose script for diagnose the problem
+ new dark skin which can also work for non-composite window manager (though
looks not the same)
+ Helping xmodmap user to correct loading ~/.Xmodmap by default
+ Bind one input method with specific key.
+ Translation update (German, and some spanish).
+ Add "up" and "down" to paging key by default
+ fcitx-config now will comment out the value which is same as the default
value upon save, so default value can be controlled by upstream fcitx change.
+ reload only one addon configuration
* new feature for developer:
+ Big build system improvement
+ remove intltool dependency
+ auto-codegen tool for cross module function.
+ add libfcitx-qt, containing dbus stuff and provides custom ui plugin
architecture.
+ candidate window can be overriden to use horizontal / vertical by input
method. (kimpanel need KDE 4.10 to use this feature)
+ paging can be override by custom function
* bug fix:
+ fix for xim restart.
+ add more locale to xim by default.
+ compatible with lua 5.2
+ some other misc bugfix
- added patches
* fcitx-4.2.7-compat-12.2.patch
+ fix 12.2 and below builds, remove next release
* fcitx-4.2.7-compat-qt474.patch
+ fix qt 4.7 builds with 12.1 and below
+ remove next release
* fcitx-4.2.7-compat-gcc46.patch
+ fix gcc 4.6 builds with 12.1 and below
+ remove next release
-------------------------------------------------------------------
Thu Oct 11 14:03:53 UTC 2012 - i@marguerite.su

44
fcitx.spec
View File

@ -16,10 +16,10 @@
#
%define libver -4_2_6
%define libver -4_2_7
Name: fcitx
Version: 4.2.6.1
Version: 4.2.7
Release: 0
Summary: Flexible Context-aware Input Tool with eXtension
License: GPL-2.0+
@ -31,13 +31,15 @@ Source: %{name}-%{version}.tar.bz2
Source1: xim.d-fcitx
Source2: fcitx-README.suse
Source3: xim.fcitx.suse.template
#Source5: pinyin.tar.gz
#Source6: table.tar.gz
# for fedora auto-start
Source7: xinput-fcitx
Source8: openSUSE-default.tar.gz
#FIX-FOR-UPSTREAM i@marguerite.su - dont download online
#Patch1: fix_fcitx_googlecode_resolv_error.patch
# fix-for-openSUSE wengxt@gmail.com - fix opensuse builds <= 1220
Patch1: fcitx-4.2.7-compat-12.2.patch
# fix-for-openSUSE wengxt@gmail.com - fix qt 4.7 builds
Patch2: fcitx-4.2.7-compat-qt474.patch
# fix-for-openSUSE wengxt@gmail.com - fix gcc 4.6 builds
Patch3: fcitx-4.2.7-compat-gcc46.patch
BuildRequires: cairo-devel
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
@ -357,24 +359,32 @@ You can either use this package for download from kde-look.org using knewstaff i
%prep
%setup -q -n %{name}-%{version}
#%patch1 -p1
%if 0%{?suse_version} <= 1220
%patch1 -p1
%endif
%if 0%{?suse_version} <= 1210
%patch2 -p1
%patch3 -p1
%endif
%build
mkdir build
cd build
cmake .. -DENABLE_GTK2_IM_MODULE=On \
cmake .. \
%if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
-DENABLE_GTK3_IM_MODULE=On \
%endif
%if 0%{?suse_version} > 1110 || 0%{?fedora_version}
-DENABLE_QT_IM_MODULE=On \
%if 0%{?suse_version} <= 1210
-DENABLE_QT_GUI=Off \
%endif
%if 0%{?sles_version}
-DENABLE_QT=Off \
%endif
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir} \
-DENABLE_DEBUG=On \
-DENABLE_OPENCC=On \
-DENABLE_LUA=On
-DENABLE_DEBUG=On \
-DENABLE_LUA=On
# copy external data
#pushd ../data
@ -556,12 +566,15 @@ update-desktop-database %{_datadir}/applications &>/dev/null ||
%files -f %{name}.lang
%defattr(-,root,root)
%{_bindir}/%{name}
%{_bindir}/%{name}4-config
%{_bindir}/%{name}-autostart
%{_bindir}/%{name}-configtool
%{_bindir}/%{name}-remote
%{_bindir}/%{name}-skin-installer
%{_bindir}/%{name}-dbus-watcher
%{_bindir}/%{name}-diagnose
%if 0%{?suse_version} >= 1220
%{_bindir}/%{name}-qt-gui-wrapper
%endif
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/icons/*
@ -727,6 +740,9 @@ update-desktop-database %{_datadir}/applications &>/dev/null ||
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_bindir}/%{name}4-config
%{_bindir}/%{name}-po-parser
%{_bindir}/%{name}-scanner
%{_libdir}/pkgconfig/*.pc
%{_datadir}/cmake/
%if 0%{?suse_version} >= 1140 || 0%{?fedora_version}

95
fix_fcitx_googlecode_resolv_error.patch
View File

@ -1,95 +0,0 @@
diff -urN fcitx-4.2.orig/data/CMakeLists.txt fcitx-4.2/data/CMakeLists.txt
--- fcitx-4.2.orig/data/CMakeLists.txt 2012-01-30 11:18:47.710767374 +0800
+++ fcitx-4.2/data/CMakeLists.txt 2012-01-30 11:45:34.373681320 +0800
@@ -33,8 +33,7 @@
set(PY_ORGDATA pyPhrase.org)
set(PY_DATA ${CMAKE_CURRENT_BINARY_DIR}/pybase.mb ${CMAKE_CURRENT_BINARY_DIR}/pyphrase.mb)
set(PY_TAR ${CMAKE_CURRENT_SOURCE_DIR}/pinyin.tar.gz)
-set(PY_URL http://fcitx.googlecode.com/files/pinyin.tar.gz)
-
+#set(PY_URL ../pinyin.tar.gz)
intltool_merge_translation(${CMAKE_CURRENT_SOURCE_DIR}/fcitx-configtool.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-configtool.desktop )
intltool_merge_translation(${CMAKE_CURRENT_SOURCE_DIR}/fcitx.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx.desktop )
@@ -42,7 +41,7 @@
add_custom_target(pinyin_data ALL DEPENDS ${PY_DATA})
add_custom_command(OUTPUT ${PY_ORGDATA}
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/download.sh "${WGET}" "${PY_URL}" "${PY_TAR}"
+# COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/download.sh "${WGET}" "${PY_URL}" "${PY_TAR}"
COMMAND ${TAR} xzmvf ${PY_TAR})
add_custom_command(OUTPUT ${PY_DATA}
DEPENDS ${PY_ORGDATA}
diff -urN fcitx-4.2.orig/data/table/CMakeLists.txt fcitx-4.2/data/table/CMakeLists.txt
--- fcitx-4.2.orig/data/table/CMakeLists.txt 2012-01-30 11:18:47.715767311 +0800
+++ fcitx-4.2/data/table/CMakeLists.txt 2012-01-30 11:45:02.252082896 +0800
@@ -11,7 +11,7 @@
set(TABLEORG_DATA db.txt erbi.txt qxm.txt wanfeng.txt wbpy.txt wbx.txt zrm.txt cj.txt)
set(TABLE_NAME db erbi qxm wanfeng wbpy wbx zrm cj)
set(TABLE_CONF db.conf erbi.conf qxm.conf wanfeng.conf wbpy.conf wbx.conf zrm.conf cangjie.conf)
-set(TABLE_URL http://fcitx.googlecode.com/files/table.tar.gz)
+#set(TABLE_URL http://fcitx.googlecode.com/files/table.tar.gz)
set(TABLE_TAR ${CMAKE_CURRENT_SOURCE_DIR}/table.tar.gz)
set(INSTALL_TABLE_CONF "")
@@ -24,7 +24,7 @@
add_custom_target(table_data ALL DEPENDS ${TABLE_DATA})
add_custom_command(OUTPUT ${TABLEORG_DATA}
- COMMAND ${PROJECT_SOURCE_DIR}/data/download.sh "${WGET}" "${TABLE_URL}" "${TABLE_TAR}"
+# COMMAND ${PROJECT_SOURCE_DIR}/data/download.sh "${WGET}" "${TABLE_URL}" "${TABLE_TAR}"
COMMAND ${TAR} xzmvf ${TABLE_TAR})
foreach(tblname ${TABLE_NAME})
diff -urN fcitx-4.2.orig/fix_fcitx_googlecode_resolv_error.patch fcitx-4.2/fix_fcitx_googlecode_resolv_error.patch
--- fcitx-4.2.orig/fix_fcitx_googlecode_resolv_error.patch 1970-01-01 08:00:00.000000000 +0800
+++ fcitx-4.2/fix_fcitx_googlecode_resolv_error.patch 2012-01-30 11:44:51.855212877 +0800
@@ -0,0 +1,48 @@
+diff -urN fcitx-4.2.orig/data/CMakeLists.txt fcitx-4.2/data/CMakeLists.txt
+--- fcitx-4.2.orig/data/CMakeLists.txt 2012-01-30 10:48:00.955854988 +0800
++++ fcitx-4.2/data/CMakeLists.txt 2012-01-30 10:49:51.497473024 +0800
+@@ -33,8 +33,7 @@
+ set(PY_ORGDATA pyPhrase.org)
+ set(PY_DATA ${CMAKE_CURRENT_BINARY_DIR}/pybase.mb ${CMAKE_CURRENT_BINARY_DIR}/pyphrase.mb)
+ set(PY_TAR ${CMAKE_CURRENT_SOURCE_DIR}/pinyin.tar.gz)
+-set(PY_URL http://fcitx.googlecode.com/files/pinyin.tar.gz)
+-
++#set(PY_URL ../pinyin.tar.gz)
+
+ intltool_merge_translation(${CMAKE_CURRENT_SOURCE_DIR}/fcitx-configtool.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-configtool.desktop )
+ intltool_merge_translation(${CMAKE_CURRENT_SOURCE_DIR}/fcitx.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx.desktop )
+@@ -42,11 +41,11 @@
+ add_custom_target(pinyin_data ALL DEPENDS ${PY_DATA})
+
+ add_custom_command(OUTPUT ${PY_ORGDATA}
+- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/download.sh "${WGET}" "${PY_URL}" "${PY_TAR}"
++# COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/download.sh "${WGET}" "${PY_URL}" "${PY_TAR}"
+ COMMAND ${TAR} xzmvf ${PY_TAR})
+ add_custom_command(OUTPUT ${PY_DATA}
+ DEPENDS ${PY_ORGDATA}
+- COMMAND createPYMB ${CMAKE_CURRENT_SOURCE_DIR}/gbkpy.org ${CMAKE_CURRENT_BINARY_DIR}/${PY_ORGDATA})
++ COMMAND createPYMB ${CMAKE_CURRENT_SOURCE_DIR}/gbkpy.org ${CMAKE_CURRENT_BINARY_DIR}/${PY_ORGDATA}
+
+ add_custom_target(desktopfile ALL DEPENDS ${FCITX_DSEKTOP_FILES})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx.desktop DESTINATION share/applications/)
+diff -urN fcitx-4.2.orig/data/table/CMakeLists.txt fcitx-4.2/data/table/CMakeLists.txt
+--- fcitx-4.2.orig/data/table/CMakeLists.txt 2012-01-30 10:48:00.962854900 +0800
++++ fcitx-4.2/data/table/CMakeLists.txt 2012-01-30 10:48:27.358524907 +0800
+@@ -11,7 +11,7 @@
+ set(TABLEORG_DATA db.txt erbi.txt qxm.txt wanfeng.txt wbpy.txt wbx.txt zrm.txt cj.txt)
+ set(TABLE_NAME db erbi qxm wanfeng wbpy wbx zrm cj)
+ set(TABLE_CONF db.conf erbi.conf qxm.conf wanfeng.conf wbpy.conf wbx.conf zrm.conf cangjie.conf)
+-set(TABLE_URL http://fcitx.googlecode.com/files/table.tar.gz)
++#set(TABLE_URL http://fcitx.googlecode.com/files/table.tar.gz)
+ set(TABLE_TAR ${CMAKE_CURRENT_SOURCE_DIR}/table.tar.gz)
+
+ set(INSTALL_TABLE_CONF "")
+@@ -24,7 +24,7 @@
+ add_custom_target(table_data ALL DEPENDS ${TABLE_DATA})
+
+ add_custom_command(OUTPUT ${TABLEORG_DATA}
+- COMMAND ${PROJECT_SOURCE_DIR}/data/download.sh "${WGET}" "${TABLE_URL}" "${TABLE_TAR}"
++# COMMAND ${PROJECT_SOURCE_DIR}/data/download.sh "${WGET}" "${TABLE_URL}" "${TABLE_TAR}"
+ COMMAND ${TAR} xzmvf ${TABLE_TAR})
+
+ foreach(tblname ${TABLE_NAME})

4
openSUSE-default.tar.gz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:214eece3d83697699542b4f9c8324b3193019c9f2e8eb27223065fe586766551
size 1838938
oid sha256:49adc061199b5b3ae62162ca69fe8c0f78e468ceefc71e701de6818c262e669c
size 306349

3
pinyin.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1
size 1608886

3
table.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
size 4144686