diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 68fd01d..ea06539 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,3 @@ -tests/artifacts -ibus-anthy-1.2.1.tar.gz -ibus-anthy.png -/ibus-anthy-1.2.2.20101015.tar.gz -/ibus-anthy-1.2.3.tar.gz -/ibus-anthy-1.2.4.tar.gz -/ibus-anthy-1.2.5.tar.gz -/ibus-anthy-1.2.6.tar.gz -/ibus-anthy-1.2.7.tar.gz -/ibus-anthy-1.3.99.20120304.tar.gz -/ibus-anthy-1.4.99.20120327.tar.gz -/ibus-anthy-1.4.99.20121006.tar.gz -/ibus-anthy-1.5.0.tar.gz -/ibus-anthy-1.5.1.tar.gz -/ibus-anthy-1.5.2.tar.gz -/ibus-anthy-1.5.3.tar.gz -/ibus-anthy-1.5.4.tar.gz -/ibus-anthy-1.5.5.tar.gz -/ibus-anthy-1.5.6.tar.gz -/ibus-anthy-1.5.7.tar.gz -/ibus-anthy-1.5.8.tar.gz -/ibus-anthy-1.5.9.tar.gz -/ibus-anthy-1.5.10.tar.gz -/ibus-anthy-1.5.11.tar.gz -/ibus-anthy-1.5.12.tar.gz /ibus-anthy-1.5.13.tar.gz -/ibus-anthy-1.5.14.tar.gz -/ibus-anthy-1.5.15.tar.gz -/ibus-anthy-1.5.16.tar.gz -/ibus-anthy-1.5.17.tar.gz +/kasumi-2.5.tar.gz +/pycotap-1.1.0.tar.gz diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ea4fe05 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: ibus-anthy +# $Id$ +NAME := ibus-anthy +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/changelog b/changelog deleted file mode 100644 index 2999d16..0000000 --- a/changelog +++ /dev/null @@ -1,462 +0,0 @@ -* Tue Mar 12 2024 Takao Fujiwara - 1.5.16-2 -- Disable Super-l in Hiragana mode - -* Wed Feb 28 2024 Takao Fujiwara - 1.5.16-1 -- Bump to 1.5.16 - -* Wed Jan 31 2024 Takao Fujiwara - 1.5.15-6 -- Fix make check with GitHub action - -* Tue Jan 30 2024 Takao Fujiwara - 1.5.15-5 -- Resolves #2261242 Update era.t with 2024 -- Add appstream-util validattion - -* Wed Jan 24 2024 Fedora Release Engineering - 1.5.15-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 1.5.15-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Sep 07 2023 Takao Fujiwara - 1.5.15-2 -- Resolves #2237374 Fix to commit selected candidate with OSK - -* Tue Aug 22 2023 Takao Fujiwara - 1.5.15-1 -- Bump to 1.5.15 - -* Fri Aug 18 2023 Takao Fujiwara - 1.5.14-15 -- Resolves #2232532 converting Super+Space to wide space character - -* Thu Jul 20 2023 Fedora Release Engineering - 1.5.14-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jul 13 2023 Takao Fujiwara - 1.5.14-13 -- Resolves #2015149 Commit candidate text with clicking on candidate list in OSK - -* 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 - -* Thu Jan 19 2023 Fedora Release Engineering - 1.5.14-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Nov 16 2022 Takao Fujiwara - 1.5.14-8 -- Migrate license tag to SPDX - -* Wed Aug 03 2022 Takao Fujiwara - 1.5.14-7 -- Change metainfo icon from SVG to PNG file - -* Wed Aug 03 2022 Takao Fujiwara - 1.5.14-6 -- Add icon tag in ibus-anthy.appdata.xml.in -- Enable IBus.Engine::has-focus-id property -- Add the escape_to_latin command as a vi-cooperative cancel - -* Thu Jul 21 2022 Fedora Release Engineering - 1.5.14-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Apr 14 2022 Takao Fujiwara - 1.5.14-4 -- Resolves #2064261 assertion error with page size 0 - -* Thu Jan 27 2022 Takao Fujiwara - 1.5.14-3 -- Add 2022 Era - -* Thu Jan 20 2022 Fedora Release Engineering - 1.5.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Dec 24 2021 Takao Fujiwara - 1.5.14-1 -- Bump to 1.5.14 - -* Fri Oct 22 2021 Takao Fujiwara - 1.5.13-3 -- export C.UTF-8 for make check - -* Fri Oct 22 2021 Takao Fujiwara - 1.5.13-2 -- Update era.t with 2021 -- Check python3-pycotap.rpm in Fedora instead of pip - -* Fri Aug 20 2021 Takao Fujiwara - 1.5.13-1 -- Bump to 1.5.13 - -* Thu Aug 12 2021 Takao Fujiwara - 1.5.12-10 -- Remove Ctrl+period in circle_kana_mode - -* Thu Jul 22 2021 Fedora Release Engineering - 1.5.12-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jun 17 2021 Takao Fujiwara - 1.5.12-8 -- Delete postscript for ibus write-cache - -* Tue Apr 27 2021 Takao Fujiwara - 1.5.12-7 -- Move .desktop file from ibus-anthy-python to ibus-anthy -- Fix covscan - -* Wed Apr 21 2021 Takao Fujiwara - 1.5.12-6 -- Resolves: #1948197 Move post to posttrans - -* Tue Apr 20 2021 Takao Fujiwara - 1.5.12-5 -- Delete postscripts - -* Sun Mar 21 2021 Takao Fujiwara - 1.5.12-4 -- Output info to stderr instead of StringIO - -* Tue Mar 16 2021 Takao Fujiwara - 1.5.12-2 -- Change default input mode to Hiragana - -* Mon Feb 22 2021 Takao Fujiwara - 1.5.12-1 -- Bump to 1.5.12 - -* Wed Feb 10 2021 Takao Fujiwara - 1.5.11-10 -- Replace kasumi with kausmi-unicode -- Delete to require intltool -- Delete to call gettext.bind_textdomain_codeset() - -* Tue Jan 26 2021 Fedora Release Engineering - 1.5.11-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1.5.11-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jul 09 2020 Takao Fujiwara - 1.5.11-7 -- Use pycotap instead of tappy in CI -- Revise CI from ibus-typing-booster -- Delete _python_bytecompile_extra - -* Wed Jan 29 2020 Fedora Release Engineering - 1.5.11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Dec 04 2019 Takao Fujiwara - 1.5.11-5 -- Bug 1779129- Fix to install zipcode dict with anthy-unicode - -* Thu Oct 17 2019 Takao Fujiwara - 1.5.11-4 -- Add CI - -* Wed Oct 16 2019 Takao Fujiwara - 1.5.11-3 -- Replace anthy with anthy-unicode -- Install ibus-anthy-tests sub package - -* Thu Jul 25 2019 Fedora Release Engineering - 1.5.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue May 14 2019 Takao Fujiwara - 1.5.11-1 -- Bump to 1.5.11 - -* Fri Feb 01 2019 Fedora Release Engineering - 1.5.10-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.5.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 1.5.10-4 -- Rebuilt for Python 3.7 - -* Mon Mar 19 2018 Takao Fujiwara - 1.5.10-3 -- Reverted scriptlets for f27 - -* Mon Mar 19 2018 Takao Fujiwara - 1.5.10-2 -- Reverted ldconfig for f27 - -* Mon Mar 19 2018 Takao Fujiwara - 1.5.10-1 -- Bumped to 1.5.10 - -* Tue Feb 20 2018 Iryna Shcherbina - 1.5.9-7 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Wed Feb 07 2018 Fedora Release Engineering - 1.5.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 1.5.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.5.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.5.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 1.5.9-2 -- Rebuild for Python 3.6 - -* Thu Oct 20 2016 Takao Fujiwara - 1.5.9-1 -- Bumped to 1.5.9 - -* Thu Feb 04 2016 Fedora Release Engineering - 1.5.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jan 20 2016 Takao Fujiwara - 1.5.8-1 -- Bumped to 1.5.8 - -* Tue Nov 10 2015 Fedora Release Engineering - 1.5.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Thu Sep 03 2015 Takao Fujiwara - 1.5.7-2 -- Fix URL in anthy.appdata.xml - -* Thu Jul 16 2015 Takao Fujiwara - 1.5.7-1 -- Bumped to 1.5.7 - -* Wed Jun 17 2015 Fedora Release Engineering - 1.5.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Apr 22 2015 Takao Fujiwara - 1.5.6-6 -- Resolved #1214092 Updated ibus-anthy-HEAD.patch -- Added with_appdata macro and removed with_python_pkg macro - -* Wed Mar 25 2015 Richard Hughes - 1.5.6-5 -- Add the AppData file to the right built RPM, in this case we have to install - ibus-anthy-python rather than the main package in gnome-software. -- It turns out adding the AppData file to spec files is a great way to fix these - kinds of bugs. :) - -* Wed Mar 25 2015 Richard Hughes - 1.5.6-4 -- Use an AppStream file compatible with F22 also. - -* Wed Mar 25 2015 Richard Hughes - 1.5.6-3 -- Register as an AppStream component. - -* Thu Nov 13 2014 Takao Fujiwara - 1.5.6-2 -- Updated ibus-anthy-HEAD.patch to fix Enter key on setup dialog. -- Use python2 for epel7. - -* Tue Sep 16 2014 Takao Fujiwara - 1.5.6-1 -- Bumped to 1.5.6 -- Added ibus-anthy-xx-input-mode.patch from ibus-anthy-HEAD.patch. - -* Sat Aug 16 2014 Fedora Release Engineering - 1.5.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Jul 22 2014 Kalev Lember - 1.5.5-8 -- Rebuilt for gobject-introspection 1.41.4 - -* Mon Jul 14 2014 Takao Fujiwara - 1.5.5-7 -- Updated ibus-anthy-HEAD.patch - Fixed deprecated warnings with python3-gobject 3.13.3. - -* Mon Jul 14 2014 Takao Fujiwara - 1.5.5-6 -- Updated ibus-anthy-HEAD.patch - Fixed deprecated warnings with python3-gobject 3.13.3. - Set max-width-chars in ibus-anthy-setup wrapped GtkLabel. - Set 'IBUS_SETUP_XID' environment variable in setup. - -* Sat Jun 07 2014 Fedora Release Engineering - 1.5.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 19 2014 Takao Fujiwara - 1.5.5-4 -- Updated ibus-anthy-HEAD.patch to fix clear() in input mode. - -* Mon Apr 21 2014 Takao Fujiwara - 1.5.5-3 -- Updated ibus-anthy-HEAD.patch to unref pixbuf on destroy. - -* Thu Feb 27 2014 Takao Fujiwara - 1.5.5-2 -- Updated ibus-anthy-HEAD.patch to enable property icon. - -* Wed Feb 05 2014 Takao Fujiwara - 1.5.5-1 -- Bumped to 1.5.5 -- Enabled python3. - -* Tue Dec 24 2013 Takao Fujiwara - 1.5.4-2 -- Required ibus-anthy by ibus-anthy-python - -* Mon Sep 09 2013 Takao Fujiwara - 1.5.4-1 -- Bumped to 1.5.4 -- Added ibus-anthy-python subpackage for noarch. -- Deleted ibus-anthy-xx-disable-prop-symbol.patch - -* Sat Aug 03 2013 Fedora Release Engineering - 1.5.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon May 13 2013 Takao Fujiwara - 1.5.3-1 -- Bumped to 1.5.3 - -* Mon May 13 2013 Takao Fujiwara - 1.5.2-1 -- Bumped to 1.5.2 - -* Sat May 11 2013 Takao Fujiwara - 1.5.1-1 -- Bumped to 1.5.1 - -* Thu Feb 14 2013 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jan 16 2013 Takao Fujiwara - 1.5.0-1 -- Bumped to 1.5.0 - -* Wed Dec 12 2012 Takao Fujiwara - 1.4.99.20121006-3 -- Resolved #884031. Deleted arch depended files. - -* Thu Nov 22 2012 Takao Fujiwara - 1.4.99.20121006-2 -- Updated to save the spec update. - -* Sat Oct 06 2012 Takao Fujiwara - 1.4.99.20121006-1 -- Bumped to 1.4.99.20121006 -- Added ibus-anthy-xx-disable-prop-symbol.patch for Fedora 17 - -* Thu Jul 19 2012 Fedora Release Engineering - 1.4.99.20120327-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Mar 27 2012 Takao Fujiwara - 1.4.99.20120327-1 -- Bumped to 1.4.99.20120327 - -* Sun Mar 04 2012 Takao Fujiwara - 1.3.99.20120304-1 -- Bumped to 1.3.99.20120304 - -* Mon Feb 06 2012 Takao Fujiwara - 1.2.6-5 -- Added ibus-anthy-xx-layout.patch to set 'default' layout in f17. - -* Fri Jan 13 2012 Fedora Release Engineering - 1.2.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Jul 29 2011 Takao Fujiwara - 1.2.6-3 -- Added ibus-anthy-xx-icon-symbol.patch to enable the engine symbol & hotkeys. - -* Mon May 16 2011 Takao Fujiwara - 1.2.6-1 -- Bumped to 1.2.6 - Fixed Bug 661943 - the latest page_size for ibus.LookupTable. - -* Wed Feb 09 2011 Fedora Release Engineering - 1.2.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Dec 01 2010 Takao Fujiwara - 1.2.5-1 -- Updated to 1.2.5 - Fixed Bug 652881 - SEGV when key tables are customized in new gconf. - Fixed Bug 654322 - new custom keys are not loaded. - -* Tue Oct 26 2010 Takao Fujiwara - 1.2.4-1 -- Updated to 1.2.4 -- Resolves #644771 ibus-anthy [F7] key cannot work with SEGV - -* Sat Oct 16 2010 Takao Fujiwara - 1.2.3-1 -- Updated to 1.2.3 -- Updated translations. - -* Fri Oct 15 2010 Takao Fujiwara - 1.2.2.20101015-1 -- Updated to 1.2.2.20101015 -- Fixed Bug 643291 - ibus-anthy commit_first_segment - -* Wed Jul 21 2010 David Malcolm - 1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Fri Apr 23 2010 Takao Fujiwara - 1.2.1-1 -- Update to 1.2.1 - -* Mon Apr 05 2010 Takao Fujiwara - 1.2.0.20100313-3 -- Update icon - -* Fri Mar 12 2010 Takao Fujiwara - 1.2.0.20100313-1 -- Update to 1.2.0.20100313 -- Update fr.po - -* Fri Mar 12 2010 Takao Fujiwara - 1.2.0.20100312.1-1 -- Update to 1.2.0.20100312.1 -- Minor fix for a translation - -* Fri Mar 12 2010 Takao Fujiwara - 1.2.0.20100312-1 -- Update to 1.2.0.20100312 -- Fix bug 571728 - ibus-anthy support to switch dicts -- Fix bug 572412 - ibus-anthy: Segment convertion mode - -* Fri Mar 05 2010 Takao Fujiwara - 1.2.0.20100115-2 -- Fix bug 564268 - Crash with enabled global input method -- Fix bug 570680 - Support NICOLA-F and NICOLA-A -- Fix romaji_typing_rule. #777 -- Fix Shift + char with CapsLock ON in romaji mode. -- Fix chattering bug. - -* Fri Jan 15 2010 Takao Fujiwara - 1.2.0.20100115-1 -- Update to 1.2.0.20100115 -- Fix bug 550001 - kasumi should be accessible from ibus-anthy - -* Fri Nov 27 2009 Takao Fujiwara - 1.2.0.20091127-1 -- Update to 1.2.0.20091127 -- Fix bug 520989 - ibus-anthy icon enhancement -- Fix bug 531696 - ibus-anthy KeyError is still reported by abrt -- Fix bug 536716 - ibus-anthy: Symbol type change support in ibus-anthy - -* Fri Oct 23 2009 Takao Fujiwara - 1.2.0.20090917-2 -- Fix bug 526881 - ibus-anthy backtrace is reported by the latest abrt - -* Thu Sep 17 2009 Takao Fujiwara - 1.2.0.20090917-1 -- Update to 1.2.0.20090917 -- Fix bug 523642 - ibus-anthy convert_to_char_type_{for,back}ward() - -* Mon Sep 07 2009 Takao Fujiwara - 1.2.0.20090907-2 -- Fix a build issue - -* Mon Sep 07 2009 Takao Fujiwara - 1.2.0.20090907-1 -- Update to 1.2.0.20090907 -- Fix bug 510978 - "Typing Method" configuration doesn't work -- Fix bug 518373 - ibus setup tools need to set gettext textdomain dir. - -* Thu Aug 13 2009 Takao Fujiwara - 1.2.0.20090813-1 -- Update to 1.2.0.20090813 -- Fix bug 509483 - reconversion feature doesn't work -- Fix bug 509485 - commit_first_segment feature doesn't work - -* Tue Aug 04 2009 Peng Huang - 1.2.0.20090804-1 -- Update to 1.2.0.20090804 -- Fix bug 508358 - ANTHY_HISTORY_FILE record only a single word - -* Fri Jul 24 2009 Fedora Release Engineering - 1.2.0.20090617-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Jun 22 2009 Peng Huang - 1.2.0.20090617-1 -- Update to 1.2.0.20090617 - -* Wed Jun 17 2009 Jens Petersen - 1.1.0.20090603-2 -- require kasumi to pull in dictionary tool - -* Wed Jun 03 2009 Peng Huang - 1.1.0.20090603-1 -- Update to 1.1.0.20090603 -- Implement setup ui. - -* Thu Apr 30 2009 Peng Huang - 1.1.0.20090402-2 -- Update to upstream HEAD version -- Fix bug 498250 - Cannot type zenkaku-space - -* Thu Apr 02 2009 Peng Huang - 1.1.0.20090402-1 -- Update to 1.1.0.20090402. -- Fix bug 490747 - Muhenkan (no-conversion) key does not undo conversion -- Fix bug 490750 - Henkan key for candidate conversion doesn't do anything -- Fix bug 490748 - Kana key doesn't do anything - -* Tue Feb 24 2009 Fedora Release Engineering - 1.1.0.20090211-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 11 2009 Peng Huang - 1.1.0.20090211-1 -- Update to 1.1.0.20090211. - -* Thu Feb 05 2009 Peng Huang - 1.1.0.20090205-1 -- Update to 1.1.0.20090205. - -* Tue Feb 03 2009 Peng Huang - 0.1.1.20090203-1 -- Update to 0.1.1.20090203. - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.1.1.20080912-2 -- Rebuild for Python 2.6 - -* Fri Sep 12 2008 Peng Huang - 0.1.1.20080912-1 -- Update to 0.1.1.20080912. - -* Mon Sep 01 2008 Peng Huang - 0.1.1.20080901-1 -- Update to 0.1.1.20080901. - -* Thu Aug 28 2008 Peng Huang - 0.1.1.20080828-1 -- Update to 0.1.1.20080828. - -* Wed Aug 27 2008 Peng Huang - 0.1.1.20080827-1 -- Update to 0.1.1.20080827. - -* Tue Aug 26 2008 Peng Huang - 0.1.1.20080826-1 -- Update to 0.1.1.20080826. - -* Sat Aug 23 2008 Peng Huang - 0.1.1.20080823-1 -- Update to 0.1.1.20080823. - -* Fri Aug 15 2008 Peng Huang - 0.1.1.20080815-1 -- Update to 0.1.1.20080815. - -* Tue Aug 12 2008 Peng Huang - 0.1.1.20080812-1 -- Update to 0.1.1.20080812. - -* Fri Aug 08 2008 Peng Huang - 0.1.0.20080810-1 -- The first version. diff --git a/ibus-anthy-HEAD.patch b/ibus-anthy-HEAD.patch index c8c77b8..0f8ab60 100644 --- a/ibus-anthy-HEAD.patch +++ b/ibus-anthy-HEAD.patch @@ -1,1367 +1,151 @@ -From 7f3101f60abc0c615ec2dcf82729b554373cddcc Mon Sep 17 00:00:00 2001 +From 50706f8e5fcf88f1a607ea1f977c4a8f2ebbf623 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 +Date: Fri, 22 Oct 2021 00:22:09 +0900 +Subject: [PATCH] data: Update era.t with 2021 --- - 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 + data/Makefile.am | 9 +++++++++ + data/era.t | 15 ++++++++++++++- + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/data/Makefile.am b/data/Makefile.am -index d76f17a..c13d273 100644 +index 5e45c39..d76f17a 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) +@@ -79,6 +79,15 @@ zipcode.t: $(ANTHY_ZIPCODE_FILE) CLEANFILES += zipcode.t endif -+era.t: 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; + -+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() + glib-compile-schemas $(schemasdir); \ diff --git a/data/era.t b/data/era.t -index 76a374c..1c07e58 100644 +index 8d8cd32..a6d297e 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 Takao Fujiwara ++# Copyright (c) 2010-2021 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 +@@ -226,6 +226,10 @@ + へいせい２９ #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@ + へいせい４ #T35*500 平成4 + へいせい４ #T35*500 1992 + へいせい５ #T35*500 平成5 +@@ -328,6 +332,12 @@ + めいじ８ #T35*500 1875 + めいじ９ #T35*500 明治9 + めいじ９ #T35*500 1876 ++れいわ１ #T35*500 令和1 ++れいわ１ #T35*500 2019 ++れいわ２ #T35*500 令和2 ++れいわ２ #T35*500 2020 ++れいわ３ #T35*500 令和3 ++れいわ３ #T35*500 2021 + １８６８ #T35*500 明治1 + １８６９ #T35*500 明治2 + １８７０ #T35*500 明治3 +@@ -482,4 +492,7 @@ + ２０１６ #T35*500 平成28 + ２０１７ #T35*500 平成29 + ２０１８ #T35*500 平成30 ++２０１９ #T35*500 令和1 + ２０１９ #T35*500 平成31 ++２０２０ #T35*500 令和2 ++２０２１ #T35*500 令和3 -- -2.52.0 +2.28.0 + +From 28aa550f728b3848b06a67579aca5f563e64d447 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Fri, 22 Oct 2021 00:22:41 +0900 +Subject: [PATCH] tests: Check python3-pycotap.rpm in Fedora instead of pip + +--- + tests/Makefile.am | 7 +------ + tests/test-build.sh | 17 ++++++++++++++++- + 2 files changed, 17 insertions(+), 7 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index d891ff2..a7a7108 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -2,7 +2,7 @@ + # + # ibus-anthy - The Anthy engine for IBus + # +-# Copyright (c) 2017-2019 Takao Fujiwara ++# Copyright (c) 2017-2021 Takao Fujiwara + # Copyright (c) 2017-2019 Red Hat, Inc. + # + # This program is free software; you can redistribute it and/or modify +@@ -23,11 +23,6 @@ + CLEANFILES = + + check: +- @TAP_DIR=`python -m site --user-site`/tap; \ +- if test x"$$TAP_DIR" != x -a ! -d "$$TAP_DIR" ; then \ +- echo "pip install tap.py --user"; \ +- pip install tap.py --user; \ +- fi; \ + bash -x $(srcdir)/test-build.sh --builddir=$(builddir) --srcdir=$(srcdir) + + if ENABLE_INSTALLED_TESTS +diff --git a/tests/test-build.sh b/tests/test-build.sh +index 4c85af7..e83b78f 100755 +--- a/tests/test-build.sh ++++ b/tests/test-build.sh +@@ -3,7 +3,7 @@ + # + # ibus-anthy - The Anthy engine for IBus + # +-# Copyright (c) 2018 Takao Fujiwara ++# Copyright (c) 2018-2021 Takao Fujiwara + # Copyright (c) 2018 Red Hat, Inc. + # + # This program is free software; you can redistribute it and/or modify +@@ -68,6 +68,21 @@ init_environment() + if test x$FORCE_TEST != x ; then + RUN_ARGS="$RUN_ARGS --force"; + fi; ++ HAS_TAP=0; ++ if test -f /etc/redhat-release ; then ++ rpm -q --quiet python3-pycotap ++ if test $? -ne 0 ; then ++ echo "Not found python3-pycotap"; ++ exit -1; ++ fi; ++ HAS_TAP=1; ++ fi; ++ TAP_DIR=`python -m site --user-site`/pycotap; ++ if test $HAS_TAP -ne 1 && \ ++ test x"$TAP_DIR" != x && test ! -d "$TAP_DIR" ; then ++ echo "pip install pycotap --user"; ++ pip install pycotap --user; ++ fi; + if test ! -f $BUILDDIR/../data/$ANTHY_SCHEMA_FILE ; then + echo "Not found $BUILDDIR/../data/$ANTHY_SCHEMA_FILE"; + exit -1; +-- +2.28.0 diff --git a/ibus-anthy-xx-revert-ctrl-period.patch b/ibus-anthy-xx-revert-ctrl-period.patch new file mode 100644 index 0000000..d3fe03a --- /dev/null +++ b/ibus-anthy-xx-revert-ctrl-period.patch @@ -0,0 +1,32 @@ +From 39773ff8c30b4793a841c44b02ff92b52d2bdaeb Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Thu, 12 Aug 2021 18:44:51 +0900 +Subject: [PATCH] data/gschema: Revert Ctrl+period in circle_kana_mode + +Ctrl-period key is not available in RHEL8 IBus core yet. +--- + data/org.freedesktop.ibus.engine.anthy.gschema.xml.in | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/data/org.freedesktop.ibus.engine.anthy.gschema.xml.in b/data/org.freedesktop.ibus.engine.anthy.gschema.xml.in +index 773be09..75e42b3 100644 +--- a/data/org.freedesktop.ibus.engine.anthy.gschema.xml.in ++++ b/data/org.freedesktop.ibus.engine.anthy.gschema.xml.in +@@ -908,13 +908,8 @@ + 'circle_input_mode': <['Ctrl+comma', 'Ctrl+less']>, + +- 'circle_kana_mode': <['Ctrl+greater']>, ++ 'circle_kana_mode': <['Ctrl+period', 'Ctrl+greater']>, + + 'circle_typing_method': <['Alt+Romaji', 'Ctrl+slash']>, + 'circle_dict_method': <['Alt+Henkan']>, +-- +2.28.0 + diff --git a/ibus-anthy.png b/ibus-anthy.png new file mode 100644 index 0000000..de1c85f Binary files /dev/null and b/ibus-anthy.png differ diff --git a/ibus-anthy.spec b/ibus-anthy.spec index f9255d7..9489464 100644 --- a/ibus-anthy.spec +++ b/ibus-anthy.spec @@ -5,30 +5,46 @@ %global have_bridge_hotkey 1 %global with_python3 1 -%if (0%{?fedora} > 33 || 0%{?rhel} > 8) +%if (0%{?fedora} > 33 || 0%{?rhel} >= 8) %bcond_without kasumi_unicode %else %bcond_with kasumi_unicode %endif +%global pypi_name pycotap +%if (0%{?fedora} > 33 || 0%{?rhel} >= 8) +%bcond_without pycotap +%else +%bcond_with pycotap +%endif + %if %with_python3 # for bytecompile in %%{_datadir}/ibus-anthy %global __python %{__python3} %endif Name: ibus-anthy -Version: 1.5.17 -Release: %autorelease +Version: 1.5.13 +Release: 3%{?dist} Summary: The Anthy engine for IBus input platform -License: GPL-2.0-or-later +License: GPLv2+ URL: https://github.com/ibus/ibus/wiki -Source0: https://github.com/ibus/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz -Source1: https://github.com/ibus/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz.sum#/%{name}.tar.gz.sum +Source0: https://github.com/ibus/ibus-anthy/releases/download/%{version}/%{name}-%{version}.tar.gz +%if %{with kasumi_unicode} +Source1: http://jaist.dl.sourceforge.jp/kasumi/41436/kasumi-2.5.tar.gz +Source2: kasumi-853099-manpage.patch +Source3: kasumi-1928410-gtk3.patch +Source4: kasumi-check-anthy-pkg.patch +%endif +%if %{with pycotap} +Source5: pycotap-1.1.0.tar.gz +%endif # Upstreamed patches. # Patch0: %%{name}-HEAD.patch Patch0: %{name}-HEAD.patch Patch1: %{name}-1938129-default-hiragana.patch +Patch2: %{name}-xx-revert-ctrl-period.patch BuildRequires: anthy-unicode-devel BuildRequires: desktop-file-utils @@ -41,11 +57,13 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-gobject -BuildRequires: /usr/bin/appstream-util +# for kasumi +BuildRequires: gcc-c++ +BuildRequires: gtk3-devel Requires: ibus >= %{require_ibus_version} %if %{with kasumi_unicode} -Requires: kasumi-unicode +Requires: ibus-anthy-kasumi-unicode = %{version}-%{release} %else Requires: kasumi %endif @@ -79,24 +97,95 @@ for developers. %package tests Summary: Tests for the %{name} package +%if %{without pycotap} BuildRequires: python3-pycotap +%endif Requires: %{name}%{?_isa} = %{version}-%{release} +%if %{with pycotap} +Requires: ibus-anthy-python3-pycotap = %{version}-%{release} +%else Requires: python3-pycotap +%endif + %description tests The %{name}-tests package contains tests that can be used to verify the functionality of the installed %{name} package. +%if %{with kasumi_unicode} +%package kasumi-unicode +Summary: An anthy-unicode dictionary management tool + +%description kasumi-unicode +Kasumi-unicode is a dictionary management tool for Anthy-unicode. +%endif + +%if %{with pycotap} +%package python3-%{pypi_name} +Summary: A tiny test runner that outputs TAP results to standard output +%{?python_provide:%python_provide python3-%{pypi_name}} +License: MIT +BuildArch: noarch +BuildRequires: python3-devel +BuildRequires: python3dist(setuptools) + +%description python3-%{pypi_name} +pycotap is a simple Python test runner for unit tests that outputs Test Anything +Protocol results directly to standard output.Contrary to other TAP runners +for Python, pycotap prints TAP (and *only* TAP) to standard output +instead of to a separate file, allowing you to pipe it directly to TAP pretty +printers and processors. +%endif + %prep -SAVED_SUM=$(grep sha512sum %SOURCE1 | awk '{print $2}') -MY_SUM=$(sha512sum %SOURCE0 | awk '{print $1}') -if test x"$SAVED_SUM" != x"$MY_SUM" ; then - abort -fi %autosetup -S git +%if %{with kasumi_unicode} +zcat %SOURCE1 | tar xfv - +cd kasumi-2.5 +patch -p1 -b -z .man < %SOURCE2 +patch -p1 -b -z .gtk3 < %SOURCE3 +patch -p1 -b -z .anthy < %SOURCE4 +sed -i -e '/AM_PATH_GTK_2_0(/i\ +PKG_CHECK_MODULES([GTK], [gtk+-3.0])\ +CFLAGS="$CFLAGS $GTK_CFLAGS"\ +CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"\ +LIBS="$LIBS $GTK_LIBS"' \ + -e '/AM_PATH_GTK_2_0(/d' \ + configure.in +sed -e 's/AC_CHECK_LIB(anthydic,/AC_CHECK_LIB(anthydic-unicode,/' \ + -e 's/AC_CHECK_LIB(anthy,/AC_CHECK_LIB(anthy-unicode,/' \ + -e 's/PKG_CHECK_MODULES(ANTHY, anthy/PKG_CHECK_MODULES(ANTHY, anthy-unicode/' \ + -i.orig configure.in +cd .. +%endif + +%if %{with pycotap} +zcat %SOURCE5 | tar xfv - +cd pycotap-1.1.0 +rm -rf %{pypi_name}.egg-info +cd .. +%endif %build +%if %{with kasumi_unicode} +echo "# Building kasumi-unicode" +cd kasumi-2.5 +autoreconf -f -i -v +export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" +%configure +make %{?_smp_mflags} +cd .. +%endif + +%if %{with pycotap} +echo "# Building python-pycotap" +cd pycotap-1.1.0 +%py3_build +cd .. +%endif + +echo "# Building ibus-anthy" #autoreconf -f -i -v autoreconf -f -i -v %configure \ @@ -110,22 +199,39 @@ autoreconf -f -i -v --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 make %{?_smp_mflags} %install +%if %{with kasumi_unicode} +cd kasumi-2.5 +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +mv $RPM_BUILD_ROOT%{_bindir}/kasumi $RPM_BUILD_ROOT%{_bindir}/kasumi-unicode +# remove .desktop file so that kasumi is accessible from scim panel/ibus panel and it's not necessary for other users. +rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop +cd .. +%endif +%if %{with pycotap} +cd pycotap-1.1.0 +%py3_install +find %{buildroot}/%{python3_sitelib} -name '*.py' | xargs sed -i '/^#!/d' +cd .. +%endif make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' rm -f $RPM_BUILD_ROOT%{_libdir}/libanthygobject-%{sub_version}.la %find_lang %{name} +%if %{with kasumi_unicode} +%find_lang kasumi +%endif %check desktop-file-validate \ $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-anthy.desktop -appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.xml export LANG=C.UTF-8 locale make -C data check @@ -146,10 +252,10 @@ make -C data check %files python %{_libexecdir}/ibus-*-anthy +%{_datadir}/metainfo/*.metainfo.xml %{_datadir}/ibus-anthy/engine %{_datadir}/ibus-anthy/setup %{_datadir}/ibus/component/* -%{_metainfodir}/*.xml %files devel %{_datadir}/gir-1.0/Anthy*.gir @@ -162,6 +268,413 @@ make -C data check %dir %{_datadir}/installed-tests %{_datadir}/installed-tests/%{name} -%changelog -%autochangelog +%if %{with kasumi_unicode} +%files kasumi-unicode -f kasumi.lang +%{_bindir}/kasumi-unicode +%{_mandir}/man1/kasumi.1* +%{_datadir}/pixmaps/kasumi.png +%doc kasumi-2.5/AUTHORS kasumi-2.5/ChangeLog kasumi-2.5/NEWS kasumi-2.5/README +%license kasumi-2.5/COPYING +%endif +%if %{with pycotap} +%files python3-%{pypi_name} +%{python3_sitelib}/%{pypi_name} +%{python3_sitelib}/%{pypi_name}-1.1.0-py%{python3_version}.egg-info +%endif + +%changelog +* Fri Oct 22 2021 Takao Fujiwara - 1.5.13-3 +- export C.UTF-8 for make check + +* Fri Oct 22 2021 Takao Fujiwara - 1.5.13-2 +- Update era.t with 2021 +- Check python3-pycotap.rpm in Fedora instead of pip + +* Fri Aug 20 2021 Takao Fujiwara - 1.5.13-1 +- Bump to 1.5.13 +- Add kasumi-unicode +- Add python3-pycotap + +* Thu Aug 12 2021 Takao Fujiwara - 1.5.12-10 +- Remove Ctrl+period in circle_kana_mode + +* Thu Jul 22 2021 Fedora Release Engineering - 1.5.12-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jun 17 2021 Takao Fujiwara - 1.5.12-8 +- Delete postscript for ibus write-cache + +* Tue Apr 27 2021 Takao Fujiwara - 1.5.12-7 +- Move .desktop file from ibus-anthy-python to ibus-anthy +- Fix covscan + +* Wed Apr 21 2021 Takao Fujiwara - 1.5.12-6 +- Resolves: #1948197 Move post to posttrans + +* Tue Apr 20 2021 Takao Fujiwara - 1.5.12-5 +- Delete postscripts + +* Sun Mar 21 2021 Takao Fujiwara - 1.5.12-4 +- Output info to stderr instead of StringIO + +* Tue Mar 16 2021 Takao Fujiwara - 1.5.12-2 +- Change default input mode to Hiragana + +* Mon Feb 22 2021 Takao Fujiwara - 1.5.12-1 +- Bump to 1.5.12 + +* Wed Feb 10 2021 Takao Fujiwara - 1.5.11-10 +- Replace kasumi with kausmi-unicode +- Delete to require intltool +- Delete to call gettext.bind_textdomain_codeset() + +* Tue Jan 26 2021 Fedora Release Engineering - 1.5.11-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.5.11-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 09 2020 Takao Fujiwara - 1.5.11-7 +- Use pycotap instead of tappy in CI +- Revise CI from ibus-typing-booster +- Delete _python_bytecompile_extra + +* Wed Jan 29 2020 Fedora Release Engineering - 1.5.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Dec 04 2019 Takao Fujiwara - 1.5.11-5 +- Bug 1779129- Fix to install zipcode dict with anthy-unicode + +* Thu Oct 17 2019 Takao Fujiwara - 1.5.11-4 +- Add CI + +* Wed Oct 16 2019 Takao Fujiwara - 1.5.11-3 +- Replace anthy with anthy-unicode +- Install ibus-anthy-tests sub package + +* Thu Jul 25 2019 Fedora Release Engineering - 1.5.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue May 14 2019 Takao Fujiwara - 1.5.11-1 +- Bump to 1.5.11 + +* Fri Feb 01 2019 Fedora Release Engineering - 1.5.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.5.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 1.5.10-4 +- Rebuilt for Python 3.7 + +* Mon Mar 19 2018 Takao Fujiwara - 1.5.10-3 +- Reverted scriptlets for f27 + +* Mon Mar 19 2018 Takao Fujiwara - 1.5.10-2 +- Reverted ldconfig for f27 + +* Mon Mar 19 2018 Takao Fujiwara - 1.5.10-1 +- Bumped to 1.5.10 + +* Tue Feb 20 2018 Iryna Shcherbina - 1.5.9-7 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Wed Feb 07 2018 Fedora Release Engineering - 1.5.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 1.5.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.5.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.5.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 1.5.9-2 +- Rebuild for Python 3.6 + +* Thu Oct 20 2016 Takao Fujiwara - 1.5.9-1 +- Bumped to 1.5.9 + +* Thu Feb 04 2016 Fedora Release Engineering - 1.5.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jan 20 2016 Takao Fujiwara - 1.5.8-1 +- Bumped to 1.5.8 + +* Tue Nov 10 2015 Fedora Release Engineering - 1.5.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Thu Sep 03 2015 Takao Fujiwara - 1.5.7-2 +- Fix URL in anthy.appdata.xml + +* Thu Jul 16 2015 Takao Fujiwara - 1.5.7-1 +- Bumped to 1.5.7 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.5.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Apr 22 2015 Takao Fujiwara - 1.5.6-6 +- Resolved #1214092 Updated ibus-anthy-HEAD.patch +- Added with_appdata macro and removed with_python_pkg macro + +* Wed Mar 25 2015 Richard Hughes - 1.5.6-5 +- Add the AppData file to the right built RPM, in this case we have to install + ibus-anthy-python rather than the main package in gnome-software. +- It turns out adding the AppData file to spec files is a great way to fix these + kinds of bugs. :) + +* Wed Mar 25 2015 Richard Hughes - 1.5.6-4 +- Use an AppStream file compatible with F22 also. + +* Wed Mar 25 2015 Richard Hughes - 1.5.6-3 +- Register as an AppStream component. + +* Thu Nov 13 2014 Takao Fujiwara - 1.5.6-2 +- Updated ibus-anthy-HEAD.patch to fix Enter key on setup dialog. +- Use python2 for epel7. + +* Tue Sep 16 2014 Takao Fujiwara - 1.5.6-1 +- Bumped to 1.5.6 +- Added ibus-anthy-xx-input-mode.patch from ibus-anthy-HEAD.patch. + +* Sat Aug 16 2014 Fedora Release Engineering - 1.5.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 22 2014 Kalev Lember - 1.5.5-8 +- Rebuilt for gobject-introspection 1.41.4 + +* Mon Jul 14 2014 Takao Fujiwara - 1.5.5-7 +- Updated ibus-anthy-HEAD.patch + Fixed deprecated warnings with python3-gobject 3.13.3. + +* Mon Jul 14 2014 Takao Fujiwara - 1.5.5-6 +- Updated ibus-anthy-HEAD.patch + Fixed deprecated warnings with python3-gobject 3.13.3. + Set max-width-chars in ibus-anthy-setup wrapped GtkLabel. + Set 'IBUS_SETUP_XID' environment variable in setup. + +* Sat Jun 07 2014 Fedora Release Engineering - 1.5.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 19 2014 Takao Fujiwara - 1.5.5-4 +- Updated ibus-anthy-HEAD.patch to fix clear() in input mode. + +* Mon Apr 21 2014 Takao Fujiwara - 1.5.5-3 +- Updated ibus-anthy-HEAD.patch to unref pixbuf on destroy. + +* Thu Feb 27 2014 Takao Fujiwara - 1.5.5-2 +- Updated ibus-anthy-HEAD.patch to enable property icon. + +* Wed Feb 05 2014 Takao Fujiwara - 1.5.5-1 +- Bumped to 1.5.5 +- Enabled python3. + +* Tue Dec 24 2013 Takao Fujiwara - 1.5.4-2 +- Required ibus-anthy by ibus-anthy-python + +* Mon Sep 09 2013 Takao Fujiwara - 1.5.4-1 +- Bumped to 1.5.4 +- Added ibus-anthy-python subpackage for noarch. +- Deleted ibus-anthy-xx-disable-prop-symbol.patch + +* Sat Aug 03 2013 Fedora Release Engineering - 1.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon May 13 2013 Takao Fujiwara - 1.5.3-1 +- Bumped to 1.5.3 + +* Mon May 13 2013 Takao Fujiwara - 1.5.2-1 +- Bumped to 1.5.2 + +* Sat May 11 2013 Takao Fujiwara - 1.5.1-1 +- Bumped to 1.5.1 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jan 16 2013 Takao Fujiwara - 1.5.0-1 +- Bumped to 1.5.0 + +* Wed Dec 12 2012 Takao Fujiwara - 1.4.99.20121006-3 +- Resolved #884031. Deleted arch depended files. + +* Thu Nov 22 2012 Takao Fujiwara - 1.4.99.20121006-2 +- Updated to save the spec update. + +* Sat Oct 06 2012 Takao Fujiwara - 1.4.99.20121006-1 +- Bumped to 1.4.99.20121006 +- Added ibus-anthy-xx-disable-prop-symbol.patch for Fedora 17 + +* Thu Jul 19 2012 Fedora Release Engineering - 1.4.99.20120327-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Mar 27 2012 Takao Fujiwara - 1.4.99.20120327-1 +- Bumped to 1.4.99.20120327 + +* Sun Mar 04 2012 Takao Fujiwara - 1.3.99.20120304-1 +- Bumped to 1.3.99.20120304 + +* Mon Feb 06 2012 Takao Fujiwara - 1.2.6-5 +- Added ibus-anthy-xx-layout.patch to set 'default' layout in f17. + +* Fri Jan 13 2012 Fedora Release Engineering - 1.2.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Jul 29 2011 Takao Fujiwara - 1.2.6-3 +- Added ibus-anthy-xx-icon-symbol.patch to enable the engine symbol & hotkeys. + +* Mon May 16 2011 Takao Fujiwara - 1.2.6-1 +- Bumped to 1.2.6 + Fixed Bug 661943 - the latest page_size for ibus.LookupTable. + +* Wed Feb 09 2011 Fedora Release Engineering - 1.2.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Dec 01 2010 Takao Fujiwara - 1.2.5-1 +- Updated to 1.2.5 + Fixed Bug 652881 - SEGV when key tables are customized in new gconf. + Fixed Bug 654322 - new custom keys are not loaded. + +* Tue Oct 26 2010 Takao Fujiwara - 1.2.4-1 +- Updated to 1.2.4 +- Resolves #644771 ibus-anthy [F7] key cannot work with SEGV + +* Sat Oct 16 2010 Takao Fujiwara - 1.2.3-1 +- Updated to 1.2.3 +- Updated translations. + +* Fri Oct 15 2010 Takao Fujiwara - 1.2.2.20101015-1 +- Updated to 1.2.2.20101015 +- Fixed Bug 643291 - ibus-anthy commit_first_segment + +* Wed Jul 21 2010 David Malcolm - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Fri Apr 23 2010 Takao Fujiwara - 1.2.1-1 +- Update to 1.2.1 + +* Mon Apr 05 2010 Takao Fujiwara - 1.2.0.20100313-3 +- Update icon + +* Fri Mar 12 2010 Takao Fujiwara - 1.2.0.20100313-1 +- Update to 1.2.0.20100313 +- Update fr.po + +* Fri Mar 12 2010 Takao Fujiwara - 1.2.0.20100312.1-1 +- Update to 1.2.0.20100312.1 +- Minor fix for a translation + +* Fri Mar 12 2010 Takao Fujiwara - 1.2.0.20100312-1 +- Update to 1.2.0.20100312 +- Fix bug 571728 - ibus-anthy support to switch dicts +- Fix bug 572412 - ibus-anthy: Segment convertion mode + +* Fri Mar 05 2010 Takao Fujiwara - 1.2.0.20100115-2 +- Fix bug 564268 - Crash with enabled global input method +- Fix bug 570680 - Support NICOLA-F and NICOLA-A +- Fix romaji_typing_rule. #777 +- Fix Shift + char with CapsLock ON in romaji mode. +- Fix chattering bug. + +* Fri Jan 15 2010 Takao Fujiwara - 1.2.0.20100115-1 +- Update to 1.2.0.20100115 +- Fix bug 550001 - kasumi should be accessible from ibus-anthy + +* Fri Nov 27 2009 Takao Fujiwara - 1.2.0.20091127-1 +- Update to 1.2.0.20091127 +- Fix bug 520989 - ibus-anthy icon enhancement +- Fix bug 531696 - ibus-anthy KeyError is still reported by abrt +- Fix bug 536716 - ibus-anthy: Symbol type change support in ibus-anthy + +* Fri Oct 23 2009 Takao Fujiwara - 1.2.0.20090917-2 +- Fix bug 526881 - ibus-anthy backtrace is reported by the latest abrt + +* Thu Sep 17 2009 Takao Fujiwara - 1.2.0.20090917-1 +- Update to 1.2.0.20090917 +- Fix bug 523642 - ibus-anthy convert_to_char_type_{for,back}ward() + +* Mon Sep 07 2009 Takao Fujiwara - 1.2.0.20090907-2 +- Fix a build issue + +* Mon Sep 07 2009 Takao Fujiwara - 1.2.0.20090907-1 +- Update to 1.2.0.20090907 +- Fix bug 510978 - "Typing Method" configuration doesn't work +- Fix bug 518373 - ibus setup tools need to set gettext textdomain dir. + +* Thu Aug 13 2009 Takao Fujiwara - 1.2.0.20090813-1 +- Update to 1.2.0.20090813 +- Fix bug 509483 - reconversion feature doesn't work +- Fix bug 509485 - commit_first_segment feature doesn't work + +* Tue Aug 04 2009 Peng Huang - 1.2.0.20090804-1 +- Update to 1.2.0.20090804 +- Fix bug 508358 - ANTHY_HISTORY_FILE record only a single word + +* Fri Jul 24 2009 Fedora Release Engineering - 1.2.0.20090617-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Jun 22 2009 Peng Huang - 1.2.0.20090617-1 +- Update to 1.2.0.20090617 + +* Wed Jun 17 2009 Jens Petersen - 1.1.0.20090603-2 +- require kasumi to pull in dictionary tool + +* Wed Jun 03 2009 Peng Huang - 1.1.0.20090603-1 +- Update to 1.1.0.20090603 +- Implement setup ui. + +* Thu Apr 30 2009 Peng Huang - 1.1.0.20090402-2 +- Update to upstream HEAD version +- Fix bug 498250 - Cannot type zenkaku-space + +* Thu Apr 02 2009 Peng Huang - 1.1.0.20090402-1 +- Update to 1.1.0.20090402. +- Fix bug 490747 - Muhenkan (no-conversion) key does not undo conversion +- Fix bug 490750 - Henkan key for candidate conversion doesn't do anything +- Fix bug 490748 - Kana key doesn't do anything + +* Tue Feb 24 2009 Fedora Release Engineering - 1.1.0.20090211-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 11 2009 Peng Huang - 1.1.0.20090211-1 +- Update to 1.1.0.20090211. + +* Thu Feb 05 2009 Peng Huang - 1.1.0.20090205-1 +- Update to 1.1.0.20090205. + +* Tue Feb 03 2009 Peng Huang - 0.1.1.20090203-1 +- Update to 0.1.1.20090203. + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.1.1.20080912-2 +- Rebuild for Python 2.6 + +* Fri Sep 12 2008 Peng Huang - 0.1.1.20080912-1 +- Update to 0.1.1.20080912. + +* Mon Sep 01 2008 Peng Huang - 0.1.1.20080901-1 +- Update to 0.1.1.20080901. + +* Thu Aug 28 2008 Peng Huang - 0.1.1.20080828-1 +- Update to 0.1.1.20080828. + +* Wed Aug 27 2008 Peng Huang - 0.1.1.20080827-1 +- Update to 0.1.1.20080827. + +* Tue Aug 26 2008 Peng Huang - 0.1.1.20080826-1 +- Update to 0.1.1.20080826. + +* Sat Aug 23 2008 Peng Huang - 0.1.1.20080823-1 +- Update to 0.1.1.20080823. + +* Fri Aug 15 2008 Peng Huang - 0.1.1.20080815-1 +- Update to 0.1.1.20080815. + +* Tue Aug 12 2008 Peng Huang - 0.1.1.20080812-1 +- Update to 0.1.1.20080812. + +* Fri Aug 08 2008 Peng Huang - 0.1.0.20080810-1 +- The first version. diff --git a/ibus-anthy.tar.gz.sum b/ibus-anthy.tar.gz.sum deleted file mode 100644 index cc21697..0000000 --- a/ibus-anthy.tar.gz.sum +++ /dev/null @@ -1,4 +0,0 @@ -cksum 1682900558 914700 ibus-anthy-1.5.17.tar.gz -sha1sum 7935a5abc2a1cb4dd59ff9295d3582bdb1f0cc83 ibus-anthy-1.5.17.tar.gz -sha256sum 9e1d28ad7da2be5e0d9c0eb0d8fb7557fc89770aa2237272debe197bd61abd40 ibus-anthy-1.5.17.tar.gz -sha512sum 34775879ea4891d2f83c5f9aa341a59bac928332ad60ec4ba8d1475783b0c50c721229e48c7671f050066da3d4053531792c3fa5e5640db2c2e8bd1bc46105a1 ibus-anthy-1.5.17.tar.gz diff --git a/kasumi-1928410-gtk3.patch b/kasumi-1928410-gtk3.patch new file mode 100644 index 0000000..ad31368 --- /dev/null +++ b/kasumi-1928410-gtk3.patch @@ -0,0 +1,369 @@ +From 9de5eb6d221bf3438c75a756c9acffa01e2c51fb Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Tue, 16 Feb 2021 07:45:51 +0900 +Subject: [PATCH] Migrate kasumi GUI to GTK3 + +--- + KasumiAddWindow.cxx | 41 ++++++++++------------ + KasumiAddWindow.hxx | 1 - + KasumiMainWindow.cxx | 82 ++++++++++++++++++++++---------------------- + cellrendererspin.c | 16 +++++---- + cellrendererspin.h | 2 +- + main.cxx | 15 ++++---- + 6 files changed, 79 insertions(+), 78 deletions(-) + +diff --git a/KasumiAddWindow.cxx b/KasumiAddWindow.cxx +index 9b42c12..49c6a05 100644 +--- a/KasumiAddWindow.cxx ++++ b/KasumiAddWindow.cxx +@@ -59,9 +59,6 @@ KasumiAddWindow::KasumiAddWindow(KasumiDic *aDictionary, + g_signal_connect(G_OBJECT(window), "delete_event", + G_CALLBACK(_call_back_add_window_delete_event), this); + +- // tooltips for every widget +- Tooltips = gtk_tooltips_new(); +- + // creating vbox for text entries, spin button and so on. + GtkWidget *vbox = gtk_vbox_new(FALSE,0); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); +@@ -111,12 +108,12 @@ KasumiAddWindow::KasumiAddWindow(KasumiDic *aDictionary, + const int FREQ_DEFAULT = conf->getPropertyValueByInt("DefaultFrequency"); + const int FREQ_LBOUND = conf->getPropertyValueByInt("MinFrequency"); + const int FREQ_UBOUND = conf->getPropertyValueByInt("MaxFrequency"); +- GtkObject *adjustment = gtk_adjustment_new(FREQ_DEFAULT, +- FREQ_LBOUND, +- FREQ_UBOUND, +- 1, +- FREQ_UBOUND / 100 +- ,0); ++ GtkAdjustment *adjustment = GTK_ADJUSTMENT (gtk_adjustment_new(FREQ_DEFAULT, ++ FREQ_LBOUND, ++ FREQ_UBOUND, ++ 1, ++ FREQ_UBOUND / 100 ++ ,0)); + FrequencySpin = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment),1.0,0); + alignment = gtk_alignment_new(0, 0.5, 1.0, 1.0); + gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 6, 6, 6); +@@ -205,16 +202,14 @@ KasumiAddWindow::KasumiAddWindow(KasumiDic *aDictionary, + gtk_box_pack_start(GTK_BOX(hbutton_box),GTK_WIDGET(button),TRUE,TRUE,0); + g_signal_connect(G_OBJECT(button),"clicked", + G_CALLBACK(_call_back_add_window_add),this); +- gtk_tooltips_set_tip(Tooltips, button, +- _("Add entered word and quit registration."), ++ gtk_widget_set_tooltip_text(button, + _("If all the necessary items are filled in, add entered word and quit registration.")); + + button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); + gtk_box_pack_start(GTK_BOX(hbutton_box),GTK_WIDGET(button),TRUE,TRUE,0); + g_signal_connect(G_OBJECT(button),"clicked", + G_CALLBACK(_call_back_add_window_quit),this); +- gtk_tooltips_set_tip(Tooltips, button, +- _("Cancel registration and quit."), ++ gtk_widget_set_tooltip_text(button, + _("Cancel registration and quit.")); + + gtk_window_set_keep_above(GTK_WINDOW(window), TRUE); +@@ -227,24 +222,21 @@ KasumiAddWindow::KasumiAddWindow(KasumiDic *aDictionary, + gtk_box_pack_start(GTK_BOX(hbutton_box),GTK_WIDGET(button),TRUE,TRUE,0); + g_signal_connect(G_OBJECT(button),"clicked", + G_CALLBACK(_call_back_add_window_add),this); +- gtk_tooltips_set_tip(Tooltips, button, +- _("Add entered word"), ++ gtk_widget_set_tooltip_text(button, + _("If all the necessary items are filled in, add entered word.")); + + button = gtk_button_new_from_stock(GTK_STOCK_EDIT); + gtk_box_pack_start(GTK_BOX(hbutton_box),GTK_WIDGET(button),TRUE,TRUE,0); + g_signal_connect(G_OBJECT(button),"clicked", + G_CALLBACK(_call_back_manage_mode),this); +- gtk_tooltips_set_tip(Tooltips, button, +- _("Manage mode"), ++ gtk_widget_set_tooltip_text(button, + _("Make the shift to manage mode to modify and remove registered words.")); + + button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); + gtk_box_pack_start(GTK_BOX(hbutton_box),GTK_WIDGET(button),TRUE,TRUE,0); + g_signal_connect(G_OBJECT(button),"clicked", + G_CALLBACK(_call_back_add_window_quit),this); +- gtk_tooltips_set_tip(Tooltips, button, +- _("Quit this application"), ++ gtk_widget_set_tooltip_text(button, + _("Save dictionary and quit this application.")); + + // get selection at the time of launching +@@ -443,16 +435,19 @@ void _call_back_manage_mode(GtkWidget *widget, + void _call_back_selection_data_received(GtkWidget *widget, + GtkSelectionData *selection_data, + gpointer data){ +- if(selection_data->length < 0){ ++ int emit_length = gtk_selection_data_get_length(selection_data); ++ GdkAtom emit_type = gtk_selection_data_get_data_type(selection_data); ++ const guchar *emit_data = gtk_selection_data_get_data(selection_data); ++ if(emit_length < 0){ + // failed retrieving selection + // do nothing + return; + } + +- string atom_name = string(gdk_atom_name(selection_data->type)); ++ string atom_name = string(gdk_atom_name(emit_type)); + +- gchar *str; +- str = reinterpret_cast(selection_data->data); ++ const gchar *str; ++ str = reinterpret_cast(emit_data); + + if(atom_name == "UTF8_STRING"){ + gtk_entry_set_text(GTK_ENTRY(widget), str); +diff --git a/KasumiAddWindow.hxx b/KasumiAddWindow.hxx +index 5101314..352326a 100644 +--- a/KasumiAddWindow.hxx ++++ b/KasumiAddWindow.hxx +@@ -77,7 +77,6 @@ private: + GtkWidget *FrequencySpin; + GtkWidget *WordTypeCategoryCombo; + GtkWidget *WordTypeCombo; +- GtkTooltips *Tooltips; + + GtkTreeIter defaultWordTypeCategoryIter; + +diff --git a/KasumiMainWindow.cxx b/KasumiMainWindow.cxx +index 4e86c7a..e8a8d56 100644 +--- a/KasumiMainWindow.cxx ++++ b/KasumiMainWindow.cxx +@@ -150,22 +150,22 @@ void KasumiMainWindow::createWindow() + mSaveButton = gtk_button_new_from_stock ("gtk-save"); + gtk_widget_show (mSaveButton); + gtk_box_pack_start (GTK_BOX (hbuttonbox1), mSaveButton, FALSE, TRUE, 0); +- GTK_WIDGET_SET_FLAGS (mSaveButton, GTK_CAN_DEFAULT); ++ gtk_widget_set_can_default (mSaveButton, TRUE); + + mAddButton = gtk_button_new_from_stock ("gtk-add"); + gtk_widget_show (mAddButton); + gtk_box_pack_start (GTK_BOX (hbuttonbox1), mAddButton, FALSE, TRUE, 0); +- GTK_WIDGET_SET_FLAGS (mAddButton, GTK_CAN_DEFAULT); ++ gtk_widget_set_can_default (mAddButton, TRUE); + + mRemoveButton = gtk_button_new_from_stock ("gtk-delete"); + gtk_widget_show (mRemoveButton); + gtk_box_pack_start (GTK_BOX (hbuttonbox1), mRemoveButton, FALSE, TRUE, 0); +- GTK_WIDGET_SET_FLAGS (mRemoveButton, GTK_CAN_DEFAULT); ++ gtk_widget_set_can_default (mRemoveButton, TRUE); + + mQuitButton = gtk_button_new_from_stock ("gtk-close"); + gtk_widget_show (mQuitButton); + gtk_box_pack_end (GTK_BOX (hbuttonbox1), mQuitButton, FALSE, TRUE, 0); +- GTK_WIDGET_SET_FLAGS (mQuitButton, GTK_CAN_DEFAULT); ++ gtk_widget_set_can_default (mQuitButton, TRUE); + } + + void KasumiMainWindow::createWordList() +@@ -474,7 +474,7 @@ void KasumiMainWindow::editedTextColumn(GtkCellRendererText *renderer, + + // set cursor right or left + GtkTreeViewColumn *postCol = NULL; +- if(lastKeyVal == GDK_Tab) ++ if(lastKeyVal == GDK_KEY_Tab) + { + if(lastKeyState & GDK_CONTROL_MASK) + { // set cursor left +@@ -887,42 +887,42 @@ guint getAccelKey(const string &key){ + + string shortkey = key.substr(i+1); + +- if(shortkey == "A") return GDK_A; +- else if(shortkey == "B") return GDK_B; +- else if(shortkey == "C") return GDK_C; +- else if(shortkey == "D") return GDK_D; +- else if(shortkey == "E") return GDK_E; +- else if(shortkey == "F") return GDK_F; +- else if(shortkey == "G") return GDK_G; +- else if(shortkey == "H") return GDK_H; +- else if(shortkey == "I") return GDK_I; +- else if(shortkey == "J") return GDK_J; +- else if(shortkey == "K") return GDK_K; +- else if(shortkey == "L") return GDK_L; +- else if(shortkey == "M") return GDK_M; +- else if(shortkey == "N") return GDK_N; +- else if(shortkey == "O") return GDK_O; +- else if(shortkey == "P") return GDK_P; +- else if(shortkey == "Q") return GDK_Q; +- else if(shortkey == "R") return GDK_R; +- else if(shortkey == "S") return GDK_S; +- else if(shortkey == "T") return GDK_T; +- else if(shortkey == "U") return GDK_U; +- else if(shortkey == "V") return GDK_V; +- else if(shortkey == "W") return GDK_W; +- else if(shortkey == "X") return GDK_X; +- else if(shortkey == "Y") return GDK_Y; +- else if(shortkey == "Z") return GDK_Z; +- else if(shortkey == "0") return GDK_0; +- else if(shortkey == "1") return GDK_1; +- else if(shortkey == "2") return GDK_2; +- else if(shortkey == "3") return GDK_3; +- else if(shortkey == "4") return GDK_4; +- else if(shortkey == "5") return GDK_5; +- else if(shortkey == "6") return GDK_5; +- else if(shortkey == "7") return GDK_7; +- else if(shortkey == "8") return GDK_8; +- else if(shortkey == "9") return GDK_9; ++ if(shortkey == "A") return GDK_KEY_A; ++ else if(shortkey == "B") return GDK_KEY_B; ++ else if(shortkey == "C") return GDK_KEY_C; ++ else if(shortkey == "D") return GDK_KEY_D; ++ else if(shortkey == "E") return GDK_KEY_E; ++ else if(shortkey == "F") return GDK_KEY_F; ++ else if(shortkey == "G") return GDK_KEY_G; ++ else if(shortkey == "H") return GDK_KEY_H; ++ else if(shortkey == "I") return GDK_KEY_I; ++ else if(shortkey == "J") return GDK_KEY_J; ++ else if(shortkey == "K") return GDK_KEY_K; ++ else if(shortkey == "L") return GDK_KEY_L; ++ else if(shortkey == "M") return GDK_KEY_M; ++ else if(shortkey == "N") return GDK_KEY_N; ++ else if(shortkey == "O") return GDK_KEY_O; ++ else if(shortkey == "P") return GDK_KEY_P; ++ else if(shortkey == "Q") return GDK_KEY_Q; ++ else if(shortkey == "R") return GDK_KEY_R; ++ else if(shortkey == "S") return GDK_KEY_S; ++ else if(shortkey == "T") return GDK_KEY_T; ++ else if(shortkey == "U") return GDK_KEY_U; ++ else if(shortkey == "V") return GDK_KEY_V; ++ else if(shortkey == "W") return GDK_KEY_W; ++ else if(shortkey == "X") return GDK_KEY_X; ++ else if(shortkey == "Y") return GDK_KEY_Y; ++ else if(shortkey == "Z") return GDK_KEY_Z; ++ else if(shortkey == "0") return GDK_KEY_0; ++ else if(shortkey == "1") return GDK_KEY_1; ++ else if(shortkey == "2") return GDK_KEY_2; ++ else if(shortkey == "3") return GDK_KEY_3; ++ else if(shortkey == "4") return GDK_KEY_4; ++ else if(shortkey == "5") return GDK_KEY_5; ++ else if(shortkey == "6") return GDK_KEY_5; ++ else if(shortkey == "7") return GDK_KEY_7; ++ else if(shortkey == "8") return GDK_KEY_8; ++ else if(shortkey == "9") return GDK_KEY_9; + + cerr << "Invalid shortcut key option: " << key << endl; + exit(1); +diff --git a/cellrendererspin.c b/cellrendererspin.c +index 885d462..85d3bda 100644 +--- a/cellrendererspin.c ++++ b/cellrendererspin.c +@@ -52,8 +52,6 @@ + */ + + #include "cellrendererspin.h" +-#include +-#include + #include + + #define GUI_CELL_RENDERER_SPIN_PATH "gui-cell-renderer-spin-path" +@@ -239,6 +237,7 @@ gui_cell_renderer_spin_editing_done (GtkCellEditable *spinbutton, + const gchar *path; + const gchar *new_text; + GCRSpinInfo *info; ++ gboolean canceled = FALSE; + + info = g_object_get_data (G_OBJECT (data), GUI_CELL_RENDERER_SPIN_INFO); + +@@ -248,7 +247,8 @@ gui_cell_renderer_spin_editing_done (GtkCellEditable *spinbutton, + info->focus_out_id = 0; + } + +- if (GTK_ENTRY(spinbutton)->editing_canceled) ++ g_object_get (spinbutton, "editing-canceled", &canceled, NULL); ++ if (canceled) + return; + + path = g_object_get_data (G_OBJECT (spinbutton), GUI_CELL_RENDERER_SPIN_PATH); +@@ -317,19 +317,23 @@ gui_cell_renderer_spin_start_editing (GtkCellRenderer *cell, + GtkWidget *spinbutton; + GCRSpinInfo *info; + gdouble curval = 0.0; ++ gboolean editable = FALSE; ++ gchar* str = NULL; + + celltext = GTK_CELL_RENDERER_TEXT(cell); + spincell = GUI_CELL_RENDERER_SPIN(cell); + + /* If the cell isn't editable we return NULL. */ +- if (celltext->editable == FALSE) ++ editable = GPOINTER_TO_INT(g_object_get_data (G_OBJECT (celltext), "editable")); ++ if (editable == FALSE) + return NULL; + + spinbutton = g_object_new (GTK_TYPE_SPIN_BUTTON, "has_frame", FALSE, "numeric", TRUE, NULL); + + /* dirty */ +- if (celltext->text) +- curval = atof(celltext->text); ++ str = (gchar *)g_object_get_data (G_OBJECT (celltext), "text"); ++ if (str) ++ curval = atof(str); + + adj = GTK_ADJUSTMENT(gtk_adjustment_new(curval, + spincell->lower, +diff --git a/cellrendererspin.h b/cellrendererspin.h +index c6b33d2..36a2740 100644 +--- a/cellrendererspin.h ++++ b/cellrendererspin.h +@@ -27,7 +27,7 @@ + #ifndef _cellrendererspin_h_included_ + #define _cellrendererspin_h_included_ + +-#include ++#include + + G_BEGIN_DECLS + +diff --git a/main.cxx b/main.cxx +index c5c459e..8ed5edf 100644 +--- a/main.cxx ++++ b/main.cxx +@@ -101,14 +101,15 @@ static void cb_selection_get(GtkWidget *widget, + { + gchar *text = NULL; + gint length = 0; ++ GdkAtom emit_selection = gtk_selection_data_get_selection(data); + +- if (data->selection == atom0) { ++ if (emit_selection == atom0) { + text = "Kasumi Selection"; + length = strlen(text); + gtk_selection_convert(window, atom1, + GDK_SELECTION_TYPE_STRING, + GDK_CURRENT_TIME); +- } else if (data->selection == atom1 && arg_text != NULL) { ++ } else if (emit_selection == atom1 && arg_text != NULL) { + text = arg_text; + arg_text = NULL; + length = strlen(text); +@@ -116,7 +117,7 @@ static void cb_selection_get(GtkWidget *widget, + + if (text != NULL) { + gtk_selection_data_set_text(data, text, length); +- if (data->selection == atom1) ++ if (emit_selection == atom1) + g_free(text); + } + } +@@ -126,9 +127,11 @@ static void cb_selection_received(GtkWidget *widget, + guint time, + gpointer user_data) + { +- if (data->selection == atom0) { +- instance = MAX(data->length, 0); +- } else if (data->selection == atom1 && data->length > 0) { ++ GdkAtom emit_selection = gtk_selection_data_get_selection(data); ++ int emit_length = gtk_selection_data_get_length(data); ++ if (emit_selection == atom0) { ++ instance = MAX(emit_length, 0); ++ } else if (emit_selection == atom1 && emit_length > 0) { + } + } + +-- +2.28.0 + diff --git a/kasumi-853099-manpage.patch b/kasumi-853099-manpage.patch new file mode 100644 index 0000000..1ce24f9 --- /dev/null +++ b/kasumi-853099-manpage.patch @@ -0,0 +1,25 @@ +diff -pruN kasumi-2.5.orig/kasumi.1 kasumi-2.5/kasumi.1 +--- kasumi-2.5.orig/kasumi.1 2009-06-25 17:46:31.000000000 +0900 ++++ kasumi-2.5/kasumi.1 2012-08-31 11:14:19.000000000 +0900 +@@ -52,6 +52,10 @@ Run Kasumi in Manage mode\&. You may abb + Run Kasumi in Add mode\&. + + .TP ++\fB\-e\fR \fB\-\-exclusive\fR ++Run Kasumi in Exclusive mode\&. ++ ++.TP + \fB\-\-sound val\fR + Set default sound entry (only in Add mode) + +@@ -71,6 +75,10 @@ Import selected text as a spelling + \fB\-I\fR \fB\-\-ignore\fR + Ignore selected text + ++.TP ++\fB\-E\fR \fB\-\-eucjp\fR ++Use EUC-JP encoding for dictionary ++ + .SH "AUTHOR" + + .PP diff --git a/kasumi-check-anthy-pkg.patch b/kasumi-check-anthy-pkg.patch new file mode 100644 index 0000000..0a38db0 --- /dev/null +++ b/kasumi-check-anthy-pkg.patch @@ -0,0 +1,16 @@ +diff -pruN kasumi-2.5.orig/configure.in kasumi-2.5/configure.in +--- kasumi-2.5.orig/configure.in 2009-07-13 12:41:26.000000000 +0900 ++++ kasumi-2.5/configure.in 2021-03-31 16:59:21.255070350 +0900 +@@ -32,8 +32,10 @@ AC_CHECK_LIB(iconv, iconv) + AC_CHECK_LIB(anthydic, anthy_dic_util_init) + AC_CHECK_LIB(anthy, anthy_get_version_string) + +-CFLAGS="$CFLAGS -Wall" +-CXXFLAGS="$CXXFLAGS -Wall" ++PKG_CHECK_MODULES(ANTHY, anthy) ++ ++CFLAGS="$CFLAGS -Wall $ANTHY_CFLAGS" ++CXXFLAGS="$CXXFLAGS -Wall $ANTHY_CFLAGS" + + dnl Checks for header files. + diff --git a/plans/test.fmf b/plans/test.fmf deleted file mode 100644 index c1627f9..0000000 --- a/plans/test.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Basic smoke test -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources index 6c6f368..12e56d1 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (ibus-anthy-1.5.17.tar.gz) = 34775879ea4891d2f83c5f9aa341a59bac928332ad60ec4ba8d1475783b0c50c721229e48c7671f050066da3d4053531792c3fa5e5640db2c2e8bd1bc46105a1 +SHA512 (ibus-anthy-1.5.13.tar.gz) = 02d63f578d0d5c099bc63dfa050b9091809b8af53a4b4372f1896f647b54f735b56ebead51b34fb9302c94afecaf439473b1df311fca640105e71ac9b80f94dd +SHA512 (kasumi-2.5.tar.gz) = 066dda59d84b456c514a896b376bfc6df8ac64404f06fbfa8c369381acb6d260b1f22874885be2eab844f8f3776b944a5c700a966464ebef74d82c28bc97f970 +SHA512 (pycotap-1.1.0.tar.gz) = dbe8d76c3e4b934dd4ff9ec0d48caafef3ae5583046a7316607b3c8cebf8cb920c68dc46487243aac81823994805c76f2be8ff0cbda593c70b70f268661fa289 diff --git a/tests/ibus-desktop-testing/install1-common/main.fmf b/tests/ibus-desktop-testing/install1-common/main.fmf deleted file mode 100644 index b920b02..0000000 --- a/tests/ibus-desktop-testing/install1-common/main.fmf +++ /dev/null @@ -1,90 +0,0 @@ -summary: Install common GNOME desktop components -description: - The listed packages are installed commonly between Fedora and - RHEL GNOME desktop components. -require: - # IBus CI sets - - ibus - - ibus-desktop-testing - - dbus-x11 - # https://pagure.io/fedora-comps/blob/main/f/comps-f41.xml.in - # dnf group info GNOME - # base-graphical mandatory - - mesa-dri-drivers - - mesa-vulkan-drivers - - plymouth-system-theme - # fonts default - - default-fonts-cjk-mono - - default-fonts-cjk-sans - - default-fonts-cjk-serif - - default-fonts-core-emoji - - default-fonts-core-math - - default-fonts-core-mono - - default-fonts-core-sans - - default-fonts-core-serif - - default-fonts-other-mono - - default-fonts-other-sans - - default-fonts-other-serif - # gnome-desktop mandatory - - dconf - - gdm - - gnome-connections - - gnome-control-center - - gnome-initial-setup - - gnome-session-wayland-session - - gnome-settings-daemon - - gnome-shell - - gnome-software - - gnome-text-editor - - nautilus - - polkit - - ptyxis - # gnome-desktop default - - avahi - - baobab - # Sometimes version mismatch with gnome-shell in rawhide - #- chrome-gnome-shell - - fprintd-pam - - glib-networking - - gnome-bluetooth - - gnome-browser-connector - - gnome-calculator - - gnome-calendar - - gnome-characters - - gnome-classic-session - - gnome-clocks - - gnome-color-manager - - gnome-disk-utility - - gnome-epub-thumbnailer - - gnome-font-viewer - - gnome-remote-desktop - - gnome-system-monitor - - gnome-user-docs - - gvfs-goa - - gvfs-mtp - - librsvg2 - - libsane-hpaio - - loupe - - mesa-dri-drivers - - mesa-libEGL - - ModemManager - - NetworkManager-adsl - - NetworkManager-ppp - - NetworkManager-wwan - - PackageKit-command-not-found - - PackageKit-gtk3-module - - sane-backends-drivers-scanners - - snapshot - # Move systemd-oomd-defaults to Post-Installing section - - tracker - - tracker-miners - - xdg-desktop-portal - - xdg-desktop-portal-gnome - - xdg-desktop-portal-gtk - - xdg-user-dirs-gtk - # desktop-accessibility default - - at-spi2-atk - - at-spi2-core - - brltty - - orca - - speech-dispatcher diff --git a/tests/ibus-desktop-testing/install2-fedora/main.fmf b/tests/ibus-desktop-testing/install2-fedora/main.fmf deleted file mode 100644 index 9bf4560..0000000 --- a/tests/ibus-desktop-testing/install2-fedora/main.fmf +++ /dev/null @@ -1,39 +0,0 @@ -summary: Install Fedora specific GNOME desktop components -description: - The listed packages are available in Fedora only. -enabled: false -adjust: - when: distro == fedora - enabled: true -require: - - adobe-source-code-pro-fonts - - gnome-screenshot - - gnome-boxes - - yelp - - cheese - - eog - - evince - - evince-djvu - - gnome-backgrounds - - gnome-contacts - - gnome-logs - - gnome-maps - - gnome-photos - - gnome-themes-extra - - gnome-user-share - - gnome-weather - - gvfs-afc - - gvfs-afp - - gvfs-archive - - gvfs-fuse - - gvfs-gphoto2 - - gvfs-smb - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-pptp-gnome - - NetworkManager-ssh-gnome - - NetworkManager-vpnc-gnome - - rygel - - simple-scan - - sushi - - totem diff --git a/tests/ibus-desktop-testing/install3-rhel/main.fmf b/tests/ibus-desktop-testing/install3-rhel/main.fmf deleted file mode 100644 index 342507c..0000000 --- a/tests/ibus-desktop-testing/install3-rhel/main.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Install RHEL specific GNOME desktop components -description: - Currently no specific packages for RHEL. -enabled: false -adjust: - when: distro != fedora - enabled: true diff --git a/tests/ibus-desktop-testing/install4-g-d-t/main.fmf b/tests/ibus-desktop-testing/install4-g-d-t/main.fmf deleted file mode 100644 index cfd4fd7..0000000 --- a/tests/ibus-desktop-testing/install4-g-d-t/main.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: Install GNOME installed-tests testing harness -description: - gnome-desktop-testing package is required by IBus CI(ibus-desktop-testing) - and it's available in Fedora only at present. -require: - - gnome-desktop-testing diff --git a/tests/ibus-desktop-testing/install5-tmt/main.fmf b/tests/ibus-desktop-testing/install5-tmt/main.fmf deleted file mode 100644 index 332864f..0000000 --- a/tests/ibus-desktop-testing/install5-tmt/main.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Install TMT packages -description: - The test script is calling the beakerlib script. -require: - - beakerlib diff --git a/tests/ibus-desktop-testing/install6-ibus-anthy/main.fmf b/tests/ibus-desktop-testing/install6-ibus-anthy/main.fmf deleted file mode 100644 index 0443fd1..0000000 --- a/tests/ibus-desktop-testing/install6-ibus-anthy/main.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: Install ibus-anthy specific packages -description: - The listed packages are required by CI of ibus-anthy. -require: - - ibus-anthy-tests - - glibc-langpack-ja diff --git a/tests/ibus-desktop-testing/main.fmf b/tests/ibus-desktop-testing/main.fmf deleted file mode 100644 index b4d0642..0000000 --- a/tests/ibus-desktop-testing/main.fmf +++ /dev/null @@ -1,3 +0,0 @@ -summary: gnome-desktop-testing tests -# common test for sub tests -test: env diff --git a/tests/ibus-desktop-testing/run/main.fmf b/tests/ibus-desktop-testing/run/main.fmf deleted file mode 100644 index d2434b1..0000000 --- a/tests/ibus-desktop-testing/run/main.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Run tests -description: - Run CI with ibus-desktop-testing-runner in GNOME Wayland. -duration: 15m -test: ./test.sh diff --git a/tests/ibus-desktop-testing/run/test.sh b/tests/ibus-desktop-testing/run/test.sh deleted file mode 100755 index d53faf5..0000000 --- a/tests/ibus-desktop-testing/run/test.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -rlJournalStart - rlPhaseStartTest - rlRun -t "/usr/bin/ibus-desktop-testing-runner --runner gnome --tests ibus-anthy --no-graphics --lang ja_JP.UTF-8" - rlPhaseEnd - rlPhaseStartCleanup - rlRun "echo test-suite.log" - rlRun "cat test-suite.log" - rlRun "echo /export/home/itestuser/test-autostart.log" - rlRun "cat /export/home/itestuser/test-autostart.log" - rlPhaseEnd -rlJournalEnd diff --git a/tests/main.fmt b/tests/main.fmt deleted file mode 100644 index e89cb45..0000000 --- a/tests/main.fmt +++ /dev/null @@ -1 +0,0 @@ -contact: Takao Fujiwara diff --git a/tests/roles/ibus-desktop-testing-role/defaults/main.yml b/tests/roles/ibus-desktop-testing-role/defaults/main.yml new file mode 100644 index 0000000..8ff7991 --- /dev/null +++ b/tests/roles/ibus-desktop-testing-role/defaults/main.yml @@ -0,0 +1,3 @@ +role_pkgs_req: + - rsync + - xorg-x11-server-Xvfb diff --git a/tests/roles/ibus-desktop-testing-role/meta/main.yml b/tests/roles/ibus-desktop-testing-role/meta/main.yml new file mode 100644 index 0000000..6626402 --- /dev/null +++ b/tests/roles/ibus-desktop-testing-role/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - role: str-common-init diff --git a/tests/roles/ibus-desktop-testing-role/tasks/main.yml b/tests/roles/ibus-desktop-testing-role/tasks/main.yml new file mode 100644 index 0000000..44c70e2 --- /dev/null +++ b/tests/roles/ibus-desktop-testing-role/tasks/main.yml @@ -0,0 +1,118 @@ +--- +- name: Check if GNOME installed-tests testing harness is installed + register: gnome_desktop_testing_runner + find: + paths: "{{ ansible_env.PATH.split(':') }}" + pattern: gnome-desktop-testing-runner + +- name: Build and install GNOME installed-tests testing harness + when: gnome_desktop_testing_runner.matched == 0 + block: + - name: Installing build dependencies for IBus and GNOME installed-tests testing harness + package: + name: + - git + - make + - gcc + - diffutils + - autoconf + - automake + - libtool + - glib2-devel + - systemd-devel + - gnome-session + - gnome-shell + - dbus-x11 + - xorg-x11-server-Xvfb + - ibus + - ibus-desktop-testing + - ibus-anthy-tests + # ibus-compose test needs locales + - glibc-langpack-el + - glibc-langpack-fi + - glibc-langpack-pt + + - name: Fetching GNOME installed-tests testing harness source from remote repository + git: + repo: 'https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git' + dest: gnome-desktop-testing + force: yes + + - name: Configure GNOME installed-tests testing harness build + command: ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var + args: + chdir: gnome-desktop-testing + + - name: Build GNOME installed-tests testing harness + command: make + args: + chdir: gnome-desktop-testing + + - name: Install GNOME installed-tests testing harness + command: make install + args: + chdir: gnome-desktop-testing + +- name: Start IBus installed-tests testing harness + environment: + ANSIBLE: 1 + TMPDIR: '{{ remote_artifacts }}' + G_MESSAGES_DEBUG: 'all' + block: + - name: Execute IBus tests + shell: | + set -e + status="FAIL: frame" + if [ -f $HOME/.config/anthy/last-record2_default.utf8 ] ; then \ + rm $HOME/.config/anthy/last-record2_default.utf8 + fi + if [ -f $HOME/.anthy/last-record2_default.utf8 ] ; then \ + rm $HOME/.anthy/last-record2_default.utf8 + fi + ibus-desktop-testing-runner \ + --no-graphics \ + --runner=gnome \ + --timeout=1200 \ + --tests='{{ installed_test_name }}' \ + --output='{{ remote_artifacts }}/{{ installed_test_name }}.log' \ + --result='{{ remote_artifacts }}/test.log' \ + null + if [ $? -eq 0 ]; then + status="PASS: frame" + fi + echo "${status}" >> {{ remote_artifacts }}/test.log + echo "#### {{ remote_artifacts }}/{{ installed_test_name }}.log" + if [ -f {{ remote_artifacts }}/{{ installed_test_name }}.log ] ; then + cat {{ remote_artifacts }}/{{ installed_test_name }}.log + fi + echo "#" + echo "#### {{ remote_artifacts }}/test.log" + if [ -f {{ remote_artifacts }}/test.log ] ; then + cat {{ remote_artifacts }}/test.log + fi + echo "#" + + - name: Check the results + #shell: grep "^FAIL" {{ remote_artifacts }}/test.log + shell: | + log="{{ remote_artifacts }}/test.log" + if [ ! -f $log ] ; then + echo ERROR + else + FAIL=`grep "^FAIL: " {{ remote_artifacts }}/test.log | grep -v 'FAIL: 0$'` + if [ x"$FAIL" != x ] ; then + echo ERROR + fi + fi + register: test_fails + failed_when: False + + - name: Set role result + set_fact: + role_result: "{{ test_fails.stdout }}" + role_result_failed: "{{ (test_fails.stdout|d|length > 0) or (test_fails.stderr|d|length > 0) }}" + role_result_msg: "{{ test_fails.stdout|d('tests failed.') }}" + + - include_role: + name: str-common-final + diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..b175564 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,8 @@ +- hosts: localhost + roles: + - role: ibus-desktop-testing-role + installed_test_name: ibus-anthy + tags: + - classic + - gating +