Hello community, here is the log from the commit of package ibus for openSUSE:Factory checked in at 2020-10-07 14:16:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus (Old) and /work/SRC/openSUSE:Factory/.ibus.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus" Wed Oct 7 14:16:19 2020 rev:104 rq:839481 version:1.5.23 Changes: -------- --- /work/SRC/openSUSE:Factory/ibus/ibus.changes 2020-05-14 23:25:15.373041438 +0200 +++ /work/SRC/openSUSE:Factory/.ibus.new.4249/ibus.changes 2020-10-07 14:16:22.637385045 +0200 @@ -1,0 +2,41 @@ +Wed Sep 30 06:02:24 UTC 2020 - Hillwood Yang <[email protected]> + +- Update version to 1.5.23 + * Generate simple.xml with denylist 6042974 508527d 37db75b 6879879 59b902a + 568d58d 6ed34f3 5959d6f 5d67a28 394d9a8 ed7bc8d e938846 3aa670e 0d90da4 + e4dd6d1 + * Accept xdigits only for Unicode typing a440942 + * Update emoji-parser with CLDR emoji annotation release-31-0-1 9a9f828 + * Update ibusunicodegen.h with unicode-ucd 13.0.0 e10fc89 + * Delete deprecated ENABLE_APPINDICATOR_ENGINE_ICON check aa3a9f0 + * Fix SEGV 02105c4 f591381 + * Fix some errors in ibus-desktop-testing-runner 7b0d091 8da0167 + * Refactor source files 0b9d936 0ad5e9a + * Fix string formats in translatable strings 7caead1 f8c468a ce865f6 + * Use WAYLAND_DISPLAY on Wayland sessions to make up IBus socket name (Carlos + Garnacho) 8ce2520 + * Skip parsing of compose sequence with invalid keysyms (Neil Shepperd) + 0da3cec + * Tell Pango about the engine language in the candidate panel (Aaron Muir + Hamilton) 3f098dc 79a09f1 + * Fix for several error spotted by static analyzer (ntfs.hard) 00adea6 + * Remove glib_check_version() in gtk immodule (Changwoo Ryu) 5765bfd + * Build the Emoji dictionaries in parallel (Changwoo Ryu) 59d0de4 + * Update translation +- Drop 0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch, + ibus-use-wayland-display-for-socket-name.patch, + ibus-socket-name-compatibility.patch. Merged by upstream + +------------------------------------------------------------------- +Thu Sep 24 07:01:32 UTC 2020 - Cliff Zhao <[email protected]> + +- Update ibus.spec: Drop the is_opensuse macro to eliminate the + difference between SLE-15 and openSUSE-Leap (jsc#SLE-11653). + +------------------------------------------------------------------- +Sat Sep 19 17:35:46 UTC 2020 - Callum Farmer <[email protected]> + +- Move xim.d files to /usr/etc when available, which is + currently Tumbleweed only (boo#1176431) + +------------------------------------------------------------------- Old: ---- 0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch ibus-1.5.22.tar.gz ibus-socket-name-compatibility.patch ibus-use-wayland-display-for-socket-name.patch New: ---- ibus-1.5.23.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus.spec ++++++ --- /var/tmp/diff_new_pack.dyrw5F/_old 2020-10-07 14:16:23.601385811 +0200 +++ /var/tmp/diff_new_pack.dyrw5F/_new 2020-10-07 14:16:23.605385814 +0200 @@ -18,9 +18,14 @@ %define with_wayland 1 %define with_emoji 1 +%if ! %{defined _distconfdir} +%define _distconfdir %{_sysconfdir} +%else +%define use_usretc 1 +%endif Name: ibus -Version: 1.5.22 +Version: 1.5.23 Release: 0 Summary: The "Intelligent Input Bus" input method License: LGPL-2.1-or-later @@ -54,15 +59,6 @@ # PATCH-FIX-SLE ibus-disable-engines-preload-in-GNOME.patch bnc#1036729 [email protected] # Disable ibus engines preload in GNOME for These works are handled by gnome-shell. Patch12: ibus-disable-engines-preload-in-GNOME.patch -# PATCH-FIX-UPSTREAM [email protected] -# Remove unnecessary qt5 dependency https://github.com/ibus/ibus/pull/2194 -Patch13: 0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch -# PATCH-FIX-UPSTREAM ibus-use-wayland-display-for-socket-name.patch bsc#1171442, gh#ibus/ibus#2195 [email protected] -# Use WAYLAND_DISPLAY on Wayland sessions to make up IBus socket name -Patch14: ibus-use-wayland-display-for-socket-name.patch -# PATCH-FIX-UPSTREAM ibus-socket-name-compatibility.patch bsc#1171442, gh#ibus/ibus#2195 qkzhu@suse -# Compatibility workaround for ibus-use-wayland-display-for-socket-name.patch -Patch15: ibus-socket-name-compatibility.patch BuildRequires: fdupes BuildRequires: gettext-devel BuildRequires: gobject-introspection-devel >= 0.9.6 @@ -109,11 +105,6 @@ BuildRequires: unicode-emoji BuildRequires: pkgconfig(cldr-emoji-annotation) %endif -# PATCH-FEATURE-SLE FATE#319095 [email protected] -# Add conflict with fcitx to keep old IMF for people who update from SLE-12 SP0 to SP1. -%if !0%{?is_opensuse} -Conflicts: fcitx -%endif %description IBus, short for Intelligent Input Bus, is an input framework. IBus @@ -201,14 +192,9 @@ cp -r %{SOURCE10} . cp -r %{SOURCE11} . -%if !0%{?is_opensuse} %patch10 -p1 %patch11 -p1 %patch12 -p1 -%endif -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 %build autoreconf -fi @@ -239,15 +225,15 @@ %make_install # autostart -mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ -install -m 644 xim.d-ibus-121 %{buildroot}%{_sysconfdir}/X11/xim.d/ibus +mkdir -p %{buildroot}%{_distconfdir}/X11/xim.d/ +install -m 644 xim.d-ibus-121 %{buildroot}%{_distconfdir}/X11/xim.d/ibus mkdir -p %{buildroot}%{_bindir} install -c -m 0755 ibus-autostart %{buildroot}%{_bindir}/ibus-autostart mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart install -c -m 0644 ibus-autostart.desktop %{buildroot}%{_sysconfdir}/xdg/autostart/ibus-autostart.desktop PRIORITY=40 -pushd %{buildroot}%{_sysconfdir}/X11/xim.d/ +pushd %{buildroot}%{_distconfdir}/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 @@ -307,7 +293,13 @@ %doc AUTHORS README README.SUSE xim.ibus.suse.template %license COPYING %{_rpmmacrodir}/macros.ibus +%if %{defined use_usretc} +%dir %{_distconfdir}/X11 +%dir %{_distconfdir}/X11/xim.d +%{_distconfdir}/X11/xim.d/* +%else %config %{_sysconfdir}/X11/xim.d/* +%endif %{_bindir}/ibus %{_bindir}/ibus-autostart %{_bindir}/ibus-daemon ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.dyrw5F/_old 2020-10-07 14:16:23.653385852 +0200 +++ /var/tmp/diff_new_pack.dyrw5F/_new 2020-10-07 14:16:23.657385856 +0200 @@ -4,11 +4,11 @@ English: 0:Note: ibus don't support QT3 immodule, -If you use qt3-base applications, modify your /etc/X11/xim.d/ibus to +If you use qt3-base applications, modify your /usr/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 setup script is a link in /usr/etc/X11/xim.d/YOUR-LOCALE/40-ibus which link to /usr/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. @@ -22,27 +22,27 @@ 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. +Edit /etc/sysconfig/language , set INPUT_METHOD="scim-bridge", or whatever you want,Make sure your start-up script is put in /usr/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 +Link a start-up script in /usr/etc/X11/xim.d/ to your locale with a higher priority (smaller number), eg +ln -s /usr/etc/X11/xim.d/scim-bridge /usr/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/ +export INPUT_METHOD="scim-bridge" or whatever script in /usr/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/ +https://github.com/ibus/ibus/issues Chinese: 0:注意：ibus 不支援 QT3 immodule, -若您使用 qt3-based 應用程式，請修改 /etc/X11/xim.d/ibus 設定 +若您使用 qt3-based 應用程式，請修改 /usr/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的連結 +啟動的script是/usr/etc/X11/xim.d/YOUR-LOCALE/40-ibus，這是一個到上層目錄ibus的連結 "40"這個數字使他的優先順序高於90-xcin及50-scim 如果您不喜歡這個順序，修改連結的名稱為(例如：80-ibus)，或參考2. @@ -57,16 +57,16 @@ 3.如果您想要自己選擇輸入法而非使用系統設定 (1)全系統設定： 編輯 /etc/sysconfig/language, 設定 INPUT_METHOD="ibus" 或其他你想用的輸入法， -請注意你的啟動程序必須位於 /etc/X11/xim.d/，並和您指定的名稱相同 +請注意你的啟動程序必須位於 /usr/etc/X11/xim.d/，並和您指定的名稱相同 (2)針對特定語言： 將您的啟動程序連結到你的語系中，並前置較高的優先順序(較小數字)，例如 -ln -s /etc/X11/xim.d/ibus /etc/X11/xim.d/zh_TW/20-ibus +ln -s /usr/etc/X11/xim.d/ibus /usr/etc/X11/xim.d/zh_TW/20-ibus (3)個人設定： 編輯 ~/.profile 加入 -export INPUT_METHOD="ibus" 或其他在 /etc/X11/xim.d/ 的啟動程序 +export INPUT_METHOD="ibus" 或其他在 /usr/etc/X11/xim.d/ 的啟動程序 或自行編寫啟動程序 ~/.xim，請參考 ~/.xim.template 5.臭蟲回報或建議請至 -http://code.google.com/p/ibus/ +https://github.com/ibus/ibus/issues ++++++ ibus-1.5.22.tar.gz -> ibus-1.5.23.tar.gz ++++++ ++++ 85087 lines of diff (skipped) ++++++ setup-switch-im.patch ++++++ --- /var/tmp/diff_new_pack.dyrw5F/_old 2020-10-07 14:16:24.441386479 +0200 +++ /var/tmp/diff_new_pack.dyrw5F/_new 2020-10-07 14:16:24.445386482 +0200 @@ -1,14 +1,14 @@ -diff -Nura ibus-1.5.8/setup/main.py ibus-1.5.8_new/setup/main.py ---- ibus-1.5.8/setup/main.py 2014-07-24 04:24:25.000000000 +0000 -+++ ibus-1.5.8_new/setup/main.py 2015-10-27 10:41:56.648379582 +0000 -@@ -361,11 +361,16 @@ +diff -Nur ibus-1.5.23/setup/main.py ibus-1.5.23-new/setup/main.py +--- ibus-1.5.23/setup/main.py 2020-09-29 18:58:24.000000000 +0800 ++++ ibus-1.5.23-new/setup/main.py 2020-09-30 13:44:05.023868829 +0800 +@@ -508,11 +508,16 @@ self.__engine_setup_exec_list[name] = os.spawnl(os.P_NOWAIT, *args) def __init_bus(self): + method_name="ibus" + filename=".i18n" + usr_home =os.path.expanduser('~') -+ ++ self.__bus = IBus.Bus() if self.__bus.is_connected(): return @@ -19,7 +19,7 @@ dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.QUESTION, buttons = Gtk.ButtonsType.YES_NO, text = message) -@@ -375,39 +380,12 @@ +@@ -522,39 +527,12 @@ if id != Gtk.ResponseType.YES: sys.exit(0) @@ -48,7 +48,7 @@ - self.__flush_gtk_events() - else: - # Translators: %d == 5 currently -- message = _("IBus daemon could not be started in %d seconds") +- message = _("IBus daemon could not be started in %d seconds.") - dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.INFO, - buttons = Gtk.ButtonsType.OK, - text = message % timeout)
