Hello community, here is the log from the commit of package ibus.1535 for openSUSE:12.3:Update checked in at 2013-04-10 11:04:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/ibus.1535 (Old) and /work/SRC/openSUSE:12.3:Update/.ibus.1535.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus.1535", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-04-05 00:01:41.916011506 +0200 +++ /work/SRC/openSUSE:12.3:Update/.ibus.1535.new/ibus.changes 2013-04-10 11:04:30.000000000 +0200 @@ -0,0 +1,232 @@ +------------------------------------------------------------------- +Fri Mar 29 06:22:49 UTC 2013 - [email protected] + +- Put gnome-shell integration files into separate package because + these (since openSUSE 12.3) pull in a lot of new unwanted packages + on a GNOME-less system compared to 12.2. (bnc#812298) +- Use more robust make install call +- Remove redundant %clean section +- fix python-bytecode-inconsistent-mtime + +------------------------------------------------------------------- +Sat Feb 16 15:59:12 UTC 2013 - [email protected] + +- better solution for bnc#802967 + * add ibus_indicator-14.patch: a shell extension for GNOME 3.6 + * update ibus-fix-tray-icon-on-gnome-3.6.patch + +------------------------------------------------------------------- +Sat Feb 9 13:13:13 CST 2013 - [email protected] + +- fix bnc#802967 + * fix ibus's tray icon can't show in gnome-shell 3.6 for openSUSE 12.3, + add ibus-fix-tray-icon-on-gnome-3.6.patch + +------------------------------------------------------------------- +Thu Jan 10 12:50:49 UTC 2013 - [email protected] + +- add ibus-fix-docs-build-error.patch: to fix build error + in Factory + +------------------------------------------------------------------- +Wed Oct 17 04:20:14 UTC 2012 - [email protected] + +- .spec file optimization + + * remove commented patch lines + * use `make %{?_smp_mflags}` instead of `make %{?jobs:-j%jobs}` + see: http://en.opensuse.org/openSUSE:Specfile_guidelines#Parallel_make + +------------------------------------------------------------------- +Sat Aug 25 20:25:17 CST 2012 - [email protected] + +- update to 1.4.2 + Some bug fixings + +------------------------------------------------------------------- +Mon Jun 18 10:59:35 CEST 2012 - [email protected] + +- Move the strict dependency on libibus-1_0-0 to ibus main package; + otherwise user may get the inconsistent setups + +------------------------------------------------------------------- +Thu May 17 07:11:11 UTC 2012 - [email protected] + +- remove soft link in RPM_BUILD_ROOT + +------------------------------------------------------------------- +Thu May 17 06:10:46 UTC 2012 - [email protected] + +- mkdir target directory before link + +------------------------------------------------------------------- +Thu May 17 05:49:31 UTC 2012 - [email protected] + +- fix build error in Factory: ln should be done in buildroot + +------------------------------------------------------------------- +Wed Mar 7 21:54:43 CST 2012 - [email protected] + +- Fix FSF-address warnings in RPMLINT report + +------------------------------------------------------------------- +Wed Mar 07 12:27:57 CST 2012 - [email protected] + +- Update to 1.4.1 + * Many bug fixings +- Fix several RPMLINT report warnings + +------------------------------------------------------------------- +Sun Feb 12 17:29:16 UTC 2012 - [email protected] + +- Fix problem default preload engines do not work (bnc#746612) +- Fix slow down issue after "source xim.d/ibus" in a SSH session + +------------------------------------------------------------------- +Tue Jan 24 10:12:30 UTC 2012 - [email protected] + +- Split typelib file into typelib-1_0-IBus-1_0 subpackage. +- Add typelib-1_0-IBus-1_0 Requires to devel subpackage. + +------------------------------------------------------------------- +Thu Oct 13 11:42:01 CEST 2011 - [email protected] + +- Add obsoletes for libibus2-32bit in baselibs.conf + +------------------------------------------------------------------- +Wed Oct 12 12:50:19 UTC 2011 - [email protected] + +- update to 1.4.0 + * Status icon for GNOME 3 (bug#723591) + +------------------------------------------------------------------- +Tue Sep 6 17:17:56 UTC 2011 - [email protected] + +- Fix xim.d/ibus to launch D-Bus daemon (only for newer D-Bus) + +------------------------------------------------------------------- +Mon Aug 8 16:34:13 CEST 2011 - [email protected] + +- Fix baselibs.conf to update GTK immodule cache properly for + ibus-gtk-32bit and ibus-gtk3-32bit packages, too +- Clean up spec file + +------------------------------------------------------------------- +Mon Jun 27 14:21:46 CEST 2011 - [email protected] + +- dropped the dependencies with release number +- simplify for passing gtk3 configure option + +------------------------------------------------------------------- +Sun Jun 19 12:43:54 UTC 2011 - [email protected] + +- Change files in package, some should move to devel subpackage and libibus package + +------------------------------------------------------------------- +Thu Jun 16 07:37:21 CEST 2011 - [email protected] + +- Fix xim.d locale directories of ja and ko +- Add xim.d selections for more locales to replace with SCIM + +------------------------------------------------------------------- +Wed Jun 15 11:50:47 CEST 2011 - [email protected] + +- Add provides tag for supported locales (ja, ko, zh) +- Add proper supplements tags to gtk immodule packages + +------------------------------------------------------------------- +Mon Jun 13 16:15:29 UTC 2011 - [email protected] + +- Update to ibus 1.3.9 +- Set priority to 40, if we want to use ibus as default input method, + better use a lower priority, so if any other input method framework + installed, system can use other input method instead. +- Update README +- Remove kimpanel script from start up script +- Add gtk3 immodule + +------------------------------------------------------------------- +Wed Mar 9 11:58:08 CET 2011 - [email protected] + +- Fix post scripts to use new gtk2_immodule_* macros (bnc#678080) + +------------------------------------------------------------------- +Wed Nov 17 08:44:04 UTC 2010 - [email protected] + +- Upgrade to ibus 1.3.8: + * Fix CPU 100% usage with signal.SIGCHLD + * Destroy existing connection before creating a new + connection, and only create the fake context once. + * Move the candidate window just above the cursor + when the window and a preedit string overlap. + * Enable key snooper by default again + * Always consume the hotkey, even if the hotkey + associated engine already activated. + * Fix race condition in bus_ibus_impl_create_engine() + * Fix a build error of IBus-1.0.gir with gobject-introspection 0.9.6 + * Implement stress tool for ibus. + * Fix a build error with GTK3 gdkkeysyms.h + * Add time info in log message from [email protected] + * Fix memory leak in ibus_input_context_process_key_event by Fujiwarat + * Fix segv in bus_engine_proxy_process_key_event_reply_cb + * Fix property issue. + * Updated many translations. + +------------------------------------------------------------------- +Tue Jul 13 07:44:40 UTC 2010 - [email protected] + +- Add ibus-disable-portability-check.patch + * Disable automake's portability check, make OBS happy. + +------------------------------------------------------------------- +Mon Jul 12 08:49:24 UTC 2010 - [email protected] + +- Upgrade to 1.3.6: + * Support gtk3 + * Support gobject-introspection + * Support vala language + * Fix some bugs + +------------------------------------------------------------------- +Tue May 11 10:00:07 UTC 2010 - [email protected] + +- Upgrade to 1.3.3: + * Add configure option to disable key snooper in gtk im context + * Fix a crash in ibus-x11 + * Fix a crash in ibus-daemon + * For show language bar option, use {Embedded in menu} to replace {Never}. ++++ 35 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.ibus.1535.new/ibus.changes New: ---- baselibs.conf ibus-1.4.2.tar.gz ibus-README.suse ibus-fix-default-preload-engines.patch ibus-fix-docs-build-error.patch ibus-fix-tray-icon-on-gnome-3.6.patch ibus-python-install-dir.patch ibus.changes ibus.spec ibus_indicator-14.patch xim.d-ibus xim.d-ibus-121 xim.ibus.suse.template ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus.spec ++++++ # # spec file for package ibus # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define build_gtk3 (0%{?suse_version} >= 1140) %define build_without_dbus_autolaunch (0%{?suse_version} >= 1210) %define domain_name %{name}10 Name: ibus Version: 1.4.2 Release: 0 Summary: Intelligent Input Bus for Linux OS License: LGPL-2.1+ Group: System/I18n/Chinese Url: http://code.google.com/p/ibus/ Source: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz Source1: xim.d-ibus Source2: ibus-README.suse Source3: xim.ibus.suse.template Source4: xim.d-ibus-121 Patch0: ibus-python-install-dir.patch Patch1: ibus-fix-default-preload-engines.patch Patch2: ibus-fix-docs-build-error.patch Patch3: ibus-fix-tray-icon-on-gnome-3.6.patch Patch4: ibus_indicator-14.patch BuildRequires: dbus-1-python-devel >= 0.83.0 BuildRequires: fdupes BuildRequires: gettext-devel BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: iso-codes-devel BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python BuildRequires: python-gobject2-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gtk+-2.0) Requires(pre): /usr/bin/touch Requires: dbus-1-python Requires: gconf2 Requires: gobject-introspection Requires: iso-codes Requires: libibus-1_0-0 = %{version} Requires: notification-daemon Requires: python-gtk Requires: python-notify Requires: python-xdg Provides: locale(ja;ko;zh) BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") %define gtk_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0) %description IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides full featured and user friendly input method user interface. It also may help developers to develop input method easily. %package -n libibus-1_0-0 Summary: IBus libraries Group: System/I18n/Chinese %description -n libibus-1_0-0 This package contains the libraries for IBus %package -n typelib-1_0-IBus-1_0 Summary: IBus libraries -- Introspection bindings Group: System/I18n/Chinese %description -n typelib-1_0-IBus-1_0 This package contains the introspection bindings for the IBus library. %package gtk Summary: IBus im module for gtk2 Group: System/I18n/Chinese Requires: %{name} = %{version} Supplements: packageand(ibus:gtk2) %gtk2_immodule_requires %description gtk This package contains ibus im module for gtk2 %if %{build_gtk3} %package gtk3 Summary: IBus im module for gtk3 Group: System/I18n/Chinese BuildRequires: gtk3-devel Requires: %{name} = %{version} Supplements: packageand(ibus:gtk3) %gtk3_immodule_requires %description gtk3 This package contains ibus im module for gtk3 %endif %package gnome-shell # This implicitly draws in the GNOME Shell itself and thus is separate Summary: GNOME Shell integration for IBus Group: System/GUI/GNOME BuildArch: noarch %description gnome-shell The package contains the files for integrating IBus into the GNOME Shell. %package devel Summary: Development tools for ibus Group: Development/Libraries/Other Requires: gtk-doc Requires: ibus = %{version} Requires: typelib-1_0-IBus-1_0 = %{version} Requires: pkgconfig(dbus-1) Requires: pkgconfig(glib-2.0) %description devel The ibus-devel package contains the header files and developer docs for ibus. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %if 0%{?suse_version} >= 1230 %patch3 -p1 %patch4 -p1 %endif %build autoreconf -fi intltoolize -f %configure --disable-static \ %if %{build_gtk3} --enable-gtk3 \ %endif --disable-iso-codes-check \ --disable-gobject-introspection \ --enable-gtk-doc \ --libexecdir=%{_libdir}/ibus make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} # Autostart mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ %if %{build_without_dbus_autolaunch} install -m 644 $RPM_SOURCE_DIR/xim.d-ibus-121 %{buildroot}%{_sysconfdir}/X11/xim.d/ibus %else install -m 644 $RPM_SOURCE_DIR/xim.d-ibus %{buildroot}%{_sysconfdir}/X11/xim.d/ibus %endif sed -i 1i"SYS_LIB=%{_lib}" %{buildroot}%{_sysconfdir}/X11/xim.d/ibus PRIORITY=40 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 do mkdir $lang pushd $lang ln -s ../ibus $PRIORITY-ibus popd done popd # Fix python-bytecode-inconsistent-mtime pushd %{buildroot}%{_datadir}/ibus/ui/gtk %py_compile i18n.py mv ./i18n.pyc %{buildroot}%{_datadir}/ibus/setup/i18n.pyc popd pushd %{buildroot}%{_datadir}/ibus/ui/gtk %py_compile -O engineabout.py mv ./engineabout.pyo %{buildroot}%{_datadir}/ibus/setup/engineabout.pyo popd # Remove static libs rm -f %{buildroot}/%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.*a rm -f %{buildroot}/%{_libdir}/libibus-*.*a rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/ibus.desktop mkdir -p %{buildroot}%{_datadir}/pixmaps ln -sf %{_datadir}/icons/hicolor/48x48/apps/ibus-keyboard.png \ %{buildroot}%{_datadir}/pixmaps/ibus-keyboard.png %suse_update_desktop_file %{name} Utility DesktopUtility %suse_update_desktop_file %{name}-setup System Utility settings %find_lang %{domain_name} %find_gconf_schemas cat %{name}.schemas_list %{domain_name}.lang > %{name}.lst %fdupes -s %{buildroot} %if 0%{?suse_version} >= 1230 install -m755 -d %{buildroot}%{_datadir}/gnome-shell/extensions/[email protected] install -m644 [email protected]/* %{buildroot}%{_datadir}/gnome-shell/extensions/[email protected] %endif %pre -f %{name}.schemas_pre %post gtk %gtk2_immodule_post %preun -f %{name}.schemas_preun %posttrans -f %{name}.schemas_posttrans %postun gtk %gtk2_immodule_postun %post -n libibus-1_0-0 -p /sbin/ldconfig %postun -n libibus-1_0-0 -p /sbin/ldconfig %if %{build_gtk3} %post gtk3 %gtk3_immodule_post %postun gtk3 %gtk3_immodule_postun %endif %files -f %{name}.lst %defattr(-,root,root,-) %doc AUTHORS COPYING README %doc $RPM_SOURCE_DIR/xim.ibus.suse.template %doc $RPM_SOURCE_DIR/ibus-README.suse %dir %{_sysconfdir}/X11/xim.d %config %{_sysconfdir}/X11/xim.d/* %{python_sitelib}/ibus %dir %{_datadir}/ibus/ %{_bindir}/ibus-daemon %{_bindir}/ibus-setup %{_datadir}/ibus/* %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/pixmaps/* %{_libdir}/ibus %if 0%{?suse_version} >= 1230 %files gnome-shell %defattr(-,root,root) %dir %{_datadir}/gnome-shell/ %dir %{_datadir}/gnome-shell/extensions/ %dir %{_datadir}/gnome-shell/extensions/[email protected]/ %{_datadir}/gnome-shell/extensions/[email protected]/* %endif %files -n libibus-1_0-0 %defattr(-,root,root,-) %{_libdir}/lib*.so.* %files -n typelib-1_0-IBus-1_0 %defattr(-,root,root,-) %{_libdir}/girepository-1.0/IBus-1.0.typelib %files gtk %defattr(-,root,root,-) %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so %if 0%{?suse_version} >= 1140 %files gtk3 %defattr(-,root,root,-) %{_libdir}/gtk-3.0/3.0.0/immodules/* %endif %files devel %defattr(-,root,root,-) %{_libdir}/lib*.so %{_includedir}/* %{_datadir}/gtk-doc/html/* %{_libdir}/pkgconfig/* %{_datadir}/gir-1.0/IBus-1.0.gir %{_datadir}/vala/ %changelog ++++++ baselibs.conf ++++++ ibus-gtk post "%if "%_lib" == "lib64"" post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules" post "%else" post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules" post "%endif" postun "%if "%_lib" == "lib64"" postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules" postun "%else" postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules" postun "%endif" supplements "packageand(ibus:gtk2-<targettype>)" ibus-gtk3 post "%if "%_lib" == "lib64"" post "<prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache" post "%else" post "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache" post "%endif" postun "%if "%_lib" == "lib64"" postun "<prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache" postun "%else" postun "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache" postun "%endif" supplements "packageand(ibus:gtk3-<targettype>)" libibus-1_0-0 obsoletes "libibus2-<targettype> < <version>" ++++++ ibus-README.suse ++++++ ibus README for SuSE How to start using ibus Note: Since GNOME 3.6 does not support IBus 1.4, IBus's indicator icon is not placed on GNOME panel in the top of screen by default. This package includes a GNOME shell extension named IBus 1.4 indicator to resolve this problem. Please enable the extension manually from gnome-tweak-tool GUI if you need the indicator on the panel. 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-fix-default-preload-engines.patch ++++++ diff -ru ibus-1.4.0.org/bus/ibusimpl.c ibus-1.4.0/bus/ibusimpl.c --- ibus-1.4.0.org/bus/ibusimpl.c 2011-12-01 01:45:56.453139058 +0900 +++ ibus-1.4.0/bus/ibusimpl.c 2011-12-01 01:55:53.941669370 +0900 @@ -530,9 +530,12 @@ GVariant *variant = ibus_config_get_value (ibus->config, "general", "preload_engines"); if (variant != NULL) { - done = TRUE; + if (g_variant_n_children (variant) > 0) { + done = TRUE; + g_variant_unref (variant); + return; + } g_variant_unref (variant); - return; } done = TRUE; ++++++ ibus-fix-docs-build-error.patch ++++++ diff -ru ibus-1.4.2/docs/reference/ibus/ibus-docs.sgml.in ibus-1.4.2.mod/docs/reference/ibus/ibus-docs.sgml.in --- ibus-1.4.2/docs/reference/ibus/ibus-docs.sgml.in 2012-03-07 00:34:36.000000000 +0900 +++ ibus-1.4.2.mod/docs/reference/ibus/ibus-docs.sgml.in 2013-01-10 20:58:01.204986242 +0900 @@ -74,8 +74,10 @@ <xi:include href="xml/ibusenginedesc.xml"/> <xi:include href="xml/ibusfactory.xml"/> <xi:include href="xml/ibusinputcontext.xml"/> + <xi:include href="xml/ibuskeys.xml"/> <xi:include href="xml/ibuskeymap.xml"/> <xi:include href="xml/ibuskeysyms.xml"/> + <xi:include href="xml/ibusutil.xml"/> </chapter> <chapter> <title>Configuration</title> @@ -92,9 +94,6 @@ <title>Communication</title> <para>Here lists the service communication functions.</para> <xi:include href="xml/ibusbus.xml"/> - <xi:include href="xml/ibusconnection.xml"/> - <xi:include href="xml/ibusmessage.xml"/> - <xi:include href="xml/ibuspendingcall.xml"/> <xi:include href="xml/ibusproxy.xml"/> <xi:include href="xml/ibusserializable.xml"/> <xi:include href="xml/ibusservice.xml"/> @@ -104,9 +103,7 @@ <para>Definition and functions for IBus internal use.</para> <xi:include href="xml/ibusdebug.xml"/> <xi:include href="xml/ibuserror.xml"/> - <xi:include href="xml/ibusmainloop.xml"/> <xi:include href="xml/ibusobject.xml"/> - <xi:include href="xml/ibusserver.xml"/> <xi:include href="xml/ibusshare.xml"/> <xi:include href="xml/ibustypes.xml"/> </chapter> ++++++ ibus-fix-tray-icon-on-gnome-3.6.patch ++++++ diff -ru ibus-1.4.2.org/ui/gtk/panel.py ibus-1.4.2/ui/gtk/panel.py --- ibus-1.4.2.org/ui/gtk/panel.py 2012-08-22 23:16:51.000000000 +0900 +++ ibus-1.4.2/ui/gtk/panel.py 2013-02-11 16:40:38.328356131 +0900 @@ -112,7 +112,7 @@ self.__status_icon.set_visible(False) # gtk_status_icon_set_name() is not available in pygtk2 2.17 if hasattr(self.__status_icon, 'set_name'): - self.__status_icon.set_name('ibus-ui-gtk') + self.__status_icon.set_name('ibus-ui-gtk-14') self.__status_icon.set_title(_("IBus Panel")) # Hide icon until bus get the name owner. #self.__status_icon.set_visible(True) ++++++ ibus-python-install-dir.patch ++++++ diff --git a/ibus/Makefile.am b/ibus/Makefile.am index d1cd750..9910f54 100644 --- a/ibus/Makefile.am +++ b/ibus/Makefile.am @@ -56,7 +56,7 @@ nodist_ibus_PYTHON = \ _config.py \ $(NULL) -ibusdir = @pkgpythondir@ +ibusdir = @pyexecdir@/ibus EXTRA_DIST = \ _config.py.in \ diff --git a/ibus/interface/Makefile.am b/ibus/interface/Makefile.am index 49871ed..1fa37e5 100644 --- a/ibus/interface/Makefile.am +++ b/ibus/interface/Makefile.am @@ -31,7 +31,7 @@ ibus_interface_PYTHON = \ __init__.py \ $(NULL) -ibus_interfacedir = @pkgpythondir@/interface +ibus_interfacedir = @pyexecdir@/ibus/interface CLEANFILES = \ *.pyc \ ++++++ ibus_indicator-14.patch ++++++ diff -ruN ibus-1.4.2.org/[email protected]/extension.js ibus-1.4.2/[email protected]/extension.js --- ibus-1.4.2.org/[email protected]/extension.js 1970-01-01 09:00:00.000000000 +0900 +++ ibus-1.4.2/[email protected]/extension.js 2013-02-17 00:46:21.244945766 +0900 @@ -0,0 +1,107 @@ +const Main = imports.ui.main +const Shell = imports.gi.Shell +const Panel = imports.ui.panel +const Lang = imports.lang +const PanelMenu = imports.ui.panelMenu +const NotificationDaemon = imports.ui.notificationDaemon; + +let addIndicator = null + +const AddIndicator = new Lang.Class({ + Name: 'AddIndicator', + + _init: function() { + Main.notificationDaemon._trayManager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded)) + Main.notificationDaemon._trayManager.connect('tray-icon-removed', Lang.bind(this, this._onTrayIconRemoved)) + Panel.PANEL_ITEM_IMPLEMENTATIONS['ibus-ui-gtk-14'] = null; + }, + + _onTrayIconAdded: function(manager, actor) { + if (actor.wm_class == 'ibus-ui-gtk-14') { + // for patched IBus 1.4 + this._icon = actor; + this._addIBusIndicator(); + } else if (actor.wm_class == 'ibus-ui-gtk') { + try { + var IBus = imports.gi.IBus + if (!('new_async' in IBus.Bus)) { + // This IBus does not support GNOME 3.6 + this._icon = actor; + this._addIBusIndicator(); + } + } catch (e) { + IBus = null + log(e) + } + } + }, + + _addIBusIndicator: function() { + if (this._enabled && this._icon) { + this._removeFromNotificationDaemon(); + this._icon.height = Panel.PANEL_ICON_SIZE + this._icon.queue_redraw() + this._indicator = new PanelMenu.Button() + this._indicator.actor.add_actor(this._icon) + Main.panel.addToStatusArea('ibus-ui-gtk-14', this._indicator, 0, 'right') + NotificationDaemon.STANDARD_TRAY_ICON_IMPLEMENTATIONS['ibus-ui-gtk-14'] = 'keyboard' + } + }, + + _removeIBusIndicator: function() { + if (this._indicator) { + this._indicator.actor.remove_actor(this._icon); +// this._icon.unparent(); + this._indicator.destroy(); + this._indicator = null; + } + }, + + _onTrayIconRemoved: function(manager, actor) { + if (actor.wm_class == 'ibus-ui-gtk-14' || actor.wm_class == 'ibus-ui-gtk') { + this._removeIBusIndicator(); + this._icon = null; + } + }, + + _removeFromNotificationDaemon: function() { + if (this._icon) { + let source = Main.notificationDaemon._lookupSource(null, this._icon.pid, true); + if (source) { + this._icon.get_parent().remove_actor(this._icon) +// this._icon.unparent() + source.destroy(); + } + } + }, + + _enabled: false, + enable: function() { + this._enabled = true; + this._addIBusIndicator(); + }, + + disable: function() { + this._enabled = false; + this._removeIBusIndicator(); + NotificationDaemon.STANDARD_TRAY_ICON_IMPLEMENTATIONS['ibus-ui-gtk-14'] = undefined; + if (this._icon) { + //Main.notificationDaemon._onTrayIconAdded(null, this._icon); + Main.notificationDaemon._getSource( + this._icon.title || this._icon.wm_class || C_("program", "Unknown"), + this._icon.pid, null, null, this._icon); + } + } +}) + +function init() { + addIndicator = new AddIndicator(); +} + +function enable() { + addIndicator.enable(); +} + +function disable() { + addIndicator.disable(); +} diff -ruN ibus-1.4.2.org/[email protected]/metadata.json ibus-1.4.2/[email protected]/metadata.json --- ibus-1.4.2.org/[email protected]/metadata.json 1970-01-01 09:00:00.000000000 +0900 +++ ibus-1.4.2/[email protected]/metadata.json 2013-02-17 00:46:29.038879855 +0900 @@ -0,0 +1 @@ +{"shell-version": ["3.6"], "uuid": "[email protected]", "name": "IBus 1.4 indicator", "description": "An indicator for IBus 1.4"} ++++++ xim.d-ibus ++++++ OLD_PATH=$PATH PATH=/usr/bin:/usr/X11R6/bin:/opt/kde3/bin:$PATH if ! type -p ibus-daemon > /dev/null 2>&1 ; then echo "ibus is not available." PATH=$OLD_PATH return 1 fi #when skim installed, Autostart must be "false". #here we move $HOME/.kde/share/config/skimrc to skimrc.orig.ibus case "$WINDOWMANAGER" in *kde*) if type -p skim > /dev/null 2>&1 \ && ! grep -i -q "^[[:space:]]*Autostart.*=.*false" $HOME/.kde/share/config/skimrc then if [ -f $HOME/.kde/share/config/skimrc.orig.ibus ] ; then mv -f $HOME/.kde/share/config/skimrc $HOME/.kde/share/config/skimrc.orig.ibus chmod 777 $HOME/.kde/share/config/skimrc.orig.ibus fi cat > $HOME/.kde/share/config/skimrc << __END [General] Autostart=false __END chmod 777 $HOME/.kde/share/config/skimrc else # do nothing : fi ;; *) # do nothing ;; esac # Determine the LC_CTYPE locale category setting #tmplang=${LC_ALL-${LC_CTYPE-${LANG-en_US}}} export LC_CTYPE=$LANG export XMODIFIERS="@im=ibus" export GTK_IM_MODULE=ibus export QT_IM_SWITCHER=imsw-multi if [ -e /usr/$SYS_LIB/qt4/plugins/inputmethods/libqtim-ibus.so ]; then export QT_IM_MODULE=ibus else export QT_IM_MODULE=xim fi ibus-daemon --xim -d PATH=$OLD_PATH # success: return 0 ++++++ xim.d-ibus-121 ++++++ OLD_PATH=$PATH PATH=/usr/bin:/usr/X11R6/bin:/opt/kde3/bin:$PATH if ! type -p ibus-daemon > /dev/null 2>&1 ; then echo "ibus is not available." PATH=$OLD_PATH return 1 fi #when skim installed, Autostart must be "false". #here we move $HOME/.kde/share/config/skimrc to skimrc.orig.ibus case "$WINDOWMANAGER" in *kde*) if type -p skim > /dev/null 2>&1 \ && ! grep -i -q "^[[:space:]]*Autostart.*=.*false" $HOME/.kde/share/config/skimrc then if [ -f $HOME/.kde/share/config/skimrc.orig.ibus ] ; then mv -f $HOME/.kde/share/config/skimrc $HOME/.kde/share/config/skimrc.orig.ibus chmod 777 $HOME/.kde/share/config/skimrc.orig.ibus fi cat > $HOME/.kde/share/config/skimrc << __END [General] Autostart=false __END chmod 777 $HOME/.kde/share/config/skimrc else # do nothing : fi ;; *) # do nothing ;; esac # Determine the LC_CTYPE locale category setting #tmplang=${LC_ALL-${LC_CTYPE-${LANG-en_US}}} export LC_CTYPE=$LANG export XMODIFIERS="@im=ibus" export GTK_IM_MODULE=ibus export QT_IM_SWITCHER=imsw-multi if [ -e /usr/$SYS_LIB/qt4/plugins/inputmethods/libqtim-ibus.so ]; then export QT_IM_MODULE=ibus else export QT_IM_MODULE=xim fi if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then eval `dbus-launch --sh-syntax --exit-with-session --close-stderr < /dev/null` fi ibus-daemon --xim -d PATH=$OLD_PATH # success: return 0 ++++++ xim.ibus.suse.template ++++++ #~/.xim template for users to set ibus as default input method #copy this file to ~/.xim #logout and login again, that's all #for more infomations, see ~/.xim.template #if any program can't input Chinese, try export #LC_CTYPE=zh_TW.UTF-8, e.g export LC_CTYPE=$LANG export XMODIFIERS="@im=ibus" export GTK_IM_MODULE=ibus export QT_IM_SWITCHER=imsw-multi os_type=`uname -i` if [ $os_type = "x86_64" ]; then if [ -e /usr/lib64/qt4/plugins/inputmethods/libqtim-ibus.so ]; then export QT_IM_MODULE=ibus else export QT_IM_MODULE=xim fi else if [ -e /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so ]; then export QT_IM_MODULE=ibus else export QT_IM_MODULE=xim fi fi ibus-daemon --xim & -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
