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

Accepting request 102707 from home:opensuse_zh

Browse Source 
- merge changelogs.

- spec clean to make it pure openSUSE to submit to M17N.
- set _service to localonly.
- server deleted openSUSE unused sources.

- Upstream fix issue 511, now builds on 11.4.
- Change pyphrase.mb back upon Upstream request.

- Fix local fcitx.googlecode.com resolv error because of #GFW.
- Change pyphrase.mb to Sougou's Dict.

- Update source to git, enable opencc for Traditional & Simplified Chinese Switch.


- Fixed a bug for type words in comment box of facebook while using 
  firefox visit facebook. Thanks to CSSlayer.

- Fixed a bug with dbus.
- update to 4.1.1
- upstream version 4.1.0
- Add start up script, README and template
- add gtk-immodule-xim require

OBS-URL: https://build.opensuse.org/request/show/102707
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=14
This commit is contained in:
OBS User mrdocs 2012-02-04 16:14:33 +00:00 committed by Git OBS Bridge
parent 4a20c58112
commit 3e5574a760
11 changed files with 295 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
_service Normal file
View File

@ -0,0 +1,13 @@
<services>
<service name="tar_scm" mode="localonly">
<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">
<param name="file">*.tar</param>
<param name="compression">bz2</param>
</service>
<service name="set_version" mode="localonly"/>
</services>

3
fcitx-4.1.2_all.tar.bz2
View File

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

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

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

56
fcitx.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Thu Feb 2 16:20:03 UTC 2012 - i@marguerite.su
- merge changelogs.
-------------------------------------------------------------------
Wed Feb 1 20:54:34 UTC 2012 - i@marguerite.su
- spec clean to make it pure openSUSE to submit to M17N.
- set _service to localonly.
- server deleted openSUSE unused sources.
-------------------------------------------------------------------
Mon Jan 30 02:41:20 UTC 2012 - i@marguerite.su
- Upstream fix issue 511, now builds on 11.4.
- Change pyphrase.mb back upon Upstream request.
-------------------------------------------------------------------
Tue Jan 24 06:35:50 UTC 2012 - i@marguerite.su
- Fix local fcitx.googlecode.com resolv error because of #GFW.
- Change pyphrase.mb to Sougou's Dict.
-------------------------------------------------------------------
Mon Jan 23 12:05:42 UTC 2012 - i@marguerite.su
- Update source to git, enable opencc for Traditional & Simplified Chinese Switch.
-------------------------------------------------------------------
Tue Jan 17 14:31:42 UTC 2012 - cfarrell@suse.com
@ -10,16 +39,16 @@ 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
-------------------------------------------------------------------
Tue Oct 5 03:36:42 UTC 2011 - hillwood@linuxfans.org
- Fixed a bug with firefox. Thanks to hilldwood and csslayer!
- Continue to clean the spec file.
- Fixed a bug for type words in comment box of facebook while using
firefox visit facebook. Thanks to CSSlayer.
------------------------------------------------------------------
Wed Oct 5 17:05:48 UTC 2011 - stecue@gmail.com
-------------------------------------------------------------------
Wed Oct 3 05:08:23 UTC 2011 - hillwood@linuxfans.org
- Fix a bug with d-bus. Thanks to hillwood and CSSlayer!
- Fixed a bug with dbus.
------------------------------------------------------------------
Sun Oct 2 19:12:29 UTC 2011 - stecue@gmail.com
@ -36,26 +65,25 @@ Tue Sep 13 04:01:59 UTC 2011 - stecue@gmail.com
- xim is still the default method.
-------------------------------------------------------------------
Fri Sep 9 15:02:04 UTC 2011 - stecue@gmail.com
Fri Sep 9 00:00:00 UTC 2011 - hillwood@linuxfans.org
- upstream version 4.1.1
- update to 4.1.1
-------------------------------------------------------------------
Wed Sep 7 19:49:14 UTC 2011 - stecue@gmail.com
- upstream version 4.1.0
- upstream version 4.1.0
* support im-module (gtk2, gtk3 and qt), not packaged yet
-------------------------------------------------------------------
Tue Jun 14 00:56:36 UTC 2011 - swyear@gmail.com
- Add start up script, README and template
- Add start up script, README and template
-------------------------------------------------------------------
Tue May 17 00:00:00 UTC 2011 - stecue@gmail.com
Thu May 17 00:00:00 UTC 2011 - hillwood@linuxfans.org
- upstream version 4.0.1.
- Add xim dependency for openSUSE 11.4
- add gtk-immodule-xim require
-------------------------------------------------------------------
Sat Sep 18 00:00:00 UTC 2010 - wengxt@gmail.com

