pool/fcitx
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 123502 from M17N

Browse Source 
version update (forwarded request 123501 from MargueriteSu)

OBS-URL: https://build.opensuse.org/request/show/123502
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fcitx?expand=0&rev=7
This commit is contained in:
Stephan Kulow 2012-06-07 13:37:49 +00:00 committed by Git OBS Bridge
commit c563d08d61
7 changed files with 109 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_service
View File

@ -1,13 +1,13 @@
<services>
<service name="tar_scm" mode="localonly">
<service name="tar_scm" mode="disabled">
<param name="history-depth">all</param><param name="url">http://code.google.com/p/fcitx/</param><param name="versionprefix">4.2git</param><param name="filename">fcitx</param><param name="scm">git</param></service>
<service name="recompress" mode="localonly">
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">bz2</param>
</service>
<service name="set_version" mode="localonly"/>
<service name="set_version" mode="disabled"/>
</services>

2
baselibs.conf
View File

@ -1,4 +1,4 @@
libfcitx-4_2_3
libfcitx-4_2_4
fcitx-gtk2
fcitx-gtk3
fcitx-qt4

58
fcitx-4.2.3-openSUSE-11.4-lua51.patch
View File

@ -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);

3
fcitx-4.2.3.tar.xz
View File

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

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

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

23
fcitx.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
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
- fix sles builds.
* add version tags.
* changed source compression.
* add a patch to downgrade gio's version.
* use xim instead of qt im module.
-------------------------------------------------------------------
Sat May 12 12:49:11 UTC 2012 - i@marguerite.su

110
fcitx.spec
View File

