diff --git a/ibus-anthy-HEAD.patch b/ibus-anthy-HEAD.patch index e69de29..c8c77b8 100644 --- a/ibus-anthy-HEAD.patch +++ b/ibus-anthy-HEAD.patch @@ -0,0 +1,1367 @@ +From 7f3101f60abc0c615ec2dcf82729b554373cddcc Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Sat, 7 Jun 2025 15:33:17 +0900 +Subject: [PATCH] configure: Drop Python 2 support + +--- + configure.ac | 26 +++++++++----------------- + engine/Makefile.am | 8 ++------ + setup/Makefile.am | 8 ++------ + 3 files changed, 13 insertions(+), 29 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8bb6733..e4090c3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -117,12 +117,12 @@ AC_SUBST(ENV_IBUS_TEST) + dnl - define python version + AC_ARG_WITH(python, + AS_HELP_STRING([--with-python[=PATH]], +- [Select python2 or python3]), ++ [Select python3. python2 is no longer supported.]), + [PYTHON=$with_python], [] + ) + + dnl export $pyexecdir using existent $PYTHON +-AM_PATH_PYTHON([2.5]) ++AM_PATH_PYTHON([3.0]) + + dnl Decided to separate python3 directory from python2 directory here + dnl because engine/table.py includes unicode array so it's better to +@@ -142,15 +142,12 @@ dnl return gettext(a) + case "$PYTHON_VERSION" in + 3.*) + enable_python3=yes +- enable_python2=no + ;; + *) +- enable_python3=no +- enable_python2=yes ++ AC_MSG_ERROR([Not support PYTHON $PYTHON]) + ;; + esac + +-AM_CONDITIONAL([ENABLE_PYTHON2], [test x"$enable_python2" = x"yes"]) + AM_CONDITIONAL([ENABLE_PYTHON3], [test x"$enable_python3" = x"yes"]) + + dnl - check the supported ibus version +@@ -192,15 +189,14 @@ fi + AC_SUBST(ENV_IBUS_ENGINE) + + dnl - check pygtk2 +-AC_MSG_CHECKING([whether you enable pygtk2 anthy]) ++AC_MSG_NOTICE([pygtk2 does not work because python2 is no longer supported.]) + AC_ARG_ENABLE(pygtk2-anthy, + AS_HELP_STRING([--enable-pygtk2-anthy=no/yes], +- [Install pygtk2 anthy default=no]), +- [], +- enable_pygtk2_anthy=no) +-AC_MSG_RESULT($enable_pygtk2_anthy) ++ [pygtk2 is no longer supported.]), ++ enable_pygtk2=no, ++ enable_pygtk2=no) + +-if test x"$enable_pygtk2_anthy" = xyes; then ++if test x"$enable_pygtk2" = xyes; then + AM_CONDITIONAL(HAVE_PYGTK2_ANTHY, true) + + dnl - check swig +@@ -447,14 +443,10 @@ ibus-anthy.spec + data/Makefile + gir/Makefile + engine/Makefile +-engine/python2/Makefile +-engine/python2/anthy.inputMethod.xml.in +-engine/python2/default.inputMethod.xml.in + engine/python3/Makefile + engine/python3/anthy.inputMethod.xml.in + engine/python3/default.inputMethod.xml.in + setup/Makefile +-setup/python2/Makefile + setup/python3/Makefile + tests/Makefile + icons/Makefile +@@ -475,7 +467,7 @@ ANTHY_GOBJECT_GIRDIR $ANTHY_GOBJECT_GIRDIR + ANTHY_GOBJECT_TYPELIBSDIR $ANTHY_GOBJECT_TYPELIBSDIR + LT_VERSION_INFO $LT_VERSION_INFO + ENV_IBUS_ENGINE $ENV_IBUS_ENGINE +-HAVE_PYGTK2_ANTHY $enable_pygtk2_anthy ++HAVE_PYGTK2_ANTHY $enable_pygtk2 + python $PYTHON + Enable python2 $enable_python2 + Enable python3 $enable_python3 +diff --git a/engine/Makefile.am b/engine/Makefile.am +index 3c64425..991d7e3 100644 +--- a/engine/Makefile.am ++++ b/engine/Makefile.am +@@ -2,8 +2,8 @@ + # + # ibus-anthy - The Anthy engine for IBus + # +-# Copyright (c) 2014 Takao Fujiwara +-# Copyright (c) 2014 Red Hat, Inc. ++# Copyright (c) 2014-2025 Takao Fujiwara ++# Copyright (c) 2014-2025 Red Hat, Inc. + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -21,10 +21,6 @@ + + SUBDIRS = + +-if ENABLE_PYTHON2 +-SUBDIRS += python2 +-endif +- + if ENABLE_PYTHON3 + SUBDIRS += python3 + endif +diff --git a/setup/Makefile.am b/setup/Makefile.am +index 3c64425..991d7e3 100644 +--- a/setup/Makefile.am ++++ b/setup/Makefile.am +@@ -2,8 +2,8 @@ + # + # ibus-anthy - The Anthy engine for IBus + # +-# Copyright (c) 2014 Takao Fujiwara +-# Copyright (c) 2014 Red Hat, Inc. ++# Copyright (c) 2014-2025 Takao Fujiwara ++# Copyright (c) 2014-2025 Red Hat, Inc. + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -21,10 +21,6 @@ + + SUBDIRS = + +-if ENABLE_PYTHON2 +-SUBDIRS += python2 +-endif +- + if ENABLE_PYTHON3 + SUBDIRS += python3 + endif +-- +2.49.0 + +From 7dd0db48e69306d28cb033336e0e7429b2920fb1 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Sat, 7 Jun 2025 15:34:18 +0900 +Subject: [PATCH] engine: Enable compose error notification + +IBusEngimeSimple now can use focus-id feature to warn the messages +for GNOME and Wayland specific and the parent class needs to connect +the 'focus-in/out-id' signals instead overriding the class methods +to access ibus_engine_simple_focus_in_id(). + +Also define the name of GType of the Python classes. + +BUG=https://github.com/ibus/ibus/pull/2763 +--- + engine/python3/engine.py | 26 ++++++++++++++++---------- + engine/python3/factory.py | 3 ++- + 2 files changed, 18 insertions(+), 11 deletions(-) + +diff --git a/engine/python3/engine.py b/engine/python3/engine.py +index 0858614..5678d18 100644 +--- a/engine/python3/engine.py ++++ b/engine/python3/engine.py +@@ -4,7 +4,7 @@ + # ibus-anthy - The Anthy engine for IBus + # + # Copyright (c) 2007-2008 Peng Huang +-# Copyright (c) 2010-2024 Takao Fujiwara ++# Copyright (c) 2010-2025 Takao Fujiwara + # Copyright (c) 2007-2018 Red Hat, Inc. + # + # This program is free software; you can redistribute it and/or modify +@@ -116,6 +116,7 @@ for k, v in zip(['KEY_KP_Add', 'KEY_KP_Decimal', 'KEY_KP_Divide', 'KEY_KP_Enter' + KP_Table[getattr(IBus, k)] = getattr(IBus, v) + + class Engine(IBus.EngineSimple): ++ __gtype_name__ = 'IBusEngineAnthy' + __input_mode = None + __typing_mode = None + __segment_mode = None +@@ -129,12 +130,12 @@ class Engine(IBus.EngineSimple): + + def __init__(self, bus, object_path): + if hasattr(IBus.Engine.props, 'has_focus_id'): +- super(Engine, self).__init__(engine_name="anthy", ++ super(Engine, self).__init__(engine_name='anthy', + connection=bus.get_connection(), + object_path=object_path, + has_focus_id=True) + else: +- super(Engine, self).__init__(engine_name="anthy", ++ super(Engine, self).__init__(engine_name='anthy', + connection=bus.get_connection(), + object_path=object_path) + +@@ -186,6 +187,11 @@ class Engine(IBus.EngineSimple): + # loop infinitely if this class overrides it. + # self.process_key_event is not accessible too. + self.connect('process-key-event', self.__process_key_event) ++ self.connect('focus-in', self.__focus_in) ++ # flashing compose sequence in GNOME instead of system bell ++ self.connect('focus-in-id', self.__focus_in_id) ++ self.connect('focus-out', self.__focus_out) ++ self.connect('focus-out-id', self.__focus_out_id) + self.connect('destroy', self.__destroy) + self.connect('page-down', self.__page_down) + self.connect('page-up', self.__page_up) +@@ -1059,13 +1065,10 @@ class Engine(IBus.EngineSimple): + def __rgb(self, r, g, b): + return self.__argb(255, r, g, b) + +- def do_focus_in(self): +- self.do_focus_in_id(None, None) ++ def __focus_in(self, obj): ++ self.__focus_in_id(obj, None, None) + +- def do_focus_out(self): +- self.do_focus_out_id(None) +- +- def do_focus_in_id(self, object_path, client): ++ def __focus_in_id(self, obj, object_path, client): + self.register_properties(self.__prop_list) + self.__refresh_typing_mode_property() + mode = self.__prefs.get_value('common', 'behavior-on-focus-out') +@@ -1077,7 +1080,10 @@ class Engine(IBus.EngineSimple): + if size != self.__lookup_table.get_page_size(): + self.__lookup_table.set_page_size(size) + +- def do_focus_out_id(self, object_path): ++ def __focus_out(self, obj): ++ self.__focus_out_id(obj, None) ++ ++ def __focus_out_id(self, obj, object_path): + if self.__has_input_purpose: + self.__input_purpose = 0 + mode = self.__prefs.get_value('common', 'behavior-on-focus-out') +diff --git a/engine/python3/factory.py b/engine/python3/factory.py +index b7b1e89..ea1d364 100644 +--- a/engine/python3/factory.py ++++ b/engine/python3/factory.py +@@ -4,7 +4,7 @@ + # ibus-anthy - The Anthy engine for IBus + # + # Copyright (c) 2007-2008 Peng Huang +-# Copyright (c) 2010-2017 Takao Fujiwara ++# Copyright (c) 2010-2025 Takao Fujiwara + # Copyright (c) 2007-2017 Red Hat, Inc. + # + # This program is free software; you can redistribute it and/or modify +@@ -34,6 +34,7 @@ import engine + + + class EngineFactory(IBus.Factory): ++ __gtype_name__ = 'IBusFactoryAnthy' + FACTORY_PATH = '/com/redhat/IBus/engines/Anthy/Factory' + ENGINE_PATH = '/com/redhat/IBus/engines/Anthy/Engine' + NAME = 'Anthy' +-- +2.49.0 + +From 7e345f89b574b746fa9e33df3504831ff7553ec9 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Wed, 3 Sep 2025 13:38:15 +0900 +Subject: [PATCH] engine/engine: Use preedit semantic API + +ibus_attr_hint_new() API is provided and other ibus_attr_underline_new(), +ibus_attr_foreground_new() and ibus_attr_foreground_new() are deprecated +so that IBus panel or the Wayland panels decide the actual preedit colors +with the current desktop theme. + +BUG=https://github.com/ibus/ibus/pull/2790 +--- + engine/python3/engine.py | 52 ++++++++++++++++++++++++++++------------ + 1 file changed, 37 insertions(+), 15 deletions(-) + +diff --git a/engine/python3/engine.py b/engine/python3/engine.py +index 5678d18..a0bbc38 100644 +--- a/engine/python3/engine.py ++++ b/engine/python3/engine.py +@@ -152,6 +152,7 @@ class Engine(IBus.EngineSimple): + self.__prop_dict = {} + self.__input_purpose = 0 + self.__has_input_purpose = False ++ self.__has_preedit_format_hint = False + # OSK mode is designed for OSK on gnome-shell, which always shows + # IBus lookup window prior to the preedit and selecting a candidate + # causes the commmit instead of the selection. +@@ -169,6 +170,8 @@ class Engine(IBus.EngineSimple): + except ValueError as e: + printerr('Disable update_preedit_text_with_mode(): %s' % str(e)) + self.__has_update_preedit_text_with_mode = False ++ if hasattr(IBus, 'attr_hint_new'): ++ self.__has_preedit_format_hint = True + + # self.__lookup_table = ibus.LookupTable.new(page_size=9, + # cursor_pos=0, +@@ -1241,9 +1244,14 @@ class Engine(IBus.EngineSimple): + def __update_input_chars(self): + text, cursor = self.__get_preedit() + attrs = IBus.AttrList() +- attrs.append(IBus.attr_underline_new( +- IBus.AttrUnderline.SINGLE, 0, +- len(text))) ++ if self.__has_preedit_format_hint: ++ attrs.append(IBus.attr_hint_new( ++ IBus.AttrPreedit.WHOLE, 0, ++ len(text))) ++ else: ++ attrs.append(IBus.attr_underline_new( ++ IBus.AttrUnderline.SINGLE, 0, ++ len(text))) + + self.update_preedit(text, + attrs, cursor, not self.__preedit_ja_string.is_empty()) +@@ -1293,12 +1301,18 @@ class Engine(IBus.EngineSimple): + text = text.capitalize() + self.__convert_chars = text + attrs = IBus.AttrList() +- attrs.append(IBus.attr_underline_new( +- IBus.AttrUnderline.SINGLE, 0, len(text))) +- attrs.append(IBus.attr_background_new(self.__rgb(200, 200, 240), +- 0, len(text))) +- attrs.append(IBus.attr_foreground_new(self.__rgb(0, 0, 0), +- 0, len(text))) ++ if self.__has_preedit_format_hint: ++ attrs.append(IBus.attr_hint_new( ++ IBus.AttrPreedit.WHOLE, 0, len(text))) ++ attrs.append(IBus.attr_hint_new( ++ IBus.AttrPreedit.SELECTION, 0, len(text))) ++ else: ++ attrs.append(IBus.attr_underline_new( ++ IBus.AttrUnderline.SINGLE, 0, len(text))) ++ attrs.append(IBus.attr_background_new(self.__rgb(200, 200, 240), ++ 0, len(text))) ++ attrs.append(IBus.attr_foreground_new(self.__rgb(0, 0, 0), ++ 0, len(text))) + self.update_preedit(text, attrs, len(text), True) + + self.update_aux_string('', +@@ -1314,12 +1328,20 @@ class Engine(IBus.EngineSimple): + if i < self.__cursor_pos: + pos += len(text) + attrs = IBus.AttrList() +- attrs.append(IBus.attr_underline_new( +- IBus.AttrUnderline.SINGLE, 0, len(self.__convert_chars))) +- attrs.append(IBus.attr_background_new(self.__rgb(200, 200, 240), +- pos, pos + len(self.__segments[self.__cursor_pos][1]))) +- attrs.append(IBus.attr_foreground_new(self.__rgb(0, 0, 0), +- pos, pos + len(self.__segments[self.__cursor_pos][1]))) ++ if self.__has_preedit_format_hint: ++ attrs.append(IBus.attr_hint_new( ++ IBus.AttrPreedit.WHOLE, 0, len(self.__convert_chars))) ++ attrs.append(IBus.attr_hint_new( ++ IBus.AttrPreedit.SELECTION, ++ pos, ++ pos + len(self.__segments[self.__cursor_pos][1]))) ++ else: ++ attrs.append(IBus.attr_underline_new( ++ IBus.AttrUnderline.SINGLE, 0, len(self.__convert_chars))) ++ attrs.append(IBus.attr_background_new(self.__rgb(200, 200, 240), ++ pos, pos + len(self.__segments[self.__cursor_pos][1]))) ++ attrs.append(IBus.attr_foreground_new(self.__rgb(0, 0, 0), ++ pos, pos + len(self.__segments[self.__cursor_pos][1]))) + self.update_preedit(self.__convert_chars, attrs, pos, True) + aux_string = '( %d / %d )' % (self.__lookup_table.get_cursor_pos() + 1, self.__lookup_table.get_number_of_candidates()) + self.update_aux_string(aux_string, +-- +2.50.1 + +From 646ea5d63852477bd902a971952cac777019da09 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Tue, 16 Dec 2025 17:41:21 +0900 +Subject: [PATCH] engine: Fix double IBus.init() + +Calling IBus.init() twice causes a big memory leaks in OpenIndiana +2025.10 which uses IBus 1.5.29. +I have no idea to check the parent Python stack and use inspect module +to fix the double IBus.init(). +Also move ibus_check_version() from engin.py to main.py + +BUG=https://github.com/ibus/ibus-anthy/issues/44 +Fixes: https://github.com/ibus/ibus-anthy/commit/14b2759 +--- + engine/python2/engine.py | 12 ++---------- + engine/python2/main.py | 24 +++++++++++++++++++++++- + engine/python3/engine.py | 12 ++---------- + engine/python3/main.py | 24 +++++++++++++++++++++++- + 4 files changed, 50 insertions(+), 22 deletions(-) + +diff --git a/engine/python2/engine.py b/engine/python2/engine.py +index c7ccd3f..942dd33 100644 +--- a/engine/python2/engine.py ++++ b/engine/python2/engine.py +@@ -28,7 +28,7 @@ import signal + import sys + from gettext import dgettext + +-from main import get_userhome ++from main import get_userhome, ibus_check_version + + try: + from locale import getpreferredencoding +@@ -163,7 +163,7 @@ class Engine(IBus.EngineSimple): + self.__is_utf8 = False + self.__has_update_preedit_text_with_mode = True + try: +- self.__ibus_check_version('1.3') ++ ibus_check_version('1.3') + except ValueError as e: + printerr('Disable update_preedit_text_with_mode(): %s' % str(e)) + self.__has_update_preedit_text_with_mode = False +@@ -195,14 +195,6 @@ class Engine(IBus.EngineSimple): + self.__reset() + + +- def __ibus_check_version(self, v): +- major = IBus.MAJOR_VERSION +- minor = IBus.MINOR_VERSION +- micro = IBus.MICRO_VERSION +- if (major, minor, micro) < tuple(map(int, (v.split('.')))): +- raise ValueError('Required ibus %s but version of ibus is ' \ +- '%d.%d.%d' % (v, major, minor, micro)) +- + # http://en.sourceforge.jp/ticket/browse.php?group_id=14&tid=33075 + def __verify_anthy_journal_file(self): + journal = ANTHY_CONFIG_PATH + '/last-record2_default.utf8' +diff --git a/engine/python2/main.py b/engine/python2/main.py +index c1e6a2f..bae2058 100644 +--- a/engine/python2/main.py ++++ b/engine/python2/main.py +@@ -42,11 +42,33 @@ from gi.repository import IBus + + import _config as config + ++ ++def ibus_check_version(v): ++ major = IBus.MAJOR_VERSION ++ minor = IBus.MINOR_VERSION ++ micro = IBus.MICRO_VERSION ++ if (major, minor, micro) < tuple(map(int, (v.split('.')))): ++ raise ValueError('Required ibus %s but version of ibus is ' \ ++ '%d.%d.%d' % (v, major, minor, micro)) ++ ++ + # Need to call IBus.init() before IBus.EngineSimple() is loaded. + # factory -> engine -> IBus.EngineSimple +-IBus.init() ++try: ++ # IBus.init() has not been needed here since IBus 1.5.32 ++ ibus_check_version("1.5.32") ++except ValueError: ++ import inspect ++ parent_frame = inspect.currentframe().f_back ++ # Call IBus.init() again from "from main import get_userhome" in engin.py. ++ # The twice IBus.init() issue has been fixed since IBus 1.5.31 by ++ # https://github.com/ibus/ibus/commit/9f50b46 ++ if parent_frame == None: ++ IBus.init() ++ + import factory + ++ + class IMApp: + def __init__(self, exec_by_ibus): + command_line = config.LIBEXECDIR + '/ibus-engine-anthy --ibus' +diff --git a/engine/python3/engine.py b/engine/python3/engine.py +index a0bbc38..4781d42 100644 +--- a/engine/python3/engine.py ++++ b/engine/python3/engine.py +@@ -29,7 +29,7 @@ import signal + import sys + from gettext import dgettext + +-from main import get_userhome ++from main import get_userhome, ibus_check_version + + try: + from locale import getpreferredencoding +@@ -166,7 +166,7 @@ class Engine(IBus.EngineSimple): + self.__is_utf8 = False + self.__has_update_preedit_text_with_mode = True + try: +- self.__ibus_check_version('1.3') ++ ibus_check_version('1.3') + except ValueError as e: + printerr('Disable update_preedit_text_with_mode(): %s' % str(e)) + self.__has_update_preedit_text_with_mode = False +@@ -205,14 +205,6 @@ class Engine(IBus.EngineSimple): + self.__reset() + + +- def __ibus_check_version(self, v): +- major = IBus.MAJOR_VERSION +- minor = IBus.MINOR_VERSION +- micro = IBus.MICRO_VERSION +- if (major, minor, micro) < tuple(map(int, (v.split('.')))): +- raise ValueError('Required ibus %s but version of ibus is ' \ +- '%d.%d.%d' % (v, major, minor, micro)) +- + # http://en.sourceforge.jp/ticket/browse.php?group_id=14&tid=33075 + def __verify_anthy_journal_file(self): + journal = ANTHY_CONFIG_PATH + '/last-record2_default.utf8' +diff --git a/engine/python3/main.py b/engine/python3/main.py +index 05836a6..3ab99b2 100644 +--- a/engine/python3/main.py ++++ b/engine/python3/main.py +@@ -42,11 +42,33 @@ from gi.repository import IBus + + import _config as config + ++ ++def ibus_check_version(v): ++ major = IBus.MAJOR_VERSION ++ minor = IBus.MINOR_VERSION ++ micro = IBus.MICRO_VERSION ++ if (major, minor, micro) < tuple(map(int, (v.split('.')))): ++ raise ValueError('Required ibus %s but version of ibus is ' \ ++ '%d.%d.%d' % (v, major, minor, micro)) ++ ++ + # Need to call IBus.init() before IBus.EngineSimple() is loaded. + # factory -> engine -> IBus.EngineSimple +-IBus.init() ++try: ++ # IBus.init() has not been needed here since IBus 1.5.32 ++ ibus_check_version("1.5.32") ++except ValueError: ++ import inspect ++ parent_frame = inspect.currentframe().f_back ++ # Call IBus.init() again from "from main import get_userhome" in engin.py. ++ # The twice IBus.init() issue has been fixed since IBus 1.5.31 by ++ # https://github.com/ibus/ibus/commit/9f50b46 ++ if parent_frame == None: ++ IBus.init() ++ + import factory + ++ + class IMApp: + def __init__(self, exec_by_ibus): + command_line = config.LIBEXECDIR + '/ibus-engine-anthy --ibus' +-- +2.52.0 + +From 296cd6b8e4e79964b4956953707b315c3dc010da Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Mon, 12 Jan 2026 09:49:48 +0900 +Subject: [PATCH] data: Update era.t with 2026 + +Added era.py to update the Era automatically. +--- + data/Makefile.am | 33 +++- + data/era.py | 196 +++++++++++++++++++ + data/era.t | 5 +- + data/era.t.in | 491 +++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 716 insertions(+), 9 deletions(-) + create mode 100755 data/era.py + create mode 100644 data/era.t.in + +diff --git a/data/Makefile.am b/data/Makefile.am +index d76f17a..c13d273 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -2,7 +2,7 @@ + # + # ibus-anthy - The Anthy engine for IBus + # +-# Copyright (c) 2010-2021 Takao Fujiwara ++# Copyright (c) 2010-2026 Takao Fujiwara + # Copyright (c) 2010-2018 Red Hat, Inc. + # + # This program is free software; you can redistribute it and/or modify +@@ -19,6 +19,8 @@ + # with this program; if not, write to the Free Software Foundation, Inc., + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + ++noinst_DATA = era.stamp ++ + dicts_DATA = \ + emoji.t \ + era.t \ +@@ -43,6 +45,7 @@ CLEANFILES = \ + $(metainfo_DATA) \ + $(schemas_DATA) \ + emoji.t \ ++ era.stamp \ + $(NULL) + + $(metainfo_DATA): $(metainfo_in_files) Makefile +@@ -79,14 +82,26 @@ zipcode.t: $(ANTHY_ZIPCODE_FILE) + CLEANFILES += zipcode.t + endif + ++era.t: era.stamp ++ ++era.stamp: ++ if test -f $(srcdir)/era.t ; then \ ++ if ! $(srcdir)/era.py --check $(srcdir)/era.t ; then \ ++ rm $(srcdir)/era.t; \ ++ $(srcdir)/era.py $(srcdir)/era.t.in \ ++ --output $(builddir)/era.t; \ ++ echo "Generate era.t"; \ ++ fi; \ ++ fi; \ ++ touch era.stampT; \ ++ mv era.stampT era.stamp; ++ + check: +- S_YEAR=`date '+%Y'`; \ +- M_YEAR=`echo $$S_YEAR | sed 'y/0123456789/０１２３４５６７８９/'`; \ +- grep -q $$M_YEAR $(srcdir)/era.t; \ +- if test $$? -ne 0 ; then \ +- echo "This year $$M_YEAR is not included in era.y"; \ +- exit 1; \ +- fi; ++ if test -f $(srcdir)/era.t ; then \ ++ $(srcdir)/era.py --check $(srcdir)/era.t; \ ++ else \ ++ $(srcdir)/era.py --check $(builddir)/era.t; \ ++ fi + + install-data-hook: + if test -z "$(DESTDIR)"; then \ +@@ -106,6 +121,8 @@ EXTRA_DIST = \ + emoji-each.t \ + emoji-emoji.t \ + era.t \ ++ era.t.in \ ++ era.py \ + oldchar.t \ + symbol.t \ + zipcode-textdic.py \ +diff --git a/data/era.py b/data/era.py +new file mode 100755 +index 0000000..85eb55b +--- /dev/null ++++ b/data/era.py +@@ -0,0 +1,196 @@ ++#!/usr/bin/python3 ++# vim:set et sts=4 sw=4: ++# -*- coding: utf-8 -*- ++# ++# ibus-anthy - The Anthy engine for IBus ++# ++# Copyright (c) 2026 Takao Fujiwara ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License along ++# with this program; if not, write to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ ++from datetime import date ++from os import path ++import getopt ++import locale ++import re ++import sys ++ ++ ++_prgname = "" ++ ++class JapaneseEra(object): ++ VERSION = 1 ++ ERA_FIRST = 2019 ++ HIRAGANA_ERA = 'れいわ' ++ KANJI_ERA = '令和' ++ KANJI_ERA_PREV = '平成' ++ __S_YEAR = 0 ++ __M_YEAR = '' ++ __narrow_to_wide_map = None ++ _check = False ++ _output_file = None ++ _parse_file = None ++ _parse_contents = None ++ ++ def __init__(self): ++ if self._parse_file == None: ++ print("%s.parse_args() should be called before the instance " ++ "is generated." % str(self), file=sys.stderr) ++ sys.exit(1) ++ self.__narrow_to_wide_map = str.maketrans('0123456789', ++ '０１２３４５６７８９') ++ self.__S_YEAR = date.today().year ++ self.__M_YEAR = str(self.__S_YEAR).translate(self.__narrow_to_wide_map) ++ parse_file = open(self._parse_file) ++ self._parse_contents = parse_file.read() ++ parse_file.close() ++ ++ ++ ++ @classmethod ++ def parse_args(cls)->None: ++ ++ shortopt = 'cho:v' ++ longopt = ['check', 'help', 'output=', 'version'] ++ ++ try: ++ opts, args = getopt.gnu_getopt(sys.argv[1:], shortopt, longopt) ++ except getopt.GetoptError as err: ++ cls.print_help(sys.stderr, 1) ++ ++ for o, a in opts: ++ if o in ('-h', '--help'): ++ cls.print_help(sys.stdout) ++ elif o in ('-c', '--check'): ++ cls._check = True ++ elif o in ('-o', '--output'): ++ cls._output_file = a ++ elif o in ('-v', '--version'): ++ print("%s Version %d" % (_prgname, cls.VERSION)) ++ sys.exit(0) ++ else: ++ print('Unknown argument: %s' % o, file=sys.stderr) ++ cls.print_help(sys.stderr, 1) ++ ++ if len(args) == 0: ++ cls.print_help(sys.stderr, 1) ++ cls._parse_file = args[0] ++ ++ ++ @staticmethod ++ def print_help(out, v=0)->None: ++ print("%s [OPTIONS...] ERA_FILE" % _prgname, file=out) ++ print("This replaces @HIRAGANA_TO_LATEST_ERA@ with latest Japanese Era " ++ "in ERA_FILE", ++ file=out) ++ print('OPTIONS', file=out) ++ print('-c, --check Check if the latest Japanese Era in ERA_FILE.', ++ file=out) ++ print('-h, --help Show this message.', file=out) ++ print('-v, --version Show version.', file=out) ++ sys.exit(v) ++ ++ ++ def run(self)->None: ++ if self._check: ++ self.check() ++ else: ++ self.update_file_with_keywords() ++ ++ ++ def check(self)->None: ++ if self._parse_contents == None: ++ assert() ++ pat = r'{}.*'.format(self.__M_YEAR) ++ res = re.findall(pat, self._parse_contents, re.MULTILINE) ++ if res: ++ print(res) ++ else: ++ print("This year {0} is not included in {1}".format( ++ self.__M_YEAR, self._parse_file), file=sys.stderr) ++ sys.exit(1) ++ ++ def update_file_with_keywords(self)->None: ++ if self._parse_contents == None: ++ assert() ++ HIRAGANA_TO_LATEST_ERA = '' ++ YEAR_TO_LATEST_ERA = '' ++ s_n = 1 ++ s_y = self.ERA_FIRST ++ while(s_y <= self.__S_YEAR): ++ m_n = str(s_n).translate(self.__narrow_to_wide_map) ++ m_y = str(s_y).translate(self.__narrow_to_wide_map) ++ HIRAGANA_TO_LATEST_ERA = \ ++"""{0}{1}{2} #T35*500 {3}{4} ++{5}{6} #T35*500 {7} ++""".format(HIRAGANA_TO_LATEST_ERA, ++ self.HIRAGANA_ERA, m_n, ++ self.KANJI_ERA, s_n, ++ self.HIRAGANA_ERA, m_n, ++ s_y) ++ YEAR_TO_LATEST_ERA = \ ++"""{0}{1} #T35*500 {2}{3} ++""".format(YEAR_TO_LATEST_ERA, ++ m_y, ++ self.KANJI_ERA, s_n) ++ s_n = s_n + 1 ++ s_y = s_y + 1 ++ HIRAGANA_TO_LATEST_ERA = HIRAGANA_TO_LATEST_ERA.strip() ++ YEAR_TO_LATEST_ERA = YEAR_TO_LATEST_ERA.strip() ++ tmp = self._parse_contents.replace( ++ '@HIRAGANA_TO_REIWA@', ++ HIRAGANA_TO_LATEST_ERA).replace( ++ '@YEAR_TO_REIWA@', ++ YEAR_TO_LATEST_ERA) ++ s_y = self.ERA_FIRST ++ m_y = str(s_y).translate(self.__narrow_to_wide_map) ++ pat = r'({0} #T35\*500 {1}[0-9]+)\n({2} #T35\*500 {3}1)'.format( ++ m_y, self.KANJI_ERA_PREV, m_y, self.KANJI_ERA) ++ # The lest Era should be first. ++ res = re.sub(pat, r'\2\n\1', tmp) ++ if res: ++ if self._output_file: ++ f = open(self._output_file, mode='w') ++ f.write(res) ++ f.flush() ++ f.close() ++ else: ++ print(res) ++ else: ++ print('Failed to find %s in %s' % (pat, self._parse_file), ++ file=sys.stderr) ++ if self._output_file: ++ f = open(self._output_file, mode='w') ++ f.write(tmp) ++ f.flush() ++ f.close() ++ else: ++ print(tmp) ++ ++ ++def main()->None: ++ try: ++ locale.setlocale(locale.LC_ALL, '') ++ except: ++ pass ++ global _prgname ++ _prgname = path.basename(sys.argv[0]) ++ JapaneseEra.parse_args() ++ era = JapaneseEra() ++ era.run() ++ ++ ++if __name__ == '__main__': ++ main() +diff --git a/data/era.t b/data/era.t +index 76a374c..1c07e58 100644 +--- a/data/era.t ++++ b/data/era.t +@@ -2,7 +2,7 @@ + # + # ibus-anthy - The Anthy engine for IBus + # +-# Copyright (c) 2010-2025 Takao Fujiwara ++# Copyright (c) 2010-2026 Takao Fujiwara + # Copyright (c) 2010-2013 Red Hat, Inc. + # + # This program is free software; you can redistribute it and/or modify +@@ -346,6 +346,8 @@ + れいわ６ #T35*500 2024 + れいわ７ #T35*500 令和7 + れいわ７ #T35*500 2025 ++れいわ８ #T35*500 令和8 ++れいわ８ #T35*500 2026 + １８６８ #T35*500 明治1 + １８６９ #T35*500 明治2 + １８７０ #T35*500 明治3 +@@ -508,3 +510,4 @@ + ２０２３ #T35*500 令和5 + ２０２４ #T35*500 令和6 + ２０２５ #T35*500 令和7 ++２０２６ #T35*500 令和8 +diff --git a/data/era.t.in b/data/era.t.in +new file mode 100644 +index 0000000..4881ec2 +--- /dev/null ++++ b/data/era.t.in +@@ -0,0 +1,491 @@ ++# vim:set noet ts=4: ++# ++# ibus-anthy - The Anthy engine for IBus ++# ++# Copyright (c) 2010-2026 Takao Fujiwara ++# Copyright (c) 2010-2013 Red Hat, Inc. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License along ++# with this program; if not, write to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# This file was imported from im-dict-ja ++# im-dict-ja - Japanese word dictionary set for input method ++# http://github.com/fujiwarat/im-dict-ja ++しょうわ１ #T35*500 昭和1 ++しょうわ１ #T35*500 1926 ++しょうわ１０ #T35*500 昭和10 ++しょうわ１０ #T35*500 1935 ++しょうわ１１ #T35*500 昭和11 ++しょうわ１１ #T35*500 1936 ++しょうわ１２ #T35*500 昭和12 ++しょうわ１２ #T35*500 1937 ++しょうわ１３ #T35*500 昭和13 ++しょうわ１３ #T35*500 1938 ++しょうわ１４ #T35*500 昭和14 ++しょうわ１４ #T35*500 1939 ++しょうわ１５ #T35*500 昭和15 ++しょうわ１５ #T35*500 1940 ++しょうわ１６ #T35*500 昭和16 ++しょうわ１６ #T35*500 1941 ++しょうわ１７ #T35*500 昭和17 ++しょうわ１７ #T35*500 1942 ++しょうわ１８ #T35*500 昭和18 ++しょうわ１８ #T35*500 1943 ++しょうわ１９ #T35*500 昭和19 ++しょうわ１９ #T35*500 1944 ++しょうわ２ #T35*500 昭和2 ++しょうわ２ #T35*500 1927 ++しょうわ２０ #T35*500 昭和20 ++しょうわ２０ #T35*500 1945 ++しょうわ２１ #T35*500 昭和21 ++しょうわ２１ #T35*500 1946 ++しょうわ２２ #T35*500 昭和22 ++しょうわ２２ #T35*500 1947 ++しょうわ２３ #T35*500 昭和23 ++しょうわ２３ #T35*500 1948 ++しょうわ２４ #T35*500 昭和24 ++しょうわ２４ #T35*500 1949 ++しょうわ２５ #T35*500 昭和25 ++しょうわ２５ #T35*500 1950 ++しょうわ２６ #T35*500 昭和26 ++しょうわ２６ #T35*500 1951 ++しょうわ２７ #T35*500 昭和27 ++しょうわ２７ #T35*500 1952 ++しょうわ２８ #T35*500 昭和28 ++しょうわ２８ #T35*500 1953 ++しょうわ２９ #T35*500 昭和29 ++しょうわ２９ #T35*500 1954 ++しょうわ３ #T35*500 昭和3 ++しょうわ３ #T35*500 1928 ++しょうわ３０ #T35*500 昭和30 ++しょうわ３０ #T35*500 1955 ++しょうわ３１ #T35*500 昭和31 ++しょうわ３１ #T35*500 1956 ++しょうわ３２ #T35*500 昭和32 ++しょうわ３２ #T35*500 1957 ++しょうわ３３ #T35*500 昭和33 ++しょうわ３３ #T35*500 1958 ++しょうわ３４ #T35*500 昭和34 ++しょうわ３４ #T35*500 1959 ++しょうわ３５ #T35*500 昭和35 ++しょうわ３５ #T35*500 1960 ++しょうわ３６ #T35*500 昭和36 ++しょうわ３６ #T35*500 1961 ++しょうわ３７ #T35*500 昭和37 ++しょうわ３７ #T35*500 1962 ++しょうわ３８ #T35*500 昭和38 ++しょうわ３８ #T35*500 1963 ++しょうわ３９ #T35*500 昭和39 ++しょうわ３９ #T35*500 1964 ++しょうわ４ #T35*500 昭和4 ++しょうわ４ #T35*500 1929 ++しょうわ４０ #T35*500 昭和40 ++しょうわ４０ #T35*500 1965 ++しょうわ４１ #T35*500 昭和41 ++しょうわ４１ #T35*500 1966 ++しょうわ４２ #T35*500 昭和42 ++しょうわ４２ #T35*500 1967 ++しょうわ４３ #T35*500 昭和43 ++しょうわ４３ #T35*500 1968 ++しょうわ４４ #T35*500 昭和44 ++しょうわ４４ #T35*500 1969 ++しょうわ４５ #T35*500 昭和45 ++しょうわ４５ #T35*500 1970 ++しょうわ４６ #T35*500 昭和46 ++しょうわ４６ #T35*500 1971 ++しょうわ４７ #T35*500 昭和47 ++しょうわ４７ #T35*500 1972 ++しょうわ４８ #T35*500 昭和48 ++しょうわ４８ #T35*500 1973 ++しょうわ４９ #T35*500 昭和49 ++しょうわ４９ #T35*500 1974 ++しょうわ５ #T35*500 昭和5 ++しょうわ５ #T35*500 1930 ++しょうわ５０ #T35*500 昭和50 ++しょうわ５０ #T35*500 1975 ++しょうわ５１ #T35*500 昭和51 ++しょうわ５１ #T35*500 1976 ++しょうわ５２ #T35*500 昭和52 ++しょうわ５２ #T35*500 1977 ++しょうわ５３ #T35*500 昭和53 ++しょうわ５３ #T35*500 1978 ++しょうわ５４ #T35*500 昭和54 ++しょうわ５４ #T35*500 1979 ++しょうわ５５ #T35*500 昭和55 ++しょうわ５５ #T35*500 1980 ++しょうわ５６ #T35*500 昭和56 ++しょうわ５６ #T35*500 1981 ++しょうわ５７ #T35*500 昭和57 ++しょうわ５７ #T35*500 1982 ++しょうわ５８ #T35*500 昭和58 ++しょうわ５８ #T35*500 1983 ++しょうわ５９ #T35*500 昭和59 ++しょうわ５９ #T35*500 1984 ++しょうわ６ #T35*500 昭和6 ++しょうわ６ #T35*500 1931 ++しょうわ６０ #T35*500 昭和60 ++しょうわ６０ #T35*500 1985 ++しょうわ６１ #T35*500 昭和61 ++しょうわ６１ #T35*500 1986 ++しょうわ６２ #T35*500 昭和62 ++しょうわ６２ #T35*500 1987 ++しょうわ６３ #T35*500 昭和63 ++しょうわ６３ #T35*500 1988 ++しょうわ６４ #T35*500 昭和64 ++しょうわ６４ #T35*500 1989 ++しょうわ７ #T35*500 昭和7 ++しょうわ７ #T35*500 1932 ++しょうわ８ #T35*500 昭和8 ++しょうわ８ #T35*500 1933 ++しょうわ９ #T35*500 昭和9 ++しょうわ９ #T35*500 1934 ++たいしょう１ #T35*500 大正1 ++たいしょう１ #T35*500 1912 ++たいしょう１０ #T35*500 大正10 ++たいしょう１０ #T35*500 1921 ++たいしょう１１ #T35*500 大正11 ++たいしょう１１ #T35*500 1922 ++たいしょう１２ #T35*500 大正12 ++たいしょう１２ #T35*500 1923 ++たいしょう１３ #T35*500 大正13 ++たいしょう１３ #T35*500 1924 ++たいしょう１４ #T35*500 大正14 ++たいしょう１４ #T35*500 1925 ++たいしょう１５ #T35*500 大正15 ++たいしょう１５ #T35*500 1926 ++たいしょう２ #T35*500 大正2 ++たいしょう２ #T35*500 1913 ++たいしょう３ #T35*500 大正3 ++たいしょう３ #T35*500 1914 ++たいしょう４ #T35*500 大正4 ++たいしょう４ #T35*500 1915 ++たいしょう５ #T35*500 大正5 ++たいしょう５ #T35*500 1916 ++たいしょう６ #T35*500 大正6 ++たいしょう６ #T35*500 1917 ++たいしょう７ #T35*500 大正7 ++たいしょう７ #T35*500 1918 ++たいしょう８ #T35*500 大正8 ++たいしょう８ #T35*500 1919 ++たいしょう９ #T35*500 大正9 ++たいしょう９ #T35*500 1920 ++へいせい１ #T35*500 平成1 ++へいせい１ #T35*500 1989 ++へいせい１０ #T35*500 平成10 ++へいせい１０ #T35*500 1998 ++へいせい１１ #T35*500 平成11 ++へいせい１１ #T35*500 1999 ++へいせい１２ #T35*500 平成12 ++へいせい１２ #T35*500 2000 ++へいせい１３ #T35*500 平成13 ++へいせい１３ #T35*500 2001 ++へいせい１４ #T35*500 平成14 ++へいせい１４ #T35*500 2002 ++へいせい１５ #T35*500 平成15 ++へいせい１５ #T35*500 2003 ++へいせい１６ #T35*500 平成16 ++へいせい１６ #T35*500 2004 ++へいせい１７ #T35*500 平成17 ++へいせい１７ #T35*500 2005 ++へいせい１８ #T35*500 平成18 ++へいせい１８ #T35*500 2006 ++へいせい１９ #T35*500 平成19 ++へいせい１９ #T35*500 2007 ++へいせい２ #T35*500 平成2 ++へいせい２ #T35*500 1990 ++へいせい２０ #T35*500 平成20 ++へいせい２０ #T35*500 2008 ++へいせい２１ #T35*500 平成21 ++へいせい２１ #T35*500 2009 ++へいせい２２ #T35*500 平成22 ++へいせい２２ #T35*500 2010 ++へいせい２３ #T35*500 平成23 ++へいせい２３ #T35*500 2011 ++へいせい２４ #T35*500 平成24 ++へいせい２４ #T35*500 2012 ++へいせい２５ #T35*500 平成25 ++へいせい２５ #T35*500 2013 ++へいせい２６ #T35*500 平成26 ++へいせい２６ #T35*500 2014 ++へいせい２７ #T35*500 平成27 ++へいせい２７ #T35*500 2015 ++へいせい２８ #T35*500 平成28 ++へいせい２８ #T35*500 2016 ++へいせい２９ #T35*500 平成29 ++へいせい２９ #T35*500 2017 ++へいせい３ #T35*500 平成3 ++へいせい３ #T35*500 1991 ++へいせい３０ #T35*500 平成30 ++へいせい３０ #T35*500 2018 ++へいせい３１ #T35*500 平成31 ++へいせい３１ #T35*500 2019 ++へいせい４ #T35*500 平成4 ++へいせい４ #T35*500 1992 ++へいせい５ #T35*500 平成5 ++へいせい５ #T35*500 1993 ++へいせい６ #T35*500 平成6 ++へいせい６ #T35*500 1994 ++へいせい７ #T35*500 平成7 ++へいせい７ #T35*500 1995 ++へいせい８ #T35*500 平成8 ++へいせい８ #T35*500 1996 ++へいせい９ #T35*500 平成9 ++へいせい９ #T35*500 1997 ++めいじ１ #T35*500 明治1 ++めいじ１ #T35*500 1868 ++めいじ１０ #T35*500 明治10 ++めいじ１０ #T35*500 1877 ++めいじ１１ #T35*500 明治11 ++めいじ１１ #T35*500 1878 ++めいじ１２ #T35*500 明治12 ++めいじ１２ #T35*500 1879 ++めいじ１３ #T35*500 明治13 ++めいじ１３ #T35*500 1880 ++めいじ１４ #T35*500 明治14 ++めいじ１４ #T35*500 1881 ++めいじ１５ #T35*500 明治15 ++めいじ１５ #T35*500 1882 ++めいじ１６ #T35*500 明治16 ++めいじ１６ #T35*500 1883 ++めいじ１７ #T35*500 明治17 ++めいじ１７ #T35*500 1884 ++めいじ１８ #T35*500 明治18 ++めいじ１８ #T35*500 1885 ++めいじ１９ #T35*500 明治19 ++めいじ１９ #T35*500 1886 ++めいじ２ #T35*500 明治2 ++めいじ２ #T35*500 1869 ++めいじ２０ #T35*500 明治20 ++めいじ２０ #T35*500 1887 ++めいじ２１ #T35*500 明治21 ++めいじ２１ #T35*500 1888 ++めいじ２２ #T35*500 明治22 ++めいじ２２ #T35*500 1889 ++めいじ２３ #T35*500 明治23 ++めいじ２３ #T35*500 1890 ++めいじ２４ #T35*500 明治24 ++めいじ２４ #T35*500 1891 ++めいじ２５ #T35*500 明治25 ++めいじ２５ #T35*500 1892 ++めいじ２６ #T35*500 明治26 ++めいじ２６ #T35*500 1893 ++めいじ２７ #T35*500 明治27 ++めいじ２７ #T35*500 1894 ++めいじ２８ #T35*500 明治28 ++めいじ２８ #T35*500 1895 ++めいじ２９ #T35*500 明治29 ++めいじ２９ #T35*500 1896 ++めいじ３ #T35*500 明治3 ++めいじ３ #T35*500 1870 ++めいじ３０ #T35*500 明治30 ++めいじ３０ #T35*500 1897 ++めいじ３１ #T35*500 明治31 ++めいじ３１ #T35*500 1898 ++めいじ３２ #T35*500 明治32 ++めいじ３２ #T35*500 1899 ++めいじ３３ #T35*500 明治33 ++めいじ３３ #T35*500 1900 ++めいじ３４ #T35*500 明治34 ++めいじ３４ #T35*500 1901 ++めいじ３５ #T35*500 明治35 ++めいじ３５ #T35*500 1902 ++めいじ３６ #T35*500 明治36 ++めいじ３６ #T35*500 1903 ++めいじ３７ #T35*500 明治37 ++めいじ３７ #T35*500 1904 ++めいじ３８ #T35*500 明治38 ++めいじ３８ #T35*500 1905 ++めいじ３９ #T35*500 明治39 ++めいじ３９ #T35*500 1906 ++めいじ４ #T35*500 明治4 ++めいじ４ #T35*500 1871 ++めいじ４０ #T35*500 明治40 ++めいじ４０ #T35*500 1907 ++めいじ４１ #T35*500 明治41 ++めいじ４１ #T35*500 1908 ++めいじ４２ #T35*500 明治42 ++めいじ４２ #T35*500 1909 ++めいじ４３ #T35*500 明治43 ++めいじ４３ #T35*500 1910 ++めいじ４４ #T35*500 明治44 ++めいじ４４ #T35*500 1911 ++めいじ４５ #T35*500 明治45 ++めいじ４５ #T35*500 1912 ++めいじ５ #T35*500 明治5 ++めいじ５ #T35*500 1872 ++めいじ６ #T35*500 明治6 ++めいじ６ #T35*500 1873 ++めいじ７ #T35*500 明治7 ++めいじ７ #T35*500 1874 ++めいじ８ #T35*500 明治8 ++めいじ８ #T35*500 1875 ++めいじ９ #T35*500 明治9 ++めいじ９ #T35*500 1876 ++@HIRAGANA_TO_REIWA@ ++１８６８ #T35*500 明治1 ++１８６９ #T35*500 明治2 ++１８７０ #T35*500 明治3 ++１８７１ #T35*500 明治4 ++１８７２ #T35*500 明治5 ++１８７３ #T35*500 明治6 ++１８７４ #T35*500 明治7 ++１８７５ #T35*500 明治8 ++１８７６ #T35*500 明治9 ++１８７７ #T35*500 明治10 ++１８７８ #T35*500 明治11 ++１８７９ #T35*500 明治12 ++１８８０ #T35*500 明治13 ++１８８１ #T35*500 明治14 ++１８８２ #T35*500 明治15 ++１８８３ #T35*500 明治16 ++１８８４ #T35*500 明治17 ++１８８５ #T35*500 明治18 ++１８８６ #T35*500 明治19 ++１８８７ #T35*500 明治20 ++１８８８ #T35*500 明治21 ++１８８９ #T35*500 明治22 ++１８９０ #T35*500 明治23 ++１８９１ #T35*500 明治24 ++１８９２ #T35*500 明治25 ++１８９３ #T35*500 明治26 ++１８９４ #T35*500 明治27 ++１８９５ #T35*500 明治28 ++１８９６ #T35*500 明治29 ++１８９７ #T35*500 明治30 ++１８９８ #T35*500 明治31 ++１８９９ #T35*500 明治32 ++１９００ #T35*500 明治33 ++１９０１ #T35*500 明治34 ++１９０２ #T35*500 明治35 ++１９０３ #T35*500 明治36 ++１９０４ #T35*500 明治37 ++１９０５ #T35*500 明治38 ++１９０６ #T35*500 明治39 ++１９０７ #T35*500 明治40 ++１９０８ #T35*500 明治41 ++１９０９ #T35*500 明治42 ++１９１０ #T35*500 明治43 ++１９１１ #T35*500 明治44 ++１９１２ #T35*500 大正1 ++１９１２ #T35*500 明治45 ++１９１３ #T35*500 大正2 ++１９１４ #T35*500 大正3 ++１９１５ #T35*500 大正4 ++１９１６ #T35*500 大正5 ++１９１７ #T35*500 大正6 ++１９１８ #T35*500 大正7 ++１９１９ #T35*500 大正8 ++１９２０ #T35*500 大正9 ++１９２１ #T35*500 大正10 ++１９２２ #T35*500 大正11 ++１９２３ #T35*500 大正12 ++１９２４ #T35*500 大正13 ++１９２５ #T35*500 大正14 ++１９２６ #T35*500 昭和1 ++１９２６ #T35*500 大正15 ++１９２７ #T35*500 昭和2 ++１９２８ #T35*500 昭和3 ++１９２９ #T35*500 昭和4 ++１９３０ #T35*500 昭和5 ++１９３１ #T35*500 昭和6 ++１９３２ #T35*500 昭和7 ++１９３３ #T35*500 昭和8 ++１９３４ #T35*500 昭和9 ++１９３５ #T35*500 昭和10 ++１９３６ #T35*500 昭和11 ++１９３７ #T35*500 昭和12 ++１９３８ #T35*500 昭和13 ++１９３９ #T35*500 昭和14 ++１９４０ #T35*500 昭和15 ++１９４１ #T35*500 昭和16 ++１９４２ #T35*500 昭和17 ++１９４３ #T35*500 昭和18 ++１９４４ #T35*500 昭和19 ++１９４５ #T35*500 昭和20 ++１９４６ #T35*500 昭和21 ++１９４７ #T35*500 昭和22 ++１９４８ #T35*500 昭和23 ++１９４９ #T35*500 昭和24 ++１９５０ #T35*500 昭和25 ++１９５１ #T35*500 昭和26 ++１９５２ #T35*500 昭和27 ++１９５３ #T35*500 昭和28 ++１９５４ #T35*500 昭和29 ++１９５５ #T35*500 昭和30 ++１９５６ #T35*500 昭和31 ++１９５７ #T35*500 昭和32 ++１９５８ #T35*500 昭和33 ++１９５９ #T35*500 昭和34 ++１９６０ #T35*500 昭和35 ++１９６１ #T35*500 昭和36 ++１９６２ #T35*500 昭和37 ++１９６３ #T35*500 昭和38 ++１９６４ #T35*500 昭和39 ++１９６５ #T35*500 昭和40 ++１９６６ #T35*500 昭和41 ++１９６７ #T35*500 昭和42 ++１９６８ #T35*500 昭和43 ++１９６９ #T35*500 昭和44 ++１９７０ #T35*500 昭和45 ++１９７１ #T35*500 昭和46 ++１９７２ #T35*500 昭和47 ++１９７３ #T35*500 昭和48 ++１９７４ #T35*500 昭和49 ++１９７５ #T35*500 昭和50 ++１９７６ #T35*500 昭和51 ++１９７７ #T35*500 昭和52 ++１９７８ #T35*500 昭和53 ++１９７９ #T35*500 昭和54 ++１９８０ #T35*500 昭和55 ++１９８１ #T35*500 昭和56 ++１９８２ #T35*500 昭和57 ++１９８３ #T35*500 昭和58 ++１９８４ #T35*500 昭和59 ++１９８５ #T35*500 昭和60 ++１９８６ #T35*500 昭和61 ++１９８７ #T35*500 昭和62 ++１９８８ #T35*500 昭和63 ++１９８９ #T35*500 平成1 ++１９８９ #T35*500 昭和64 ++１９９０ #T35*500 平成2 ++１９９１ #T35*500 平成3 ++１９９２ #T35*500 平成4 ++１９９３ #T35*500 平成5 ++１９９４ #T35*500 平成6 ++１９９５ #T35*500 平成7 ++１９９６ #T35*500 平成8 ++１９９７ #T35*500 平成9 ++１９９８ #T35*500 平成10 ++１９９９ #T35*500 平成11 ++２０００ #T35*500 平成12 ++２００１ #T35*500 平成13 ++２００２ #T35*500 平成14 ++２００３ #T35*500 平成15 ++２００４ #T35*500 平成16 ++２００５ #T35*500 平成17 ++２００６ #T35*500 平成18 ++２００７ #T35*500 平成19 ++２００８ #T35*500 平成20 ++２００９ #T35*500 平成21 ++２０１０ #T35*500 平成22 ++２０１１ #T35*500 平成23 ++２０１２ #T35*500 平成24 ++２０１３ #T35*500 平成25 ++２０１４ #T35*500 平成26 ++２０１５ #T35*500 平成27 ++２０１６ #T35*500 平成28 ++２０１７ #T35*500 平成29 ++２０１８ #T35*500 平成30 ++２０１９ #T35*500 平成31 ++@YEAR_TO_REIWA@ +-- +2.52.0 + diff --git a/ibus-anthy.spec b/ibus-anthy.spec index f6ab10b..f9255d7 100644 --- a/ibus-anthy.spec +++ b/ibus-anthy.spec @@ -27,6 +27,7 @@ Source1: https://github.com/ibus/%{name}/releases/download/%{version}/%{n # Upstreamed patches. # Patch0: %%{name}-HEAD.patch +Patch0: %{name}-HEAD.patch Patch1: %{name}-1938129-default-hiragana.patch BuildRequires: anthy-unicode-devel @@ -97,6 +98,7 @@ fi %build #autoreconf -f -i -v +autoreconf -f -i -v %configure \ %if %have_default_layout --with-layout='default' \ @@ -108,7 +110,6 @@ fi --with-kasumi-exec=/usr/bin/kasumi-unicode \ %endif --with-on-off-keys="'Zenkaku_Hankaku', 'Ctrl+space', 'Ctrl+J'" \ - --with-python=python3 \ --enable-installed-tests \ --disable-static # make -C po update-gmo