From f51b4b127852ce2c6be6c90cddd82168eb0cc32a Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 30 Apr 2024 11:37:04 +0000 Subject: [PATCH] import CS ibus-anthy-1.5.13-4.el9_3 --- SOURCES/ibus-anthy-24804-super-key.patch | 42 ++++++++++++++++++++++++ SPECS/ibus-anthy.spec | 12 ++++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 SOURCES/ibus-anthy-24804-super-key.patch diff --git a/SOURCES/ibus-anthy-24804-super-key.patch b/SOURCES/ibus-anthy-24804-super-key.patch new file mode 100644 index 0000000..ee42a6d --- /dev/null +++ b/SOURCES/ibus-anthy-24804-super-key.patch @@ -0,0 +1,42 @@ +From c1ffc2bfcedab68ce79c2fa9a7f2bfe6cec17595 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Fri, 18 Aug 2023 18:52:58 +0900 +Subject: [PATCH] engine: Distinguish Super-space and space shortcut keys + +BUG=rhbz#2232532 +--- + engine/python2/engine.py | 3 ++- + engine/python3/engine.py | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/engine/python2/engine.py b/engine/python2/engine.py +index 4b3da97..80cfa86 100644 +--- a/engine/python2/engine.py ++++ b/engine/python2/engine.py +@@ -1940,7 +1940,8 @@ class Engine(IBus.EngineSimple): + + state = state & (IBus.ModifierType.SHIFT_MASK | + IBus.ModifierType.CONTROL_MASK | +- IBus.ModifierType.MOD1_MASK) ++ IBus.ModifierType.MOD1_MASK | ++ IBus.ModifierType.MOD4_MASK) + + # ignore key release events + if not is_press: +diff --git a/engine/python3/engine.py b/engine/python3/engine.py +index 20786f2..7c0d283 100644 +--- a/engine/python3/engine.py ++++ b/engine/python3/engine.py +@@ -1935,7 +1935,8 @@ class Engine(IBus.EngineSimple): + + state = state & (IBus.ModifierType.SHIFT_MASK | + IBus.ModifierType.CONTROL_MASK | +- IBus.ModifierType.MOD1_MASK) ++ IBus.ModifierType.MOD1_MASK | ++ IBus.ModifierType.MOD4_MASK) + + # ignore key release events + if not is_press: +-- +2.43.0 + diff --git a/SPECS/ibus-anthy.spec b/SPECS/ibus-anthy.spec index c49eea1..d98e913 100644 --- a/SPECS/ibus-anthy.spec +++ b/SPECS/ibus-anthy.spec @@ -18,7 +18,7 @@ Name: ibus-anthy Version: 1.5.13 -Release: 1%{?dist} +Release: 4%{?dist} Summary: The Anthy engine for IBus input platform License: GPLv2+ URL: https://github.com/ibus/ibus/wiki @@ -27,6 +27,7 @@ Source0: https://github.com/ibus/ibus-anthy/releases/download/%{version}/ # Upstreamed patches. # Patch0: %%{name}-HEAD.patch Patch1: %{name}-1938129-default-hiragana.patch +Patch2: %{name}-24804-super-key.patch BuildRequires: anthy-unicode-devel BuildRequires: desktop-file-utils @@ -152,6 +153,15 @@ desktop-file-validate \ %{_datadir}/installed-tests/%{name} %changelog +* Mon Mar 11 2024 Takao Fujiwara - 1.5.13-4 +- Fix CI. Related: RHEL-24804 + +* Mon Mar 11 2024 Takao Fujiwara - 1.5.13-3 +- Bump for el9_4. Related: RHEL-24804 + +* Thu Mar 07 2024 Takao Fujiwara - 1.5.13-2 +- Distinguish Super-space and space shortcut keys. Related: RHEL-24804 + * Fri Aug 20 2021 Takao Fujiwara - 1.5.13-1 - Remove Ctrl+period in circle_kana_mode. Related: rhbz#1993079