From a5146d6de582944e2d682d71997ccfde45b89876 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Wed, 6 May 2020 10:47:45 +0200 Subject: [PATCH] Update to 2.8.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix reading “include” instructions in Compose files and observe XCOMPOSEFILE (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/93) - Fix right-to-left detection for LC_MESSAGES=C (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/97) - GUI tests added thanks to Takao Fujiwara - Update UnicodeData.txt to Unicode 13.0.0 - Translation updates for it, hu, tr, pt_BR --- .gitignore | 1 + ibus-typing-booster.spec | 68 +++++++++++++++++++++++++++++++++++++--- sources | 2 +- tests/make_check.sh | 2 +- tests/tests.yml | 21 +++++++++++-- 5 files changed, 84 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 6a6e95f..e3dec28 100644 --- a/.gitignore +++ b/.gitignore @@ -136,3 +136,4 @@ /ibus-typing-booster-2.8.0.tar.gz /ibus-typing-booster-2.8.1.tar.gz /ibus-typing-booster-2.8.2.tar.gz +/ibus-typing-booster-2.8.3.tar.gz diff --git a/ibus-typing-booster.spec b/ibus-typing-booster.spec index f737429..d5ad900 100644 --- a/ibus-typing-booster.spec +++ b/ibus-typing-booster.spec @@ -3,7 +3,7 @@ %global _python_bytecompile_extra 1 Name: ibus-typing-booster -Version: 2.8.2 +Version: 2.8.3 Release: 1%{?dist} Summary: A completion input method License: GPLv3+, ASL 2.0 @@ -50,6 +50,7 @@ BuildRequires: python3-enchant BuildRequires: python3-libvoikko BuildRequires: libappstream-glib BuildRequires: desktop-file-utils +BuildRequires: python3-mock BuildRequires: python3-gobject BuildRequires: python3-gobject-base BuildRequires: hunspell-cs @@ -70,12 +71,24 @@ BuildRequires: glibc-langpack-cs BuildRequires: glibc-langpack-km BuildRequires: glibc-langpack-pt BuildRequires: glibc-langpack-am +BuildRequires: glibc-langpack-de +BuildRequires: glibc-langpack-ar +# A window manger is needed for the GUI test +BuildRequires: i3 BuildArch: noarch %description Ibus-typing-booster is a context sensitive completion input method to speedup typing. +%package tests +Summary: Tests for the %{name} package +Requires: %{name} = %{version}-%{release} + +%description tests +The %{name}-tests package contains tests that can be used to verify +the functionality of the installed %{name} package. + %package -n emoji-picker Summary: An emoji selection tool Requires: ibus-typing-booster = %{version}-%{release} @@ -90,7 +103,7 @@ Unicode symbols. %build export PYTHON=%{__python3} -%configure --disable-static --disable-additional +%configure --disable-static --disable-additional --enable-installed-tests make %{?_smp_mflags} %install @@ -155,10 +168,38 @@ dconf write /org/freedesktop/ibus/engine/typing-booster/keybindings "{'next_inpu dconf dump / export DISPLAY=:1 Xvfb $DISPLAY -screen 0 1024x768x16 & -ibus-daemon -drx make -C tests run_tests pushd tests - ./run_tests + ./run_tests -v test_compose_sequences.py + ./run_tests -v test_emoji_candidates.py + ./run_tests -v test_emoji_similar.py + ./run_tests -v test_emoji_unicode_version.py + ./run_tests -v test_hunspell_suggest.py + ./run_tests -v test_itb.py + ./run_tests -v test_itb_util.py + ./run_tests -v test_keyvals_to_keycodes.py + ./run_tests -v test_m17n_db_info.py + ./run_tests -v test_m17n_translit.py + # A window manager and and ibus-daemon are needed to run the GUI + # test tests/test_gtk.py, for example i3 can be used. + # + # To debug what is going on if there is a problem with the GUI test + # add BuildRequires: x11vnc and start a vnc server: + # + # x11vnc -display $DISPLAY -unixsock /tmp/mysock -bg -nopw -listen localhost -xkb + # + # Then one can view what is going on outside of the chroot with vncviewer: + # + # vncviewer /var/lib/mock/fedora-32-x86_64/root/tmp/mysock + # + # The GUI test will be skipped if there is no DISPLAY or no + # window manager. + # + ibus-daemon -drx + touch /tmp/i3config + i3 -c /tmp/i3config & + sleep 1 + XDG_SESSION_TYPE=x11 ./run_tests -v test_0_gtk.py popd %post @@ -187,12 +228,29 @@ popd %{_datadir}/applications/ibus-setup-typing-booster.desktop %{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.engine.typing-booster.gschema.xml +%files tests +%dir %{_libexecdir}/installed-tests +%{_libexecdir}/installed-tests/%{name} +%dir %{_datadir}/installed-tests +%{_datadir}/installed-tests/%{name} + %files -n emoji-picker %{_bindir}/emoji-picker %{_datadir}/applications/emoji-picker.desktop - %changelog +* Sun May 03 2020 Mike FABIAN - 2.8.3-1 +- Update to 2.8.3 +- Save default dictionaries and input methods when making the lists + empty in the setup tool +- Fix reading “include” instructions in Compose files and observe XCOMPOSEFILE + (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/93) +- Fix right-to-left detection for LC_MESSAGES=C + (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/97) +- GUI tests added thanks to Takao Fujiwara +- Update UnicodeData.txt to Unicode 13.0.0 +- Translation updates for it, hu, tr, pt_BR + * Tue Mar 31 2020 Mike FABIAN - 2.8.2-1 - Update to 2.8.2 - Translation updates from Weblate for ar, tr diff --git a/sources b/sources index 742ddad..19c6b05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ibus-typing-booster-2.8.2.tar.gz) = 3dffc21aae59ebc8c7b3ef3df588f958b4a42a2025dc6a82613e9bb1b324f8c999d01b8d98ed48794b3ea8fd5c3221df489a88f8c54c154a69be9908beda85b5 +SHA512 (ibus-typing-booster-2.8.3.tar.gz) = 18cee36b5f5c3d6da1cb455e785317c0e2b9826e49e3b2655f4f7a3fce4bdd279ff24614083559996031876702879530799a709e196dc5d68345f0d942972dff diff --git a/tests/make_check.sh b/tests/make_check.sh index 1788f61..6458107 100644 --- a/tests/make_check.sh +++ b/tests/make_check.sh @@ -15,5 +15,5 @@ Xvfb $DISPLAY -screen 0 1024x768x16 & ./configure --prefix=/usr check_return_value $? -make check && rc=0 || rc=1; cat tests/run_tests.log; cat tests/test-suite.log +make check && rc=0 || rc=1; cat tests/*.log exit $rc diff --git a/tests/tests.yml b/tests/tests.yml index d3378ce..e40f69a 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -14,6 +14,7 @@ - python3-enchant - libappstream-glib - desktop-file-utils + - python3-mock - python3-gobject - python3-gobject-base - hunspell-cs @@ -33,6 +34,13 @@ - python3-devel - python3-pyxdg - xorg-x11-server-Xvfb + - glibc-langpack-en + - glibc-langpack-cs + - glibc-langpack-km + - glibc-langpack-pt + - glibc-langpack-am + - glibc-langpack-de + - glibc-langpack-ar tests: - make-check: dir: ./ @@ -46,9 +54,16 @@ - doctests-itb_util.py: dir: ./ run: bash ./run_python_doctests.sh itb_util.py - - doctests-itb_emoji.py: - dir: ./ - run: bash ./run_python_doctests.sh itb_emoji.py +# Better do not run the doctests for itb_emoji in CI. +# CI is run in the installed system where the emoji +# annotation data is in the package cldr-emoji-annotation. +# The data in that package is often a bit older than the emoji annotation +# data in the source of ibus-typing-booster, therefore the emoji +# matching tests often give slightly different results and thus may +# fail when run against the cldr-emoji-annotation package. +# - doctests-itb_emoji.py: +# dir: ./ +# run: bash ./run_python_doctests.sh itb_emoji.py - emoji-picker: dir: ./ run: bash ./emoji_picker_tests.sh