Accepting request 917124 from home:hillwood:branches:M17N

- Update version to 1.5.25
  * src/tests: Run gnome-session with no-overview mode 
  * client/gtk2: Implement ibus_im_context_set_surrounding_with_selection
  * src/ibuscomposetable: Do not include the same compose file 
  * src/ibusenginesimple: Multi_key to 0xB7
  * src/ibusenginesimple: Make Compose preedit less intrusive 
  * Change default Emoji shortcut key
  * setup: Enhance engine search function
  * client/gtk2/ibusimcontext: Enable sync process in GTK4
  * engine: Update simple.xml with xkeyboard-config 2.33
  * src/ibuscomposetable: Add support for the include directive (lf-)
  * src/ibuscomposetable: Fix a buffer overflow in compose handling (lf-)
  * client/x11: Add support for XFixes ClientDisconnectMode (Olivier Fourdan)
  * setup: Start ibus-daemon with the --daemonize option (Gunnar Hjalmarsson)
  * src: Fix a typo in ibusenginesimple.h (user202729)
  * Update translations

OBS-URL: https://build.opensuse.org/request/show/917124
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=255
This commit is contained in:
Hillwood Yang 2021-09-07 01:48:31 +00:00 committed by Git OBS Bridge
parent db0af2979a
commit 4a0baf5a1c
5 changed files with 31 additions and 12 deletions

View File

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

3
ibus-1.5.25.tar.gz Normal file
View File

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

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Sep 6 13:36:21 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>
- Update version to 1.5.25
* src/tests: Run gnome-session with no-overview mode
* client/gtk2: Implement ibus_im_context_set_surrounding_with_selection
* src/ibuscomposetable: Do not include the same compose file
* src/ibusenginesimple: Multi_key to 0xB7
* src/ibusenginesimple: Make Compose preedit less intrusive
* Change default Emoji shortcut key
* setup: Enhance engine search function
* client/gtk2/ibusimcontext: Enable sync process in GTK4
* engine: Update simple.xml with xkeyboard-config 2.33
* src/ibuscomposetable: Add support for the include directive (lf-)
* src/ibuscomposetable: Fix a buffer overflow in compose handling (lf-)
* client/x11: Add support for XFixes ClientDisconnectMode (Olivier Fourdan)
* setup: Start ibus-daemon with the --daemonize option (Gunnar Hjalmarsson)
* src: Fix a typo in ibusenginesimple.h (user202729)
* Update translations
-------------------------------------------------------------------
Tue Jul 20 06:28:57 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -25,7 +25,7 @@
%endif
Name: ibus
Version: 1.5.24
Version: 1.5.25
Release: 0
Summary: The "Intelligent Input Bus" input method
License: LGPL-2.1-or-later
@ -146,7 +146,7 @@ This package contains data of emoji dictionary for IBus and other applications
Summary: IBus input method support for gtk2 applications
Group: System/I18n/Chinese
Requires: %{name} = %{version}
Supplements: packageand(ibus:gtk2)
Supplements: (ibus and gtk2)
%{gtk2_immodule_requires}
%description gtk
@ -157,7 +157,7 @@ Summary: IBus input method support for gtk3 applications
Group: System/I18n/Chinese
BuildRequires: pkgconfig(gtk+-3.0)
Requires: %{name} = %{version}
Supplements: packageand(ibus:gtk3)
Supplements: (ibus and gtk3)
%{gtk3_immodule_requires}
%description gtk3
@ -203,7 +203,6 @@ cp -r %{SOURCE11} .
%endif
%build
autoreconf -fi
%configure --disable-static \
--enable-gtk3 \
--enable-vala \
@ -335,7 +334,7 @@ dconf update
# This file is not a config file. Users may not modify it.
%config %{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings
%config %{_sysconfdir}/dconf/profile/ibus
%{_sysconfdir}/xdg/autostart/ibus-autostart.desktop
%config %{_sysconfdir}/xdg/autostart/ibus-autostart.desktop
%{_mandir}/man1/ibus.1%{ext_man}
%{_mandir}/man1/ibus-daemon.1%{ext_man}
%{_mandir}/man1/ibus-setup.1%{ext_man}

View File

@ -1,6 +1,6 @@
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
diff -Nur ibus-1.5.25/setup/main.py ibus-1.5.25-new/setup/main.py
--- ibus-1.5.25/setup/main.py 2021-08-20 08:48:40.000000000 +0800
+++ ibus-1.5.25-new/setup/main.py 2021-09-06 20:54:06.205651597 +0800
@@ -508,11 +508,16 @@
self.__engine_setup_exec_list[name] = os.spawnl(os.P_NOWAIT, *args)
@ -29,7 +29,7 @@ diff -Nur ibus-1.5.23/setup/main.py ibus-1.5.23-new/setup/main.py
- GLib.timeout_add_seconds(timeout, lambda *args: main_loop.quit())
- self.__bus.connect("connected", lambda *args: main_loop.quit())
-
- os.spawnlp(os.P_NOWAIT, "ibus-daemon", "ibus-daemon", "--xim")
- os.spawnlp(os.P_NOWAIT, "ibus-daemon", "ibus-daemon", "--xim", "--daemonize")
-
- main_loop.run()
-