330
fcitx.spec
View File

@ -15,48 +15,42 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define libver -4_2_0
Name: fcitx
Version: 4.1.2
Release: 1
Summary: Free Chinese Input Toy for X
URL: http://code.google.com/p/fcitx/
Group: System/I18n/Chinese
License: GPL-2.0+
Source: %{name}-%{version}_all.tar.bz2
Name: fcitx
Version: 4.2
Release: 1
Summary: A Flexible Input Method Framework for CJK
Url: http://code.google.com/p/fcitx
Group: System/I18n/Chinese
License: GPL-2.0+
Source: %{name}-%{version}.tar.bz2
Source1: xim.d-fcitx
Source2: xinput-fcitx.conf
Source3: fcitx-README.suse
Source4: xim.fcitx.suse.template
Source2: fcitx-README.suse
Source3: xim.fcitx.suse.template
Source5: pinyin.tar.gz
Source6: table.tar.gz
Patch1: fix_fcitx_googlecode_resolv_error.patch
BuildRequires: cairo-devel
BuildRequires: pango-devel
BuildRequires: fdupes
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib-devel
BuildRequires: update-desktop-files
BuildRequires: fdupes
BuildRequires: libqt4-devel
%else
BuildRequires: dbus-devel
BuildRequires: dbus-glib-devel
BuildRequires: qt-devel
%endif
BuildRequires: opencc-devel
BuildRequires: intltool
BuildRequires: cmake
BuildRequires: gtk2-devel
#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
%endif
%if 0%{?fedora} > 14
BuildRequires: gtk3-devel
%endif
BuildRequires: gcc-c++
BuildRequires: libicu-devel
Patch0: firefox-facebook.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Requires: lib%{name}%{libver} = %{version}-%{release}
Requires: %{name}-gtk2 = %{version}-%{release}
Requires: %{name}-gtk3 = %{version}-%{release}
Requires: %{name}-qt4 = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
FCITX is a simplified Chinese input server. It supports Tables,
Pinyin and QuWei input method. It's small and fast.
@ -64,133 +58,95 @@ Pinyin and QuWei input method. It's small and fast.
Since version 4.1, FCITX itself can be use as an im-module. XIM
can still be used but not necessary.
Authors
-------
Yuking
CSSlayer
%package -n lib%{name}%{libver}
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.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries/Other
Requires: fcitx = %{version}-%{release}
Summary: Development files for %{name}
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}-%{release}
%description devel
This devel package includes the header files and other develop files for FCITX.
The fcitx-devel package includes the header files for the fcitx package.
%package gtk2
Summary: Gtk2 IM Module for %{name}
Group: System/Libraries
Group: System/I18n/Chinese
Requires: %{name} = %{version}-%{release}
#XIM is not necessary if using immodule-fcitx.
#Requires: gtk2-immodule-xim
%gtk2_immodule_requires
%description 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
This package contains fcitx im module for gtk2
%package gtk3
Summary: Gtk3 IM Module for %{name}
Group: System/Libraries
Group: System/I18n/Chinese
Requires: %{name} = %{version}-%{release}
#XIM is not necessary if using immodule-fcitx.
#Requires: gtk3-immodule-xim
%gtk3_immodule_requires
%description 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
%package gtk3
Summary: Gtk3 IM Module for %{name}
Group: System/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtk3-immodule-xim
%description gtk3
This package contains the optional but native im module for gtk3.
%endif
Requires: fcitx
This package contains fcitx im module for gtk3
%package qt4
Summary: Qt4 IM Module for %{name}
Group: System/Libraries
Group: System/I18n/Chinese
Requires: %{name} = %{version}-%{release}
%description qt4
This package contains the optional but native im module for qt4. Note the xim support is already installed by default.
This package contains fcitx im module for qt4
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
%build
mkdir build
cd build
%if 0%{?suse_version}
%if 0%{?suse_version} < 1140
cmake .. -DENABLE_GTK2_IM_MODULE=On \
-DENABLE_GTK3_IM_MODULE=Off \
-DENABLE_QT_IM_MODULE=On \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir}
%else
cmake .. -DENABLE_GTK2_IM_MODULE=On \
-DENABLE_GTK3_IM_MODULE=On \
-DENABLE_QT_IM_MODULE=On \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir}
%endif
%endif
%if 0%{?fedora}
%if 0%{?fedora} < 15
cmake .. -DENABLE_GTK3_IM_MODULE=off \
-DENABLE_QT_IM_MODULE=On \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir}
%else
cmake .. -DENABLE_GTK3_IM_MODULE=On \
-DENABLE_QT_IM_MODULE=On \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir}
%endif
%endif
%if 0%{?centos_version}
cmake .. -DENABLE_GTK3_IM_MODULE=off \
-DENABLE_QT_IM_MODULE=On \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir}
%endif
%if 0%{?rhel_version}
cmake .. -DENABLE_GTK3_IM_MODULE=off \
-DENABLE_QT_IM_MODULE=On \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_INSTALL_DIR=%{_libdir}
%endif
-DLIB_INSTALL_DIR=%{_libdir} \
-DENABLE_DEBUG=On \
-DENABLE_OPENCC=On
#copy external data
pushd ../data
cp -r %{S:5} ./
popd
pushd ../data/table
cp -r %{S:6} ./
popd
make
%install
#rm -rf $RPM_BUILD_ROOT
cd build
make DESTDIR=$RPM_BUILD_ROOT install
cd ..
#rm $RPM_BUILD_ROOT/usr/share/doc/ -r
%if 0%{?suse_version}
#fix desktop file
sed -i "2d" %{buildroot}%{_datadir}/applications/fcitx-skin-installer.desktop
sed -i "2iMimeType=applicatio\/x-fskin;" %{buildroot}%{_datadir}/applications/fcitx-skin-installer.desktop
%suse_update_desktop_file fcitx Utility DesktopUtility
%suse_update_desktop_file fcitx-kimpanel Utility DesktopUtility
%suse_update_desktop_file fcitx-configtool Utility DesktopUtility
%suse_update_desktop_file -G "Installer Script for Fcitx Skin" fcitx-skin-installer Utility DesktopUtility
mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/
install -m 644 $RPM_SOURCE_DIR/xim.d-fcitx $RPM_BUILD_ROOT/etc/X11/xim.d/fcitx
%suse_update_desktop_file fcitx-skin-installer Utility DesktopUtility
%suse_update_desktop_file fcitx-configtool System X-SuSE-SystemSetup
rm -f $RPM_BUILD_ROOT%{_libdir}/libfcitx-config.la
#fix doc
%{__rm} -rf %{buildroot}%{_datadir}/doc/%{name}/
pushd $RPM_BUILD_ROOT/etc/X11/xim.d/
#create autostart
mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/
install -m 644 %{S:1} %{buildroot}%{_sysconfdir}/X11/xim.d/fcitx
pushd %{buildroot}%{_sysconfdir}/X11/xim.d/
for lang in en zh_CN ; do
mkdir $lang
pushd $lang
@ -199,114 +155,96 @@ pushd $RPM_BUILD_ROOT/etc/X11/xim.d/
done
popd
%else
mkdir -p $RPM_BUILD_ROOT/etc/X11/xinit/xinput.d/
install -m 644 $RPM_SOURCE_DIR/xinput-fcitx.conf $RPM_BUILD_ROOT/etc/X11/xinit/xinput.d/fcitx.conf
%endif
#remove *.la
%{__rm} -rf %{buildroot}%{_libdir}/lib%{name}-config.la
%fdupes -s %{buildroot}
%find_lang %{name}
%fdupes %{buildroot}
%clean
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
#strip libraries
%{__strip} %{buildroot}%{_libdir}/%{name}/*.so
%{__strip} %{buildroot}%{_libdir}/libfcitx*.so.*
%{__strip} %{buildroot}%{_libdir}/gtk-2.0/*/immodules/im-%{name}.so
%{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so
%{__strip} %{buildroot}%{_libdir}/qt4/plugins/inputmethods/qtim-%{name}.so
#Convenient define for the scriplets
%if %{_lib} == lib64
%define _gtk2_query_immodules %{_bindir}/gtk-query-immodules-2.0-64
%define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk64.immodules
%else
%define _gtk2_query_immodules %{_bindir}/gtk-query-immodules-2.0
%define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk.immodules
%endif
%if %{_lib} == lib64
%define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0-64
%else
%define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0
%endif
%define _gtk3_query_immodules_update_cache %{_gtk3_query_immodules} --update-cache
%if 0%{?suse_version}
%post gtk2
touch var/adm/SuSEconfig/run-gtk
/sbin/SuSEconfig --module gtk2
%postun gtk2
touch var/adm/SuSEconfig/run-gtk
/sbin/SuSEconfig --module gtk2
%{_gtk2_query_immodules_update_cache}
%if 0%{?suse_version} > 1130
%post gtk3
/sbin/ldconfig
%ifarch x86_64
gtk-query-immodules-3.0-64 --update-cache
%else
gtk-query-immodules-3.0 --update-cache
%endif
%endif
%{_gtk3_query_immodules_update_cache}
%endif
#Add fcitx icons to gnome3 panel
TARGET="/usr/share/gnome-shell/js/ui/statusIconDispatcher.js"
if [ -f $TARGET ] && [ ! -f $TARGET-fcitx ] ; then
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}
%post -p /sbin/ldconfig
%post -n lib%{name}%{libver} -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%postun -n lib%{name}%{libver} -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS README $RPM_SOURCE_DIR/xim.fcitx.suse.template
%defattr(-,root,root)
%doc AUTHORS ChangeLog
%{_bindir}/*
%{_datadir}/%{name}/addon/*
%{_datadir}/%{name}/configdesc/*
%{_datadir}/%{name}/data/*
%{_datadir}/%{name}/pinyin/*
%{_datadir}/%{name}/table/*
%{_datadir}/doc/%{name}/
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/icons/*
%{_datadir}/mime/packages/*
%{_mandir}/man1/*.gz
%dir %{_datadir}/fcitx/addon
%dir %{_datadir}/fcitx/configdesc
%dir %{_datadir}/fcitx/data
%dir %{_datadir}/fcitx/pinyin
%dir %{_datadir}/fcitx/table
%dir %{_libdir}/fcitx
%dir %{_datadir}/fcitx
%{_libdir}/fcitx/*.so
%{_libdir}/fcitx/
%config /etc/X11/xim.d/
%files -n lib%{name}%{libver}
%defattr(-,root,root)
%{_libdir}/libfcitx*.so.*
%{_bindir}/createPYMB
%{_bindir}/mb2org
%{_bindir}/mb2txt
%{_bindir}/readPYBase
%{_bindir}/readPYMB
%{_bindir}/scel2org
%{_bindir}/txt2mb
%dir %{_datadir}/%{name}/skin
%{_datadir}/%{name}/skin/default
%{_datadir}/%{name}/skin/dark
%{_datadir}/%{name}/skin/classic
%if 0%{?suse_version}
%dir /etc/X11/xim.d
%dir /etc/X11/xim.d/en
%dir /etc/X11/xim.d/zh_CN
%config /etc/X11/xim.d/*
%else
%dir /etc/X11/xinit/xinput.d
/etc/X11/xinit/xinput.d/fcitx.conf
%endif
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%{_libdir}/libfcitx*.so
%files gtk2
%defattr(-,root,root,-)
%defattr(-,root,root)
%{_libdir}/gtk-2.0/*
%if 0%{?suse_version} > 1130
%files gtk3
%defattr(-,root,root,-)
%defattr(-,root,root)
%{_libdir}/gtk-3.0/*
%endif
%if 0%{?fedora} > 14
%files gtk3
%defattr(-,root,root,-)
%{_libdir}/gtk-3.0/*
%endif
%files devel
%defattr(-,root,root,-)
%{_libdir}/libfcitx*.so
%defattr(-,root,root)
%{_libdir}/pkgconfig/*.pc
%{_datadir}/cmake/
%{_includedir}/*
%files qt4
%defattr(-,root,root,-)
%defattr(-,root,root)
%{_libdir}/qt4/*
%changelog

41
firefox-facebook.patch
View File

@ -1,41 +0,0 @@
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);

95
fix_fcitx_googlecode_resolv_error.patch Normal file
View File

@ -0,0 +1,95 @@
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})

3
pinyin.tar.gz Normal file
View File

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

3
table.tar.gz Normal file
View File

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

7
xim.d-fcitx
View File

@ -33,14 +33,11 @@ __END
;;
esac
# 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
eval `dbus-launch --sh-syntax --exit-with-session`
export LC_CTYPE=$LANG
# So you can use either zh_CN.UTF-8 or zh_CN.GB2312
export XMODIFIERS="@im=fcitx"
export GTK_IM_MODULE=xim
export GTK_IM_MODULE=fcitx
export QT_IM_SWITCHER=imsw-multi
export QT_IM_MODULE=xim
fcitx -d

10
xinput-fcitx.conf
View File

@ -1,10 +0,0 @@
# /etc/X11/xinit/xinput.d/fcitx.conf
XIM=fcitx
XIM_PROGRAM=/usr/bin/fcitx
ICON="/usr/share/pixmaps/fcitx.png"
XIM_ARGS="-D"
PREFERENCE_PROGRAM=/usr/bin/fcitx-configtool
SHORT_DESC="FCITX"
GTK_IM_MODULE=fcitx
QT_IM_MODULE=fcitx