@ -15,51 +15,65 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define libver -4_2_3
%define libver -4_2_4
Name: fcitx
Version: 4.2.3
Release: 1
Version: 4.2.4
Release: 0
Summary: A Flexible Input Method Framework for CJK
Url: http://code.google.com/p/fcitx
Group: System/I18n/Chinese
License: GPL-2.0+
Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz
Group: System/I18n/Chinese
Url: http://code.google.com/p/fcitx
#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
Source5: pinyin.tar.gz
Source6: table.tar.gz
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
Patch1: fix_fcitx_googlecode_resolv_error.patch
BuildRequires: cairo-devel
BuildRequires: pango-devel
BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib-devel
BuildRequires: enchant-devel
BuildRequires: iso-codes-devel
BuildRequires: pango-devel
BuildRequires: update-desktop-files
BuildRequires: fdupes
%if 0%{?suse_version} >= 1110
BuildRequires: fdupes
%endif
%if 0%{?suse_version} > 1110
BuildRequires: libqt4-devel
%endif
%if 0%{?suse_version} <= 1210
BuildRequires: lua-devel
BuildRequires: lua-devel
%else
BuildRequires: lua51-devel
%endif
BuildRequires: opencc-devel
BuildRequires: intltool
BuildRequires: cmake
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: opencc-devel
%if 0%{?suse_version} >= 1140
BuildRequires: gtk3-devel
BuildRequires: gobject-introspection-devel
%endif
BuildRequires: gcc-c++
BuildRequires: libicu-devel
Requires: lib%{name}%{libver} = %{version}-%{release}
Requires: %{name}-gtk2 = %{version}-%{release}
Requires: %{name}-gtk3 = %{version}-%{release}
Requires: %{name}-qt4 = %{version}-%{release}
BuildRequires: libxml2-devel
Requires: %{name}-gtk2 = %{version}-%{release}
Requires: lib%{name}%{libver} = %{version}-%{release}
%if 0%{?suse_version} >= 1140
Requires: %{name}-gtk3 = %{version}-%{release}
%endif
%if 0%{?suse_version} > 1110
Requires: %{name}-qt4 = %{version}-%{release}
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: locale(ko;zh_CN;zh_SG)
Provides: locale(ko;zh_CN;zh_SG)
%description
FCITX is a simplified Chinese input server. It supports Tables,
@ -69,8 +83,8 @@ Since version 4.1, FCITX itself can be use as an im-module. XIM
can still be used but not necessary.
%package -n lib%{name}%{libver}
Summary: Shared Libraries for %{name}
Group: System/I18n/Chinese
Summary: Shared Libraries for %{name}
Group: System/I18n/Chinese
%description -n lib%{name}%{libver}
The libfcitx4_2_0 package includes the shared libraries for the fictx package.
@ -92,6 +106,8 @@ Requires: %{name} = %{version}-%{release}
%description gtk2
This package contains fcitx im module for gtk2
%if 0%{?suse_version} >= 1140
%package gtk3
Summary: Gtk3 IM Module for %{name}
Group: System/I18n/Chinese
@ -101,6 +117,9 @@ Requires: %{name} = %{version}-%{release}
%description gtk3
This package contains fcitx im module for gtk3
%endif
%if 0%{?suse_version} > 1110
%package qt4
Summary: Qt4 IM Module for %{name}
Group: System/I18n/Chinese
@ -109,18 +128,23 @@ Requires: %{name} = %{version}-%{release}
%description qt4
This package contains fcitx im module for qt4
%endif
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
%patch2 -p1
%build
mkdir build
cd build
cmake .. -DENABLE_GTK2_IM_MODULE=On \
%if 0%{?suse_version} >= 1140
-DENABLE_GTK3_IM_MODULE=On \
%endif
%if 0%{?suse_version} > 1110
-DENABLE_QT_IM_MODULE=On \
%endif
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir} \
-DENABLE_DEBUG=On \
@ -135,11 +159,13 @@ pushd ../data/table
cp -r %{S:6} ./
popd
#fix gobject-introspection build
export SUSE_ASNEEDED=0
make
%install
cd build
make DESTDIR=$RPM_BUILD_ROOT install
%makeinstall
cd ..
@ -173,14 +199,20 @@ popd
%find_lang %{name}
%if 0%{?suse_version} >= 1110
%fdupes %{buildroot}
%endif
#strip libraries
%{__strip} %{buildroot}%{_libdir}/%{name}/*.so
%{__strip} %{buildroot}%{_libdir}/libfcitx*.so.*
%{__strip} %{buildroot}%{_libdir}/gtk-2.0/*/immodules/im-%{name}.so
%if 0%{?suse_version} >= 1140
%{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so
%endif
%if 0%{?suse_version} > 1110
%{__strip} %{buildroot}%{_libdir}/qt4/plugins/inputmethods/qtim-%{name}.so
%endif
#Convenient define for the scriplets
%if %{_lib} == lib64
@ -191,6 +223,14 @@ popd
%define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk.immodules
%endif
%post gtk2
%{_gtk2_query_immodules_update_cache}
%postun gtk2
%{_gtk2_query_immodules_update_cache}
%if 0%{?suse_version} >= 1140
%if %{_lib} == lib64
%define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0-64
%else
@ -198,9 +238,6 @@ popd
%endif
%define _gtk3_query_immodules_update_cache %{_gtk3_query_immodules} --update-cache
%post gtk2
%{_gtk2_query_immodules_update_cache}
%post gtk3
%{_gtk3_query_immodules_update_cache}
@ -211,12 +248,11 @@ mv $TARGET $TARGET-fcitx
sed "/^const STANDARD_TRAY_ICON_IMPLEMENTATIONS/a \ 'fcitx': 'input-method'," $TARGET-fcitx > $TARGET
fi
%postun gtk2
%{_gtk2_query_immodules_update_cache}
%postun gtk3
%{_gtk3_query_immodules_update_cache}
%endif
%post -p /sbin/ldconfig
%post -n lib%{name}%{libver} -p /sbin/ldconfig
@ -246,9 +282,15 @@ fi
%defattr(-,root,root)
%{_libdir}/gtk-2.0/*
%if 0%{?suse_version} >= 1140
%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
%files devel
%defattr(-,root,root)
@ -256,8 +298,12 @@ fi
%{_datadir}/cmake/
%{_includedir}/*
%if 0%{?suse_version} > 1110
%files qt4
%defattr(-,root,root)
%{_libdir}/qt4/*
%endif
%changelog