forked from pool/fcitx
Accepting request 123501 from home:MargueriteSu:branches:M17N
version update OBS-URL: https://build.opensuse.org/request/show/123501 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=30
This commit is contained in:
Marguerite Su
Git OBS Bridge
parent
82cea75593
commit
3e51f582e2
@ -1,4 +1,4 @@
|
||||
libfcitx-4_2_3
|
||||
libfcitx-4_2_4
|
||||
fcitx-gtk2
|
||||
fcitx-gtk3
|
||||
fcitx-qt4
|
||||
@ -1,58 +0,0 @@
|
||||
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 <lua.h>
|
||||
|
||||
typedef struct _LuaResultItem {
|
||||
char *result;
|
||||
char *help;
|
||||
} LuaResultItem;
|
||||
|
||||
+typedef struct _LuaModule LuaModule;
|
||||
+typedef struct _LuaExtension LuaExtension;
|
||||
+
|
||||
// alloc/free luamodule
|
||||
-LuaModule * LuaModuleAlloc(FcitxInstance *fcitx);
|
||||
+LuaModule * LuaModuleAlloc(struct _FcitxInstance *fcitx);
|
||||
void LuaModuleFree(LuaModule *luamodule);
|
||||
FcitxInstance *GetFcitx(LuaModule *luamodule);
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f2bc67c9251ad9f51439e30ad3aa6b1d6d8c65393ea71dccd4749b5e8de7d3bf
|
||||
size 844355
|
||||
3
fcitx-4.2.4.tar.bz2
Normal file
3
fcitx-4.2.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0889c6ea3dd2066ca582ac3cd5b18c293ee01123d2a454a5731af9da42a24542
|
||||
size 11133679
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 3 13:05:53 UTC 2012 - i@marguerite.su
|
||||
|
||||
- update to 4.2.4
|
||||
* fix some xim problem
|
||||
* add fcitx-gclient for glib and gir binding, can be used to control fcitx or implement fcitx client.
|
||||
* merge fcitx-keyboard into fcitx
|
||||
* bind specific keyboard layout with inputmethod
|
||||
(you need up to date fcitx-configtool，gtk3 ver or kcm-fcitx to configure this feature)
|
||||
* adjust some default hotkey setting.
|
||||
- drop openSUSE 11.4 lua51 patch. upstream fixed.
|
||||
- drop downgrade gio version patch. upstream fixed.
|
||||
- add SUSE_ASNEEDED=0 macro to avoid a gobject-introspection bug as vuntz suggested. thanks!
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 3 04:46:37 UTC 2012 - i@marguerite.su
|
||||
|
||||
|
||||
22
fcitx.spec
22
fcitx.spec
@ -16,16 +16,18 @@
|
||||
#
|
||||
|
||||
|
||||
%define libver -4_2_3
|
||||
%define libver -4_2_4
|
||||
|
||||
Name: fcitx
|
||||
Version: 4.2.3
|
||||
Version: 4.2.4
|
||||
Release: 0
|
||||
Summary: A Flexible Input Method Framework for CJK
|
||||
License: GPL-2.0+
|
||||
Group: System/I18n/Chinese
|
||||
Url: http://code.google.com/p/fcitx
|
||||
Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.bz2
|
||||
#Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz
|
||||
# use bzip to be compatible with sles.
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: xim.d-fcitx
|
||||
Source2: fcitx-README.suse
|
||||
Source3: xim.fcitx.suse.template
|
||||
@ -33,13 +35,11 @@ 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
|
||||
#FIX-FOR-SLES i@marguerite.su - downgrade gio version from 2.6 to 2.26
|
||||
Patch3: fix-for-sles-downgrade-gio-version.patch
|
||||
BuildRequires: cairo-devel
|
||||
BuildRequires: dbus-1-devel
|
||||
BuildRequires: dbus-1-glib-devel
|
||||
BuildRequires: enchant-devel
|
||||
BuildRequires: iso-codes-devel
|
||||
BuildRequires: pango-devel
|
||||
BuildRequires: update-desktop-files
|
||||
%if 0%{?suse_version} >= 1110
|
||||
@ -59,9 +59,11 @@ BuildRequires: intltool
|
||||
BuildRequires: opencc-devel
|
||||
%if 0%{?suse_version} >= 1140
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: gobject-introspection-devel
|
||||
%endif
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: libxml2-devel
|
||||
Requires: %{name}-gtk2 = %{version}-%{release}
|
||||
Requires: lib%{name}%{libver} = %{version}-%{release}
|
||||
%if 0%{?suse_version} >= 1140
|
||||
@ -131,8 +133,6 @@ This package contains fcitx im module for qt4
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
mkdir build
|
||||
@ -159,6 +159,8 @@ pushd ../data/table
|
||||
cp -r %{S:6} ./
|
||||
popd
|
||||
|
||||
#fix gobject-introspection build
|
||||
export SUSE_ASNEEDED=0
|
||||
make
|
||||
|
||||
%install
|
||||
@ -285,6 +287,8 @@ fi
|
||||
%files gtk3
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/gtk-3.0/*
|
||||
%{_libdir}/girepository-1.0/Fcitx-1.0.typelib
|
||||
%{_datadir}/gir-1.0/Fcitx-1.0.gir
|
||||
|
||||
%endif
|
||||
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
diff -urN fcitx-4.2.3.orig/src/frontend/CMakeLists.txt fcitx-4.2.3/src/frontend/CMakeLists.txt
|
||||
--- fcitx-4.2.3.orig/src/frontend/CMakeLists.txt 2012-06-03 12:26:00.293473739 +0800
|
||||
+++ fcitx-4.2.3/src/frontend/CMakeLists.txt 2012-06-03 12:26:50.285848746 +0800
|
||||
@@ -7,7 +7,7 @@
|
||||
if (ENABLE_GTK2_IM_MODULE OR ENABLE_GTK3_IM_MODULE)
|
||||
|
||||
PKG_CHECK_MODULES(GLIB2 REQUIRED "glib-2.0" )
|
||||
- PKG_CHECK_MODULES(GIO2 "gio-2.0 >= 2.6")
|
||||
+ PKG_CHECK_MODULES(GIO2 "gio-2.0 >= 2.26")
|
||||
if (NOT GIO2_FOUND)
|
||||
PKG_CHECK_MODULES(DBUS_GLIB REQUIRED "dbus-glib-1")
|
||||
endif (NOT GIO2_FOUND)
|
||||
@@ -20,4 +20,4 @@
|
||||
add_subdirectory(gtk2)
|
||||
add_subdirectory(gtk3)
|
||||
add_subdirectory(qt)
|
||||
-endif (_ENABLE_DBUS)
|
||||
\ 文件尾没有 newline 字符
|
||||
+endif (_ENABLE_DBUS)
|
||||
Loading…
Reference in New Issue
Block a user