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

Accepting request 87000 from home:stecue

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/87000
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=11
This commit is contained in:
Xing Yin 2011-10-07 03:01:48 +00:00 committed by Git OBS Bridge
parent 34cbdb64ce
commit e3e6b2adc7
4 changed files with 84 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fcitx.changes
View File

@ -1,3 +1,14 @@
------------------------------------------------------------------
Fri Oct 7 01:01:22 UTC 2011 - stecue@gmail.com
- csslayer provided a better way to fix the dbus bug.
------------------------------------------------------------------
Thu Oct 6 21:58:11 UTC 2011 - stecue@gmail.com
- Fixed a bug with firefox. Thanks to hilldwood and csslayer!
- Continue to clean the spec file.
------------------------------------------------------------------
Wed Oct 5 17:05:48 UTC 2011 - stecue@gmail.com
@ -29,21 +40,32 @@ Wed Sep 7 19:49:14 UTC 2011 - stecue@gmail.com
* support im-module (gtk2, gtk3 and qt), not packaged yet
-------------------------------------------------------------------
* Tue Jun 14 00:56:36 UTC 2011 swyear <swyear@gmail.com>
Tue Jun 14 00:56:36 UTC 2011 - swyear@gmail.com
- Add start up script, README and template
-------------------------------------------------------------------
* Tue May 17 00:00:00 UTC 2011 stecue <stecue@gmail.com>
Tue May 17 00:00:00 UTC 2011 - stecue@gmail.com
- upstream version 4.0.1.
- Add xim dependency for openSUSE 11.4
-------------------------------------------------------------------
* Sat Sep 18 00:00:00 UTC 2010 CSSlayer <wengxt@gmail.com>
Sat Sep 18 00:00:00 UTC 2010 - wengxt@gmail.com
- Make it works with newest
-------------------------------------------------------------------
* Fri Jun 11 00:00:00 UTC 2004 xyb <xyb76@sina.com>
Fri Jun 11 00:00:00 UTC 2004 - xyb76@sina.com
- Add data/tables.conf
-------------------------------------------------------------------
* Mon Feb 2 00:00:00 UTC 2004 xyb <xyb76@sina.com>
Mon Feb 2 00:00:00 UTC 2004 - xyb76@sina.com
- Fix spec bug(patch by hamigua).
-------------------------------------------------------------------
* Thu Jan 15 00:00:00 UTC 2004 xyb <xyb76@sina.com>
Thu Jan 15 00:00:00 UTC 2004 - xyb76@sina.com
- skeleton RPM

21
fcitx.spec
View File

@ -2,8 +2,8 @@ Name: fcitx
Version: 4.1.2
Release: 1
Summary: Free Chinese Input Toy for X
URL: http://www.fcitx.org/
Group: System/Libraries
URL: http://code.google.com/p/fcitx/
Group: System/I18n/Chinese
License: GPL
Source: %{name}-%{version}_all.tar.bz2
Source1: xim.d-fcitx
@ -26,7 +26,7 @@ BuildRequires: qt-devel
BuildRequires: intltool
BuildRequires: cmake
BuildRequires: gtk2-devel
#If you do not use immodule-fcitx, you have to use immodule-fcitx
#If you do not use immodule-fcitx, you have to use immodule-xim
%if 0%{?suse_version} > 1130
Requires: gtk2-immodule-xim, gtk3-immodule-xim
BuildRequires: gtk3-devel
@ -36,6 +36,7 @@ BuildRequires: gtk3-devel
%endif
BuildRequires: gcc-c++
BuildRequires: libicu-devel
Patch0: firefox-facebook.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
%description
@ -56,7 +57,7 @@ Group: Development/Libraries/Other
Requires: fcitx = %{version}-%{release}
%description devel
The %{name}-devel package includes the header files for the %{name} package.
This devel package includes the header files and other develop files for FCITX.
%package gtk2
Summary: Gtk2 IM Module for %{name}
@ -66,7 +67,7 @@ Requires: %{name} = %{version}-%{release}
#Requires: gtk2-immodule-xim
%description gtk2
This package contains %{name} im module for gtk2
This package contains the optional but native im module for gtk2. Note the xim support is already installed by default.
%if 0%{?suse_version} > 1130
%package gtk3
@ -77,7 +78,7 @@ Requires: %{name} = %{version}-%{release}
#Requires: gtk3-immodule-xim
%description gtk3
This package contains %{name} im module for gtk3
This package contains the optional but native im module for gtk3. Note the xim support is already installed by default.
%endif
%if 0%{?fedora} > 14
@ -88,7 +89,7 @@ Requires: %{name} = %{version}-%{release}
Requires: gtk3-immodule-xim
%description gtk3
This package contains %{name} im module for gtk3
This package contains the optional but native im module for gtk3.
%endif
Requires: fcitx
@ -98,11 +99,11 @@ Group: System/Libraries
Requires: %{name} = %{version}-%{release}
%description qt4
This package contains %{name} im module for qt4
This package contains the optional but native im module for qt4. Note the xim support is already installed by default.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%build
mkdir build
@ -217,7 +218,7 @@ touch var/adm/SuSEconfig/run-gtk
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS README
%doc AUTHORS README $RPM_SOURCE_DIR/xim.fcitx.suse.template
%{_bindir}/*
%{_datadir}/%{name}/addon/*
%{_datadir}/%{name}/configdesc/*

41
firefox-facebook.patch Normal file
View File

@ -0,0 +1,41 @@
diff -Nur a/src/lib/fcitx/ime.c b/src/lib/fcitx/ime.c
--- a/src/lib/fcitx/ime.c 2011-10-02 18:43:11.000000000 +0800
+++ b/src/lib/fcitx/ime.c 2011-10-06 11:31:59.037480000 +0800
@@ -244,12 +244,12 @@
return ;
UT_array* imes = &instance->availimes ;
FcitxIM newime;
-
+
if (GetIMFromIMList(imes, uniqueName))
{
FcitxLog(ERROR, "%s already exists", uniqueName);
}
-
+
memset(&newime, 0, sizeof(FcitxIM));
strncpy(newime.uniqueName, uniqueName, MAX_IM_NAME);
strncpy(newime.strName, name, MAX_IM_NAME);
@@ -414,11 +414,13 @@
}
}
+#if 0
/* Added by hubert_star AT forum.ubuntu.com.cn */
if (event == FCITX_RELEASE_KEY
&& IsHotKeySimple(sym, state)
&& retVal == IRV_TO_PROCESS)
return IRV_DO_NOTHING;
+#endif
if (retVal == IRV_TO_PROCESS) {
/* process key event for switch key */
@@ -981,7 +983,7 @@
{
FcitxInstance* instance = (FcitxInstance*) menu->priv;
ClearMenuShell(menu);
-
+
FcitxIM* pim;
UT_array* imes = &instance->imes;
utarray_init(&instance->imMenu.shell, &menuICD);

5
xim.d-fcitx
View File

@ -33,7 +33,10 @@ __END
;;
esac
eval `dbus-launch --sh-syntax --exit-with-session`
# Avoid relying on autolaunch to improvise D-Bus sessions for each process
if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
eval `dbus-launch --sh-syntax --exit-with-session`
fi
export LC_CTYPE=$LANG
# So you can use either zh_CN.UTF-8 or zh_CN.GB2312
export XMODIFIERS="@im=fcitx"