Compare commits

..

No commits in common. "c9s" and "c9-beta" have entirely different histories.
c9s ... c9-beta

12 changed files with 3 additions and 225 deletions

27
.gitignore vendored
View File

@ -1,26 +1 @@
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
SOURCES/ibus-anthy-1.5.13.tar.gz

1
.ibus-anthy.metadata Normal file
View File

@ -0,0 +1 @@
4ea282bf83847fe6b58d0e0cde873dc7e7437be2 SOURCES/ibus-anthy-1.5.13.tar.gz

View File

@ -18,7 +18,7 @@
Name: ibus-anthy
Version: 1.5.13
Release: 4%{?dist}
Release: 1%{?dist}
Summary: The Anthy engine for IBus input platform
License: GPLv2+
URL: https://github.com/ibus/ibus/wiki
@ -27,7 +27,6 @@ Source0: https://github.com/ibus/ibus-anthy/releases/download/%{version}/
# Upstreamed patches.
# Patch0: %%{name}-HEAD.patch
Patch1: %{name}-1938129-default-hiragana.patch
Patch2: %{name}-24804-super-key.patch
BuildRequires: anthy-unicode-devel
BuildRequires: desktop-file-utils
@ -153,15 +152,6 @@ desktop-file-validate \
%{_datadir}/installed-tests/%{name}
%changelog
* Mon Mar 11 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.13-4
- Fix CI. Related: RHEL-24804
* Mon Mar 11 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.13-3
- Bump for el9_4. Related: RHEL-24804
* Thu Mar 07 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.13-2
- Distinguish Super-space and space shortcut keys. Related: RHEL-24804
* Fri Aug 20 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.13-1
- Remove Ctrl+period in circle_kana_mode. Related: rhbz#1993079

View File

@ -1,7 +0,0 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
# this is the testcase identifier, which OSCI pipeline uses
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1,42 +0,0 @@
From c1ffc2bfcedab68ce79c2fa9a7f2bfe6cec17595 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 18 Aug 2023 18:52:58 +0900
Subject: [PATCH] engine: Distinguish Super-space and space shortcut keys
BUG=rhbz#2232532
---
engine/python2/engine.py | 3 ++-
engine/python3/engine.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/engine/python2/engine.py b/engine/python2/engine.py
index 4b3da97..80cfa86 100644
--- a/engine/python2/engine.py
+++ b/engine/python2/engine.py
@@ -1940,7 +1940,8 @@ class Engine(IBus.EngineSimple):
state = state & (IBus.ModifierType.SHIFT_MASK |
IBus.ModifierType.CONTROL_MASK |
- IBus.ModifierType.MOD1_MASK)
+ IBus.ModifierType.MOD1_MASK |
+ IBus.ModifierType.MOD4_MASK)
# ignore key release events
if not is_press:
diff --git a/engine/python3/engine.py b/engine/python3/engine.py
index 20786f2..7c0d283 100644
--- a/engine/python3/engine.py
+++ b/engine/python3/engine.py
@@ -1935,7 +1935,8 @@ class Engine(IBus.EngineSimple):
state = state & (IBus.ModifierType.SHIFT_MASK |
IBus.ModifierType.CONTROL_MASK |
- IBus.ModifierType.MOD1_MASK)
+ IBus.ModifierType.MOD1_MASK |
+ IBus.ModifierType.MOD4_MASK)
# ignore key release events
if not is_press:
--
2.43.0

View File

View File

@ -1 +0,0 @@
SHA512 (ibus-anthy-1.5.13.tar.gz) = 02d63f578d0d5c099bc63dfa050b9091809b8af53a4b4372f1896f647b54f735b56ebead51b34fb9302c94afecaf439473b1df311fca640105e71ac9b80f94dd

View File

@ -1,3 +0,0 @@
role_pkgs_req:
- rsync
- xorg-x11-server-Xvfb

View File

@ -1,4 +0,0 @@
---
dependencies:
- role: str-common-init

View File

@ -1,123 +0,0 @@
---
- 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: Checkout v2021.1 tag in GNOME installed-tests testing harness
command: git checkout -b v2021.1 refs/tags/v2021.1
args:
chdir: gnome-desktop-testing
- 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

View File

@ -1,8 +0,0 @@
- hosts: localhost
roles:
- role: ibus-desktop-testing-role
installed_test_name: ibus-anthy
tags:
- classic
- gating