Hello community,
here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2012-05-07 22:45:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fcitx (Old)
and /work/SRC/openSUSE:Factory/.fcitx.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-04-12 09:22:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-05-07 22:47:02.000000000 +0200
@@ -1,0 +2,19 @@
+Mon May 7 02:55:27 UTC 2012 - i@marguerite.su
+
+- enable lua by default
+
+-------------------------------------------------------------------
+Sun May 6 22:57:27 UTC 2012 - i@marguerite.su
+
+- update to 4.2.3
+ * Lua extension support, same interface with Googlepinyin.
+ * super can be used in hotkey again
+ * fixes Trad-Simp native engine in chttrans.
+ * Update fcitx-pinyin algorithm
+ * txt2mb and mb2txt support new English format
+ * Fix a crash when enable share status.
+ * Add surrounding text support.
+ * Commit input when unfocus.
+ * Classic UI improvement, including trayicon, menu.
+
+-------------------------------------------------------------------
Old:
----
fcitx-4.2.2.tar.xz
New:
----
fcitx-4.2.3-openSUSE-11.4-lua51.patch
fcitx-4.2.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fcitx.spec ++++++
--- /var/tmp/diff_new_pack.f9IFgq/_old 2012-05-07 22:47:04.000000000 +0200
+++ /var/tmp/diff_new_pack.f9IFgq/_new 2012-05-07 22:47:04.000000000 +0200
@@ -15,10 +15,10 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-%define libver -4_2_2
+%define libver -4_2_3
Name: fcitx
-Version: 4.2.2
+Version: 4.2.3
Release: 1
Summary: A Flexible Input Method Framework for CJK
Url: http://code.google.com/p/fcitx
@@ -30,7 +30,10 @@
Source3: xim.fcitx.suse.template
Source5: pinyin.tar.gz
Source6: table.tar.gz
+#FIX-FOR-UPSTREAM i@marguerite.su - dont download online
Patch1: fix_fcitx_googlecode_resolv_error.patch
+#FIX-FOR-UPSTREAM i@marguerite.su - fix lua51 builds on 11.4
+Patch2: fcitx-4.2.3-openSUSE-11.4-lua51.patch
BuildRequires: xz
BuildRequires: cairo-devel
BuildRequires: pango-devel
@@ -39,6 +42,11 @@
BuildRequires: update-desktop-files
BuildRequires: fdupes
BuildRequires: libqt4-devel
+%if 0%{?suse_version} <= 1210
+BuildRequires: lua-devel
+%else
+BuildRequires: lua51-devel
+%endif
BuildRequires: opencc-devel
BuildRequires: intltool
BuildRequires: cmake
@@ -103,6 +111,7 @@
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
+%patch2 -p1
%build
mkdir build
@@ -114,7 +123,8 @@
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir} \
-DENABLE_DEBUG=On \
- -DENABLE_OPENCC=On
+ -DENABLE_OPENCC=On \
+ -DENABLE_LUA=On
#copy external data
pushd ../data
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.f9IFgq/_old 2012-05-07 22:47:04.000000000 +0200
+++ /var/tmp/diff_new_pack.f9IFgq/_new 2012-05-07 22:47:04.000000000 +0200
@@ -1,4 +1,4 @@
-libfcitx-4_2_2
+libfcitx-4_2_3
fcitx-gtk2
fcitx-gtk3
fcitx-qt4
\ No newline at end of file
++++++ fcitx-4.2.3-openSUSE-11.4-lua51.patch ++++++
diff --git a/src/module/lua/luawrap.c b/src/module/lua/luawrap.c
index 67883a7..417a1c9 100644
--- a/src/module/lua/luawrap.c
+++ b/src/module/lua/luawrap.c
@@ -58,13 +58,13 @@ typedef struct _ConverterItem {
UT_hash_handle hh;
} ConverterItem;
-typedef struct _LuaExtension {
+struct _LuaExtension {
char *name;
lua_State *lua;
UT_hash_handle hh;
-} LuaExtension;
+};
-typedef struct _LuaModule {
+struct _LuaModule {
FcitxInstance *fcitx;
LuaExtension *extensions;
CommandItem *commands;
@@ -73,7 +73,7 @@ typedef struct _LuaModule {
ConverterItem *converters;
ConverterItem *current_converter;
size_t shortest_input_trigger_key_length;
-} LuaModule;
+};
typedef void (*LuaResultFn)(LuaModule *luamodule, const char *in, const char *out);
diff --git a/src/module/lua/luawrap.h b/src/module/lua/luawrap.h
index 152d835..592b275 100644
--- a/src/module/lua/luawrap.h
+++ b/src/module/lua/luawrap.h
@@ -21,18 +21,18 @@
#ifndef _LUA_WRAP_H_
#define _LUA_WRAP_H_
-typedef struct lua_State lua_State;
-typedef struct _LuaModule LuaModule;
-typedef struct _LuaExtension LuaExtension;
-typedef struct _FcitxInstance FcitxInstance;
+#include