Accepting request 1118230 from home:mike-fabian

Update to 2.24.3

OBS-URL: https://build.opensuse.org/request/show/1118230
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus-typing-booster?expand=0&rev=249
This commit is contained in:
Mike FABIAN 2023-10-17 08:47:56 +00:00 committed by Git OBS Bridge
parent 93d89879de
commit 78e864a42a
5 changed files with 13 additions and 151 deletions

View File

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

View File

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

View File

@ -1,145 +0,0 @@
Index: ibus-typing-booster-2.24.2/tests/test_itb.py
===================================================================
--- ibus-typing-booster-2.24.2.orig/tests/test_itb.py
+++ ibus-typing-booster-2.24.2/tests/test_itb.py
@@ -2367,89 +2367,73 @@ class ItbTestCase(unittest.TestCase):
['en_US'], update_gsettings=False)
self.engine.do_process_key_event(IBus.KEY_dead_macron, 0, 0)
self.assertEqual(self.engine.mock_preedit_text, '¯')
- self.engine.do_process_key_event(0x010001EB, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭ')
- self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭ·')
- self.engine.do_process_key_event(IBus.KEY_macron, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭ¯')
- self.engine.do_process_key_event(0x010001EB, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ')
- self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ·')
- self.engine.do_process_key_event(IBus.KEY_underscore, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ_')
- self.engine.do_process_key_event(0x010001EB, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ')
- self.engine.do_process_key_event(IBus.KEY_dead_macron, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ¯')
self.engine.do_process_key_event(IBus.KEY_dead_ogonek, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ¯˛')
+ self.assertEqual(self.engine.mock_preedit_text, '¯˛')
self.engine.do_process_key_event(IBus.KEY_o, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭ')
self.engine.do_process_key_event(IBus.KEY_dead_macron, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ¯')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭ¯')
self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ¯·')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭ¯·')
self.engine.do_process_key_event(IBus.KEY_semicolon, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ¯·;')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭ¯·;')
self.engine.do_process_key_event(IBus.KEY_o, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ')
self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ·')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ·')
self.engine.do_process_key_event(IBus.KEY_macron, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ¯')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ¯')
self.engine.do_process_key_event(IBus.KEY_dead_ogonek, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ¯˛')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ¯˛')
self.engine.do_process_key_event(IBus.KEY_o, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭ')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ')
self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭ·')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ·')
self.engine.do_process_key_event(IBus.KEY_macron, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭ¯')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ¯')
self.engine.do_process_key_event(IBus.KEY_semicolon, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭ¯;')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ¯;')
self.engine.do_process_key_event(IBus.KEY_o, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭ')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ')
self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭ·')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ·')
self.engine.do_process_key_event(IBus.KEY_underscore, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭ_')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ_')
self.engine.do_process_key_event(IBus.KEY_dead_ogonek, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭ_˛')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ_˛')
self.engine.do_process_key_event(IBus.KEY_o, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭ')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ')
self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭ·')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ·')
self.engine.do_process_key_event(IBus.KEY_underscore, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭ_')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ_')
self.engine.do_process_key_event(IBus.KEY_semicolon, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭ_;')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ_;')
self.engine.do_process_key_event(IBus.KEY_o, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭ')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭ')
self.engine.do_process_key_event(IBus.KEY_dead_caron, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭˇ')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭˇ')
self.engine.do_process_key_event(IBus.KEY_EZH, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮ')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮ')
self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮ·')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮ·')
self.engine.do_process_key_event(IBus.KEY_c, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮc')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮc')
self.engine.do_process_key_event(IBus.KEY_EZH, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮǮ')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮǮ')
self.engine.do_process_key_event(IBus.KEY_dead_caron, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮǮˇ')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮǮˇ')
self.engine.do_process_key_event(IBus.KEY_ezh, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮǮǯ')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮǮǯ')
self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮǮǯ·')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮǮǯ·')
self.engine.do_process_key_event(IBus.KEY_c, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮǮǯc')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮǮǯc')
self.engine.do_process_key_event(IBus.KEY_ezh, 0, 0)
- self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮǮǯǯ')
+ self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮǮǯǯ')
self.engine.do_process_key_event(IBus.KEY_space, 0, 0)
self.assertEqual(self.engine.mock_preedit_text, '')
- self.assertEqual(self.engine.mock_committed_text, 'ǭǭǭǭǭǭǭǭǭǮǮǯǯ ')
+ self.assertEqual(self.engine.mock_committed_text, 'ǭǭǭǭǭǭǮǮǯǯ ')
if self._compose_sequences.compose([IBus.KEY_Multi_key, 0x01002276, IBus.KEY_slash]) != '≸':
self.skipTest(
'Compose file too old, older than '
@@ -2462,7 +2446,7 @@ class ItbTestCase(unittest.TestCase):
self.assertEqual(self.engine.mock_preedit_text, '≸')
self.engine.do_process_key_event(IBus.KEY_space, 0, 0)
self.assertEqual(self.engine.mock_preedit_text, '')
- self.assertEqual(self.engine.mock_committed_text, 'ǭǭǭǭǭǭǭǭǭǮǮǯǯ ≸ ')
+ self.assertEqual(self.engine.mock_committed_text, 'ǭǭǭǭǭǭǮǮǯǯ ≸ ')
self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
self.assertEqual(self.engine.mock_preedit_text, '·')
self.engine.do_process_key_event(0x0100093C, 0, 0)
@@ -2473,7 +2457,7 @@ class ItbTestCase(unittest.TestCase):
self.engine.do_process_key_event(IBus.KEY_space, 0, 0)
self.assertEqual(self.engine.mock_preedit_text, '')
self.assertEqual(self.engine.mock_committed_text,
- 'ǭǭǭǭǭǭǭǭǭǮǮǯǯ ≸ \u0915\u093C ')
+ 'ǭǭǭǭǭǭǮǮǯǯ ≸ \u0915\u093C ')
def test_compose_combining_chars_in_preedit_representation(self) -> None:
self.engine.set_current_imes(

View File

@ -1,3 +1,12 @@
Mon Oct 16 21:40:08 UTC 2023 - maiku.fabian@gmail.com
- Update to 2.24.3
- Adapt compose test cases to newest compose table
- Parse compose sequence “<Multi_key> <slash> <slash> : "\\" backslash # REVERSE SOLIDUS”
correctly (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/467)
- Avoid really *all* use of self.foreward_key_event() if the option self._avoid_forward_key_event is True
- Avoid verbatim bidi formatting characters in the source code
-------------------------------------------------------------------
Sun Oct 8 16:26:56 UTC 2023 - Marguerite Su <i@marguerite.su>

View File

@ -17,7 +17,7 @@
Name: ibus-typing-booster
Version: 2.24.2
Version: 2.24.3
Release: 0
Summary: An input completion utility
License: GPL-3.0-or-later
@ -25,7 +25,6 @@ Group: System/X11/Utilities
URL: https://mike-fabian.github.io/ibus-typing-booster/
Source0: https://github.com/mike-fabian/ibus-typing-booster/releases/download/%{version}/%{name}-%{version}.tar.gz
Source1: https://releases.pagure.org/inscript2/inscript2-20210820.tar.gz
Patch0: %{name}-libX11-1.8.7.patch
BuildRequires: AppStream
BuildRequires: appstream-glib
BuildRequires: dbus-1-x11
@ -99,7 +98,6 @@ input method to speedup typing.
##extract inscript2 maps
tar xzf %{SOURCE1}
%endif
%patch0 -p1
%build
export PYTHON=%{_bindir}/python3