From 8b5be26fa8438b515232e3c006b7c94bf93d5626 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Fri, 17 Feb 2023 19:30:03 +0900 Subject: [PATCH] Fix to load EN compose table --- ibus-anthy-HEAD.patch | 57 +++++++++++++++++++++++++++++++++++++++++++ ibus-anthy.spec | 5 +++- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/ibus-anthy-HEAD.patch b/ibus-anthy-HEAD.patch index f512662..d701cd7 100644 --- a/ibus-anthy-HEAD.patch +++ b/ibus-anthy-HEAD.patch @@ -478,3 +478,60 @@ index 686271f..7f7bd1b 100644 -- 2.38.1 +From 56629c6f9d5e289fdd16388965516fe5ebf5c8dc Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Fri, 17 Feb 2023 15:52:58 +0900 +Subject: [PATCH 8/8] engine: Fix to find compose resource in IBus core + +IBus.init() has been required since 1.5.28 after the EN compose +table was moved to GResource. +--- + engine/python2/main.py | 3 ++- + engine/python3/main.py | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/engine/python2/main.py b/engine/python2/main.py +index 096cd41..c366293 100644 +--- a/engine/python2/main.py ++++ b/engine/python2/main.py +@@ -4,7 +4,7 @@ + # ibus-anthy - The Anthy engine for IBus + # + # Copyright (c) 2007-2008 Peng Huang +-# Copyright (c) 2010-2016 Takao Fujiwara ++# Copyright (c) 2010-2023 Takao Fujiwara + # Copyright (c) 2007-2016 Red Hat, Inc. + # + # This program is free software; you can redistribute it and/or modify +@@ -179,6 +179,7 @@ def main(): + print >> sys.stderr, 'Unknown argument: %s' % o + print_help(sys.stderr, 1) + ++ IBus.init() + if daemonize: + if os.fork(): + sys.exit() +diff --git a/engine/python3/main.py b/engine/python3/main.py +index 1a2e6fd..8665ae0 100644 +--- a/engine/python3/main.py ++++ b/engine/python3/main.py +@@ -4,7 +4,7 @@ + # ibus-anthy - The Anthy engine for IBus + # + # Copyright (c) 2007-2008 Peng Huang +-# Copyright (c) 2010-2016 Takao Fujiwara ++# Copyright (c) 2010-2023 Takao Fujiwara + # Copyright (c) 2007-2016 Red Hat, Inc. + # + # This program is free software; you can redistribute it and/or modify +@@ -177,6 +177,7 @@ def main(): + print('Unknown argument: %s' % o, file=sys.stderr) + print_help(sys.stderr, 1) + ++ IBus.init() + if daemonize: + if os.fork(): + sys.exit() +-- +2.38.1 + diff --git a/ibus-anthy.spec b/ibus-anthy.spec index ce335e5..e6fb533 100644 --- a/ibus-anthy.spec +++ b/ibus-anthy.spec @@ -18,7 +18,7 @@ Name: ibus-anthy Version: 1.5.14 -Release: 10%{?dist} +Release: 11%{?dist} Summary: The Anthy engine for IBus input platform License: GPL-2.0-or-later URL: https://github.com/ibus/ibus/wiki @@ -156,6 +156,9 @@ make -C data check %{_datadir}/installed-tests/%{name} %changelog +* Fri Feb 17 2023 Takao Fujiwara - 1.5.14-11 +- Fix to load EN compose table + * Thu Jan 26 2023 Takao Fujiwara - 1.5.14-10 - Add 2023 Era - Fix PageDown/PageUp