Hello community,
here is the log from the commit of package ibus for openSUSE:Factory checked in
at 2014-07-29 16:47:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ibus (Old)
and /work/SRC/openSUSE:Factory/.ibus.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ibus/ibus.changes 2014-06-18
07:49:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ibus.new/ibus.changes 2014-07-29
16:47:52.000000000 +0200
@@ -1,0 +2,50 @@
+Sun Jul 27 15:15:28 UTC 2014 - i...@marguerite.su
+
+- fix hillwood's timestamp in changelog
+- add two more macros to macros.ibus
+
+-------------------------------------------------------------------
+Sat Jul 26 18:01:19 UTC 2014 - i...@marguerite.su
+
+- update version 1.5.8
+ * Set max-width-chars property in ibus-setup wrapped GtkLabel
+ * Add German (nodeadkeys) keymap in simple.xml
+ * Delete Korean keymap
+ * Let ibus-ui-gtk3 not to show zero-lenght preedit text
+ * Fix many memory leaks provided by Christophe Fergeau
+ * Add Polish (qwertz) keymap in simple.xml
+ * Fix escape key with Ctrl+Shift+U ISO
+ * Update ibuscomposetable.h for pt-br
+ * Set up ibus engines when users log into the session for the first time
+ * Do not sort ibus engines when they are saved by ibus-setup
+ * Update IBusKeymap jp
+ * Run xmodmap after run setxkbmap -l layout
+ * Add ibus reset-config and read-config sub-commands
+ * Fix ibus-setup SEGV in enginetreeview.py
+ * Fix deprecated warnings with python3-gobject 3.13.3
+ * Export the 'IBUS_SETUP_XID' environment variable for each engine setup
+ * Fix deprecated gtk3 GtkMisc, GtkAlignment and vala Gdk.X11Display
+ * Enhance UI to add engines on ibus-setup
+- mask add-libgnomekbd-and-load-preload-engines.patch and
+ reload-preload-engines-until-users-customize-the-list.patch
+ * upstream may have fixed these issues as these patches are issued
+ on May 7th.
+- use python3 to build ibus, as hillwood switched ibus-table to python3
+ * add ibus-force-python3.patch, because ibus will use python3 to build
+ ibus-setup and bindings only when PYTHON2 variable is empty. And fix
+ 'print sysconfig.PREFIX' syntax errors in python-config.py.
+- add ibus-vala-0.18.patch to fix build for openSUSE 12.3
+
+-------------------------------------------------------------------
+Sat Jul 26 17:32:07 UTC 2014 - i...@marguerite.su
+
+- clean specfile with service and spec-cleaner
+ * don't use vague wildcards aggresively in %%files section
+- add macros.ibus to ease packaging
+
+-------------------------------------------------------------------
+Thu Jul 26 12:24:17 UTC 2014 - hillw...@linuxfans.org
+
+- Enable wayland support
+
+-------------------------------------------------------------------
@@ -78 +128 @@
-Mon Nov 25 21:50:12 CST 2013 - hillw...@linuxfans.org
+Mon Nov 25 13:50:12 UTC 2013 - hillw...@linuxfans.org
@@ -105 +155 @@
-Mon Oct 14 09:22:41 CST 2013 - hillw...@linuxfans.org
+Mon Oct 14 01:22:41 UTC 2013 - hillw...@linuxfans.org
@@ -166 +216 @@
-Tue Jul 9 22:23:47 CST 2013 - hillw...@linuxfans.org
+Tue Jul 9 14:23:47 UTC 2013 - hillw...@linuxfans.org
@@ -245 +295 @@
-Sat Feb 9 13:13:13 CST 2013 - hillw...@linuxfans.org
+Sat Feb 9 03:13:13 UTC 2013 - hillw...@linuxfans.org
@@ -267 +317 @@
-Sat Aug 25 20:25:17 CST 2012 - hillw...@linuxfans.org
+Sat Aug 25 12:25:17 UTC 2012 - hillw...@linuxfans.org
@@ -294 +344 @@
-Wed Mar 7 21:54:43 CST 2012 - hillw...@linuxfans.org
+Wed Mar 7 13:54:43 UTC 2012 - hillw...@linuxfans.org
@@ -299 +349 @@
-Wed Mar 07 12:27:57 CST 2012 - hillw...@linuxfans.org
+Wed Mar 07 04:27:57 UTC 2012 - hillw...@linuxfans.org
Old:
----
ibus-1.5.7.tar.gz
ibus-README.suse
New:
----
README.SUSE
ibus-1.5.8.tar.gz
ibus-force-python3.patch
ibus-vala-0.18.patch
macros.ibus
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ibus.spec ++++++
--- /var/tmp/diff_new_pack.b0D0Rs/_old 2014-07-29 16:47:53.000000000 +0200
+++ /var/tmp/diff_new_pack.b0D0Rs/_new 2014-07-29 16:47:53.000000000 +0200
@@ -17,41 +17,58 @@
%define with_automatic_config 1
+%define gtk_binary_version %(pkg-config --variable=gtk_binary_version
gtk+-2.0)
+%define with_python3 1
+%if 0%{?suse_version} >= 1310
+%define with_wayland 1
+%else
+%define with_wayland 0
+%endif
Name: ibus
-Version: 1.5.7
+Version: 1.5.8
Release: 0
-Url: http://code.google.com/p/ibus/
Summary: Intelligent Input Bus for Linux OS
License: LGPL-2.1+
Group: System/I18n/Chinese
-
-Source:
https://github.com/ibus/ibus/releases/download/%{version}/%{name}-%{version}.tar.gz
-Source2: ibus-README.suse
+Url: https://github.com/ibus/
+#Source:
https://github.com/ibus/ibus/releases/download/%{version}/%{name}-%{version}.tar.gz
+Source: %{name}-%{version}.tar.gz
+Source2: README.SUSE
Source3: xim.ibus.suse.template
Source4: xim.d-ibus-121
Source5: kde.tar.gz
Source6: kde-12.2.tar.gz
+Source7: macros.ibus
+Source99: baselibs.conf
# PATCH-FIX-OPENSUSE ibus-python-install-dir.patch ft...@geeko.jp
Patch0: ibus-python-install-dir.patch
+
%if %{with_automatic_config}
# PATCH-FEATURE-UPSTREAM add-libgnomekbd-and-load-preload-engines.patch Issue
1641 ft...@geeko.jp
Patch1: add-libgnomekbd-and-load-preload-engines.patch
# PATCH-FEATURE-UPSTREAM
reload-preload-engines-until-users-customize-the-list.patch Issue 1641
ft...@geeko.jp
Patch2: reload-preload-engines-until-users-customize-the-list.patch
%endif
+
# PATCH-FIX-OPENSUSE
reload-preload-engines-until-users-customize-the-list.patch ft...@geeko.jp
Patch3: show-input-mode-icon.patch
# PATFH-FIX-SUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869
t...@suse.de -- Fix lost XIM input after screenlock
Patch4: ibus-xim-fix-re-focus-after-lock.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: /usr/bin/touch
-Provides: locale(ja;ko;zh)
+# PATCH-FIX-UPSTREAM marguer...@opensuse.org
+# Ibus will use python3 only when variable PYTHON2 is empty.
+# Thus ibus-setup and bindings are still bytecompiled with python2.
+# Then python3 support is useless, so we force python3 when python3
+# is enabled, and fix syntax errors in python-config.py
+Patch5: ibus-force-python3.patch
+# PATCH-FIX-UPSTREAM marguer...@opensuse.org
+# lower vala version
+Patch6: ibus-vala-0.18.patch
BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-1-python-devel >= 0.83.0
%if %{with_automatic_config}
BuildRequires: dbus-1-x11
+BuildRequires: libgnomekbd-devel
%endif
BuildRequires: dconf-devel >= 0.7.5
BuildRequires: fdupes
@@ -63,34 +80,48 @@
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: iso-codes-devel
-%if %{with_automatic_config}
-BuildRequires: libgnomekbd-devel
-%endif
BuildRequires: libnotify-devel >= 0.7
BuildRequires: libtool
# directory ownership {
BuildRequires: oxygen-icon-theme
BuildRequires: oxygen-icon-theme-scalable
+BuildRequires: x11-tools
# }
BuildRequires: pkg-config
-BuildRequires: python >= 2.5
-BuildRequires: python-gobject2-devel
+%if %{with_python3}
+BuildRequires: python3
+BuildRequires: python3-gobject2-devel
+Requires: python3-gobject2
+%else
+BuildRequires: python
+BuildRequires: python-gobject-devel
+Requires: python-gobject
+%endif
BuildRequires: update-desktop-files
-BuildRequires: pkgconfig(vapigen) >= 0.20
+BuildRequires: pkgconfig(vapigen)
+%if %{with_wayland}
+BuildRequires: pkgconfig(wayland-client) >= 1.2.0
+%endif
+BuildRequires: pkgconfig(xkbcommon)
Requires: dbus-1-python
Requires: dconf
Requires: iso-codes
Requires: libibus-1_0-5 = %{version}
-Requires: librsvg2
-Requires: python-gobject
-Obsoletes: ibus-gnome-shell
-Obsoletes: libibus-1_0-0
+%if %{with_python3}
+# ibus-setup will require typelib(Gdk) typelib(GdkX11), typelib(Gtk)
+# which are provided by two packages in openSUSE, so we limit their
+# versions to 3.0 only.
+Requires: typelib-1_0-Gtk-3_0
+%endif
Recommends: %{name}-lang
#Fix cursor following problem in KDE4 for libreoffice.
Supplements: packageand(libreoffice:libreoffice-gnome)
-%define gtk_binary_version %(pkg-config --variable=gtk_binary_version
gtk+-2.0)
+Provides: locale(ja;ko;zh)
+Obsoletes: ibus-gnome-shell
+Obsoletes: libibus-1_0-0
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It
provides
@@ -115,38 +146,51 @@
Summary: IBus im module for gtk2
Group: System/I18n/Chinese
Requires: %{name} = %{version}
-%gtk2_immodule_requires
Supplements: packageand(ibus:gtk2)
+%{gtk2_immodule_requires}
%description gtk
This package contains ibus im module for gtk2
%package gtk3
-
Summary: IBus im module for gtk3
Group: System/I18n/Chinese
-Requires: %{name} = %{version}
BuildRequires: gtk3-devel
-%gtk3_immodule_requires
+Requires: %{name} = %{version}
Supplements: packageand(ibus:gtk3)
+%{gtk3_immodule_requires}
%description gtk3
This package contains ibus im module for gtk3
+%if %{with_python3}
+%package -n python3-ibus
+Summary: Python3 module for ibus
+Group: System/I18n/Chinese
+Requires: %{name} = %{version}
+Requires: python3
+
+%description -n python3-ibus
+This package contains python3 module for ibus
+
+%else
%package -n python-ibus
Summary: Python module for ibus
Group: System/I18n/Chinese
Requires: %{name} = %{version}
+%py_requires
%description -n python-ibus
This package contains python module for ibus
+%endif
+
%package branding-openSUSE-KDE
Summary: openSUSE branding for KDE
Group: System/GUI/KDE
Requires: ibus = %{version}
-Supplements: packageand(ibus:kdelibs4)
Supplements: packageand(ibus:branding-openSUSE-KDE)
+Supplements: packageand(ibus:kdelibs4)
Provides: ibus-branding = %{version}
Conflicts: otherproviders(ibus-branding)
%if 0%{?suse_version} >= 1140
@@ -171,20 +215,23 @@
docs for ibus.
%lang_package
+
%prep
%setup -q
%patch0 -p1
+
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
-%if %suse_version < 1310
+%if 0%{?suse_version} < 1310
+%patch6 -p1
sed -i \
-e's@\(gtk-query-immodules-2.0-64\) --update-cache@\1 >
<prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \
-e's@\(gtk-query-immodules-2.0\) --update-cache@\1 >
<prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules@g' \
- $RPM_SOURCE_DIR/baselibs.conf
+ %{SOURCE99}
%endif
%if %{with_automatic_config}
-%patch1 -p1
-%patch2 -p1
+#%patch1 -p1
+#%patch2 -p1
rm -f bindings/vala/ibus-1.0.vapi
rm -f data/dconf/00-upstream-settings
%endif
@@ -192,39 +239,53 @@
%patch3 -p1
%patch4 -p1
+%if %{with_python3}
+%patch5 -p1
+%endif
+
+cp -r %{SOURCE2} .
+cp -r %{SOURCE3} .
+
%build
autoreconf -fi
intltoolize -f
%configure --disable-static \
--enable-gtk3 \
--enable-vala \
+%if %{with_python3}
+ --with-python=python3 \
+%endif
--enable-python-library \
--enable-introspection \
--disable-gconf \
--enable-dconf \
--enable-gtk-doc \
+%if %{with_wayland}
+ --enable-wayland \
+%endif
%if %{with_automatic_config}
--enable-libgnomekbd \
%endif
--enable-surrounding-text \
- --libexecdir=%{_prefix}/%{_lib}/ibus
+ --libexecdir=%{_libdir}/ibus
%if %{with_automatic_config}
-make -C ui/gtk3 maintainer-clean-generic
+make -C ui/gtk3 maintainer-clean-generic %{?_smp_mflags}
%endif
-make %{?jobs:-j %jobs}
+make %{?_smp_mflags}
%install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+
# autostart
-mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/
-install -m 644 $RPM_SOURCE_DIR/xim.d-ibus-121
$RPM_BUILD_ROOT/etc/X11/xim.d/ibus
+mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/
+install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/xim.d/ibus
-sed -i 1i"SYS_LIB=%{_lib}" $RPM_BUILD_ROOT/etc/X11/xim.d/ibus
+sed -i 1i"SYS_LIB=%{_lib}" %{buildroot}%{_sysconfdir}/X11/xim.d/ibus
PRIORITY=40
-pushd $RPM_BUILD_ROOT/etc/X11/xim.d/
+pushd %{buildroot}%{_sysconfdir}/X11/xim.d/
for lang in am ar as bn el fa gu he hi hr ja ka kk kn ko lo ml my \
pa ru sk vi zh_TW zh_CN zh_HK zh_SG \
de fr it es nl cs pl da nn nb fi en sv
@@ -237,15 +298,14 @@
popd
# remove static libs
-rm -f
$RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.*a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libibus-*.*a
+find %{buildroot}/%{_libdir} -name "*.la" -type f -delete -print
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/pixmaps
ln -sf %{_datadir}/icons/hicolor/48x48/apps/ibus-keyboard.png \
- $RPM_BUILD_ROOT%{_datadir}/pixmaps/ibus-keyboard.png
+ %{buildroot}%{_datadir}/pixmaps/ibus-keyboard.png
# touch for %%ghost
-touch $RPM_BUILD_ROOT/%{_sysconfdir}/dconf/db/ibus
+touch %{buildroot}/%{_sysconfdir}/dconf/db/ibus
# fix kde monochrome icons
%if 0%{?suse_version} >= 1230
@@ -264,100 +324,111 @@
cp -r ibus-keyboard.svgz %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/
popd
-%suse_update_desktop_file %name-setup System Utility settings
+# install macros
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/rpm
-%fdupes %buildroot/%_prefix
-%fdupes -s $RPM_BUILD_ROOT
+%suse_update_desktop_file %{name}-setup System Utility settings
+
+%fdupes %{buildroot}
%find_lang ibus10 %{?no_lang_C}
%post
-%glib2_gsettings_schema_post
+%{glib2_gsettings_schema_post}
%posttrans
dconf update
%postun
-%glib2_gsettings_schema_postun
+%{glib2_gsettings_schema_postun}
dconf update
%post gtk
-%gtk2_immodule_post
+%{gtk2_immodule_post}
%postun gtk
-%gtk2_immodule_postun
+%{gtk2_immodule_postun}
%post -n libibus-1_0-5 -p /sbin/ldconfig
%postun -n libibus-1_0-5 -p /sbin/ldconfig
%post gtk3
-%gtk3_immodule_post
+%{gtk3_immodule_post}
%postun gtk3
-%gtk3_immodule_postun
+%{gtk3_immodule_postun}
%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%doc $RPM_SOURCE_DIR/xim.ibus.suse.template
-%doc $RPM_SOURCE_DIR/ibus-README.suse
-%dir /etc/X11/xim.d
-%config /etc/X11/xim.d/*
-%dir %{_datadir}/ibus/
+%defattr(-,root,root)
+%doc AUTHORS COPYING README README.SUSE xim.ibus.suse.template
+%config %{_sysconfdir}/rpm/macros.ibus
+%config %{_sysconfdir}/X11/xim.d/*
%{_bindir}/ibus
%{_bindir}/ibus-daemon
%{_bindir}/ibus-setup
-%{_datadir}/ibus/*
-%{_datadir}/applications/*
-%dir %{_datadir}/GConf
-%dir %{_datadir}/GConf/gsettings
+%{_datadir}/ibus/
+%{_datadir}/applications/ibus-setup.desktop
%{_datadir}/GConf/gsettings/ibus.convert
%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/pixmaps/*
-%{_prefix}/%{_lib}/ibus
-%{_datadir}/bash-completion
+%{_datadir}/icons/hicolor/*/apps/ibus*.*
+%{_datadir}/pixmaps/ibus-keyboard.png
+%{_libdir}/ibus
+%{_datadir}/bash-completion/completions/ibus.bash
%dir %config %{_sysconfdir}/dconf/db/ibus.d
# These files are not config files. Users must not modify them.
-%{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings
+%ghost %{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings
%ghost %{_sysconfdir}/dconf/db/ibus
-%{_sysconfdir}/dconf/profile/ibus
-%{_mandir}/man1/ibus*
+%ghost %{_sysconfdir}/dconf/profile/ibus
+%{_mandir}/man1/ibus.1.gz
+%{_mandir}/man1/ibus-daemon.1.gz
+%{_mandir}/man1/ibus-setup.1.gz
%files lang -f ibus10.lang
+%defattr(-,root,root)
%files -n libibus-1_0-5
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
+%defattr(-,root,root)
+%{_libdir}/libibus-1.0.so.*
%files -n typelib-1_0-IBus-1_0
-%defattr(-,root,root,-)
+%defattr(-,root,root)
%{_libdir}/girepository-1.0/IBus-1.0.typelib
%files gtk
-%defattr(-,root,root,-)
+%defattr(-,root,root)
%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so
%files gtk3
-%defattr(-,root,root,-)
-%{_libdir}/gtk-3.0/3.0.0/immodules/*
+%defattr(-,root,root)
+%{_libdir}/gtk-3.0/3.0.0/immodules/im-ibus.so
+
+%if %{with_python3}
+%files -n python3-ibus
+%defattr(-,root,root)
+%{python3_sitearch}/ibus
+
+%else
%files -n python-ibus
-%defattr(-,root,root,-)
+%defattr(-,root,root)
%{python_sitearch}/ibus
+%endif
+
%files devel
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so
-%{_includedir}/*
-%{_datadir}/gtk-doc/html/*
-%{_libdir}/pkgconfig/*
+%defattr(-,root,root)
+%{_libdir}/libibus-1.0.so
+%{_includedir}/ibus-1.0
+%{_datadir}/gtk-doc/html/ibus
+%{_libdir}/pkgconfig/ibus-1.0.pc
%{_datadir}/gir-1.0/IBus-1.0.gir
-%{_datadir}/vala/vapi/*
+%{_datadir}/vala/vapi/ibus-1.0.deps
+%{_datadir}/vala/vapi/ibus-1.0.vapi
%files branding-openSUSE-KDE
-%defattr(-,root,root,-)
+%defattr(-,root,root)
%dir %{_datadir}/icons/oxygen/24x24
%dir %{_datadir}/icons/oxygen/24x24/apps
%{_datadir}/icons/oxygen/*/apps/ibus-keyboard.*
++++++ README.SUSE ++++++
ibus README for SuSE
How to start using ibus
English:
0:Note: ibus don't support QT3 immodule,
If you use qt3-base applications, modify your /etc/X11/xim.d/ibus to
export QT_IM_MODULE=xim
1.openSUSE can start ibus automatically when your locale is set to en, zh_TW,
zh_CN, zh_HK, zh_SG, ko_KR and ja_JP.
The setup script is a link in /etc/X11/xim.d/YOUR-LOCALE/40-ibus which link to
/etc/X11/xim.d/ibus.
The number "40" makes ibus have priority over other input-method (e.g 50-scim
or 90-xcin ).
If you prefer not using ibus, mv 40-ibus to 80-ibus (for example). Or see 2.
2.If for some reason can't start ibus when login Xwindow
There is another input-method who has higher priority then ibus (e.g 10-oxim)
You can edit ~/.xim, see ~/.xim.template for more informations.
Or edit ~/.profile, add
export INPUT_METHOD="ibus"
After installing ibus, there's a template for ibus:
/usr/share/doc/packages/ibus/xim.ibus.suse.template
copy this file to ~/.xim, then you can use ibus next login X.
3.You want to use your own input-method other than system setting
(1)System setting:
Edit /etc/sysconfig/language , set INPUT_METHOD="scim-bridge", or whatever you
want,Make sure your start-up script is put in /etc/X11/xim.d/ with same name
ypu mention.
(2)For specific language setting:
Link a start-up script in /etc/X11/xim.d/ to your locale with a higher priority
(smaller number), eg
ln -s /etc/X11/xim.d/scim-bridge /etc/X11/xim.d/zh_TW/20-scim-bridge
(3)Personal setting:
Edit ~/.profile add
export INPUT_METHOD="scim-bridge" or whatever script in /etc/X11/xim.d/
or white your own ~/.xim, see ~/.xim.template for more informations.
4.Bug report or any suggestion to
http://code.google.com/p/ibus/
Chinese:
0:注意：ibus 不支援 QT3 immodule,
若您使用 qt3-based 應用程式，請修改 /etc/X11/xim.d/ibus 設定
export QT_IM_MODULE=xim
1.當您使用的語系是en 或zh_*時，SuSE 會自動啟動ibus
啟動的script是/etc/X11/xim.d/YOUR-LOCALE/40-ibus，這是一個到上層目錄ibus的連結
"40"這個數字使他的優先順序高於90-xcin及50-scim
如果您不喜歡這個順序，修改連結的名稱為(例如：80-ibus)，或參考2.
2.重新登入X後，如果不能用ibus...可能是：
有別的輸入法的優先順序高於ibus(例如：10-oxim)
您可以編輯~/.xim，請參考~/.xim.template
安裝ibus後，會有一個範本：/usr/share/doc/packages/ibus/xim.ibus.suse.template
將這個檔案複製到您的~/.xim，當您下次登入X時就可以使用ibus了
或編輯~/.profile，加入
export INPUT_METHOD="ibus"
3.如果您想要自己選擇輸入法而非使用系統設定
(1)全系統設定：
編輯 /etc/sysconfig/language, 設定 INPUT_METHOD="ibus" 或其他你想用的輸入法，
請注意你的啟動程序必須位於 /etc/X11/xim.d/，並和您指定的名稱相同
(2)針對特定語言：
將您的啟動程序連結到你的語系中，並前置較高的優先順序(較小數字)，例如
ln -s /etc/X11/xim.d/ibus /etc/X11/xim.d/zh_TW/20-ibus
(3)個人設定：
編輯 ~/.profile 加入
export INPUT_METHOD="ibus" 或其他在 /etc/X11/xim.d/ 的啟動程序
或自行編寫啟動程序 ~/.xim，請參考 ~/.xim.template
5.臭蟲回報或建議請至
http://code.google.com/p/ibus/
++++++ ibus-1.5.7.tar.gz -> ibus-1.5.8.tar.gz ++++++
++++ 18571 lines of diff (skipped)
++++++ ibus-force-python3.patch ++++++
Index: ibus-1.5.8/configure.ac
===================================================================
--- ibus-1.5.8.orig/configure.ac
+++ ibus-1.5.8/configure.ac
@@ -379,9 +379,9 @@ AC_ARG_WITH(python,
AM_PATH_PYTHON([2.5])
AC_PATH_PROG(PYTHON2, python2)
-if test x"$PYTHON2" = x""; then
+#if test x"$PYTHON2" = x""; then
PYTHON2=$PYTHON
-fi
+#fi
PYGOBJECT_REQUIRED=3.0.0
Index: ibus-1.5.8/python-config.py
===================================================================
--- ibus-1.5.8.orig/python-config.py
+++ ibus-1.5.8/python-config.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python2.5
-
import sys
import os
import getopt
@@ -30,10 +28,10 @@ if opt == '--help':
exit_with_usage(0)
elif opt == '--prefix':
- print sysconfig.PREFIX
+ print(sysconfig.PREFIX)
elif opt == '--exec-prefix':
- print sysconfig.EXEC_PREFIX
+ print(sysconfig.EXEC_PREFIX)
elif opt in ('--includes', '--cflags'):
flags = ['-I' + sysconfig.get_python_inc(),
++++++ ibus-vala-0.18.patch ++++++
Index: ibus-1.5.8/configure.ac
===================================================================
--- ibus-1.5.8.orig/configure.ac
+++ ibus-1.5.8/configure.ac
@@ -125,7 +125,7 @@ AC_SUBST(DATE_DISPLAY)
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CC_STDC
-AM_PROG_VALAC([0.20])
+AM_PROG_VALAC([0.18])
AC_PROG_INSTALL
AC_PROG_MAKE_SET
++++++ macros.ibus ++++++
# RPM macros for ibus
# You should use %%{_ibus_icondir} and %%{_ibus_tabledir}
# in %%files section
# For ibus table packaging, you have to:
# Use %%ibus_table_requires as requires
# Use %%ibus_table_index_post %%DB_NAME in %%post to create
# table indexes for your table package.
%_ibus_includedir %{_includedir}/ibus-1.0
%_ibus_libdir %{_libdir}/ibus
%_ibus_libexecdir %{_ibus_libdir}
%_ibus_datadir %{_datadir}/ibus
%_ibus_componentdir %{_ibus_datadir}/component
%_ibus_enginedir %{_ibus_datadir}/engine
%_ibus_keymapdir %{_ibus_datadir}/keymaps
%_ibus_setupdir %{_ibus_datadir}/setup
%_ibus_autostartdir %{_sysconfdir}/X11/xim.d
%_ibus_tabledir %{_datadir}/ibus-table/tables
%_ibus_icondir %{_datadir}/ibus-table/icons
%ibus_requires \
Requires: ibus
%ibus_table_requires \
Requires: ibus-table
Requires(post): ibus-table
%ibus_table_index_post() \
%if "x%1" != "x%%1" \
DB_NAME="%1" \
%else \
echo "Missing argument DB_NAME in call to %%ibus_table_create_index." \
false \
%endif \
/usr/bin/ibus-table-createdb -i -n %{_ibus_tabledir}/${DB_NAME}.db || true
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
