Compare commits

...

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

11 changed files with 315 additions and 183 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

52
.gitignore vendored
View File

@ -1 +1,51 @@
SOURCES/ibus-libpinyin-1.10.0.tar.gz
/ibus-libpinyin-1.4.0.tar.gz
/ibus-libpinyin-1.4.1.tar.gz
/ibus-libpinyin-1.4.2.tar.gz
/ibus-libpinyin-1.4.91.tar.gz
/ibus-libpinyin-1.4.92.tar.gz
/ibus-libpinyin-1.4.93.tar.gz
/ibus-libpinyin-1.5.91.tar.gz
/ibus-libpinyin-1.5.92.tar.gz
/ibus-libpinyin-1.6.91.tar.gz
/ibus-libpinyin-1.6.92.tar.gz
/ibus-libpinyin-1.6.99.20150203.tar.gz
/ibus-libpinyin-1.7.0.tar.gz
/ibus-libpinyin-1.7.1.tar.gz
/ibus-libpinyin-1.7.2.tar.gz
/ibus-libpinyin-1.7.3.tar.gz
/ibus-libpinyin-1.7.4.tar.gz
/ibus-libpinyin-1.7.91.tar.gz
/ibus-libpinyin-1.7.92.tar.gz
/ibus-libpinyin-1.8.0.tar.gz
/ibus-libpinyin-1.8.1.tar.gz
/ibus-libpinyin-1.8.91.tar.gz
/ibus-libpinyin-1.8.92.tar.gz
/ibus-libpinyin-1.9.0.tar.gz
/ibus-libpinyin-1.9.1.tar.gz
/ibus-libpinyin-1.9.2.tar.gz
/ibus-libpinyin-1.9.3.tar.gz
/ibus-libpinyin-1.9.91.tar.gz
/ibus-libpinyin-1.10.0.tar.gz
/ibus-libpinyin-1.10.91.tar.gz
/ibus-libpinyin-1.10.92.tar.gz
/ibus-libpinyin-1.11.0.tar.gz
/ibus-libpinyin-1.11.1.tar.gz
/ibus-libpinyin-1.11.91.tar.gz
/ibus-libpinyin-1.11.92.tar.gz
/ibus-libpinyin-1.11.93.tar.gz
/ibus-libpinyin-1.11.94.tar.gz
/ibus-libpinyin-1.12.0.tar.gz
/ibus-libpinyin-1.12.1.tar.gz
/ibus-libpinyin-1.12.91.tar.gz
/ibus-libpinyin-1.12.92.tar.gz
/ibus-libpinyin-1.13.0.tar.gz
/ibus-libpinyin-1.13.1.tar.gz
/ibus-libpinyin-1.14.91.tar.gz
/ibus-libpinyin-1.15.0.tar.gz
/ibus-libpinyin-1.15.1.tar.gz
/ibus-libpinyin-1.15.2.tar.gz
/ibus-libpinyin-1.15.3.tar.gz
/ibus-libpinyin-1.15.4.tar.gz
/ibus-libpinyin-1.15.5.tar.gz
/ibus-libpinyin-1.15.6.tar.gz
/ibus-libpinyin-1.15.7.tar.gz

View File

@ -1 +0,0 @@
7843f647ba1d417055029277a53fc852cef00c5b SOURCES/ibus-libpinyin-1.10.0.tar.gz

View File

@ -1,158 +0,0 @@
From 1eb70ce12bed9d6b53c02ac8693ec52abe1d0216 Mon Sep 17 00:00:00 2001
From: Peng Wu <pwu@redhat.com>
Date: Wed, 20 Nov 2019 19:12:47 +0800
Subject: [PATCH 1/3] fixes period handling
---
src/PYFallbackEditor.cc | 1 +
src/PYPPinyinEditor.cc | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/PYFallbackEditor.cc b/src/PYFallbackEditor.cc
index e3dcfba..12985f4 100644
--- a/src/PYFallbackEditor.cc
+++ b/src/PYFallbackEditor.cc
@@ -219,6 +219,7 @@ FallbackEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
case IBUS_A ... IBUS_Z:
if (modifiers == 0) {
if (!m_props.modeFull ())
+ m_prev_committed_char = keyval;
return FALSE;
commit (HalfFullConverter::toFull (keyval));
diff --git a/src/PYPPinyinEditor.cc b/src/PYPPinyinEditor.cc
index d2741b0..55bbb63 100644
--- a/src/PYPPinyinEditor.cc
+++ b/src/PYPPinyinEditor.cc
@@ -130,7 +130,7 @@ PinyinEditor::processPunct (guint keyval, guint keycode,
return FALSE;
}
- return TRUE;
+ return FALSE;
}
inline gboolean
--
2.26.2
From 592b628000d9b58bb714ff9232d7d2ddf814cacf Mon Sep 17 00:00:00 2001
From: Peng Wu <pwu@redhat.com>
Date: Thu, 21 Nov 2019 14:45:28 +0800
Subject: [PATCH 2/3] fixes period handling again
---
src/PYFallbackEditor.cc | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/PYFallbackEditor.cc b/src/PYFallbackEditor.cc
index 12985f4..3d03b49 100644
--- a/src/PYFallbackEditor.cc
+++ b/src/PYFallbackEditor.cc
@@ -218,9 +218,10 @@ FallbackEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
case IBUS_a ... IBUS_z:
case IBUS_A ... IBUS_Z:
if (modifiers == 0) {
- if (!m_props.modeFull ())
+ if (!m_props.modeFull ()) {
m_prev_committed_char = keyval;
return FALSE;
+ }
commit (HalfFullConverter::toFull (keyval));
retval = TRUE;
@@ -261,8 +262,10 @@ FallbackEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
keyval = IBUS_space;
case IBUS_space:
if (modifiers == 0) {
- if (!m_props.modeFull ())
+ if (!m_props.modeFull ()) {
+ m_prev_committed_char = keyval;
return FALSE;
+ }
commit (" ");
retval = TRUE;
@@ -272,6 +275,9 @@ FallbackEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
default:
break;
}
+
+ if (!retval)
+ m_prev_committed_char = keyval;
return retval;
}
--
2.26.2
From 17121ad1dbc8c9be44d449c2d79179cdd90f6d7c Mon Sep 17 00:00:00 2001
From: Peng Wu <pwu@redhat.com>
Date: Fri, 29 Nov 2019 13:23:16 +0800
Subject: [PATCH 3/3] fixes comma handling
---
src/PYFallbackEditor.cc | 32 ++++++++++++++++++++++++--------
1 file changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/PYFallbackEditor.cc b/src/PYFallbackEditor.cc
index 3d03b49..6020591 100644
--- a/src/PYFallbackEditor.cc
+++ b/src/PYFallbackEditor.cc
@@ -76,13 +76,21 @@ FallbackEditor::processPunctForSimplifiedChinese (guint keyval, guint keycode, g
m_double_quote = !m_double_quote;
return TRUE;
case ',':
- commit (""); return TRUE;
+ if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9') {
+ m_prev_committed_char = keyval;
+ return FALSE;
+ } else {
+ commit ("");
+ return TRUE;
+ }
case '.':
- if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9')
+ if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9') {
+ m_prev_committed_char = keyval;
return FALSE;
- else
+ } else {
commit ("。");
- return TRUE;
+ return TRUE;
+ }
case '<':
commit ("《"); return TRUE;
case '>':
@@ -144,13 +152,21 @@ FallbackEditor::processPunctForTraditionalChinese (guint keyval, guint keycode,
m_double_quote = !m_double_quote;
return TRUE;
case ',':
- commit (""); return TRUE;
+ if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9') {
+ m_prev_committed_char = keyval;
+ return FALSE;
+ } else {
+ commit ("");
+ return TRUE;
+ }
case '.':
- if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9')
+ if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9') {
+ m_prev_committed_char = keyval;
return FALSE;
- else
+ } else {
commit ("。");
- return TRUE;
+ return TRUE;
+ }
case '<':
commit ("《"); return TRUE;
case '>':
--
2.26.2

7
gating.yaml Normal file
View File

@ -0,0 +1,7 @@
--- !Policy
product_versions:
- rhel-10
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

View File

@ -1,23 +1,20 @@
%global snapshot 0
Name: ibus-libpinyin
Version: 1.10.0
Release: 2%{?dist}
Version: 1.15.7
Release: 3%{?dist}
Summary: Intelligent Pinyin engine based on libpinyin for IBus
License: GPLv2+
Group: System Environment/Libraries
License: GPL-3.0-or-later
URL: https://github.com/libpinyin/ibus-libpinyin
Source0: http://downloads.sourceforge.net/libpinyin/ibus-libpinyin/%{name}-%{version}.tar.gz
%if %snapshot
Patch0: ibus-libpinyin-1.10.x-head.patch
Patch0: ibus-libpinyin-1.15.x-head.patch
%endif
Patch1: ibus-libpinyin-fixes-period-and-comma-handling.patch
Requires: python3-gobject
Requires: ibus >= 1.5.11
BuildRequires: gcc-c++
BuildRequires: gettext-devel
BuildRequires: intltool
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: sqlite-devel
@ -27,6 +24,7 @@ BuildRequires: python3-devel
BuildRequires: desktop-file-utils
BuildRequires: ibus-devel >= 1.5.11
BuildRequires: libpinyin-devel >= 2.1.0
BuildRequires: make
# Requires(post): sqlite
@ -43,7 +41,6 @@ input method based on libpinyin for IBus.
%if %snapshot
%patch0 -p1 -b .head
%endif
%patch1 -p1 -b .period
%build
%configure --disable-static \
@ -51,28 +48,22 @@ input method based on libpinyin for IBus.
--disable-boost
# make -C po update-gmo
make %{?_smp_mflags}
%make_build
%check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-libpinyin.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-libbopomofo.desktop
%install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%make_install
%py_byte_compile %{python3} $RPM_BUILD_ROOT%{_datadir}/ibus-libpinyin/setup
%find_lang %{name}
%post
[ -x %{_bindir}/ibus ] && \
%{_bindir}/ibus write-cache --system &>/dev/null || :
%postun
[ -x %{_bindir}/ibus ] && \
%{_bindir}/ibus write-cache --system &>/dev/null || :
%files -f %{name}.lang
%doc AUTHORS COPYING README
%{_datadir}/appdata/*.appdata.xml
%{_datadir}/metainfo/*.appdata.xml
%{_datadir}/glib-2.0/schemas/*.gschema.xml
%{_datadir}/applications/ibus-setup-libpinyin.desktop
%{_datadir}/applications/ibus-setup-libbopomofo.desktop
@ -82,16 +73,200 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%{_datadir}/ibus-libpinyin/setup
%{_datadir}/ibus-libpinyin/base.lua
%{_datadir}/ibus-libpinyin/user.lua
%{_datadir}/ibus-libpinyin/network.txt
%{_datadir}/ibus-libpinyin/db/english.db
%{_datadir}/ibus-libpinyin/db/strokes.db
%{_datadir}/ibus-libpinyin/db/table.db
%dir %{_datadir}/ibus-libpinyin
%dir %{_datadir}/ibus-libpinyin/db
%{_datadir}/ibus/component/*
%changelog
* Tue Oct 27 2020 Peng Wu <pwu@redhat.com> - 1.10.0-2
- Fixes period and comma handling
- Resolves: #1857750
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.15.7-3
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.15.7-2
- Bump release for June 2024 mass rebuild
* Thu Feb 1 2024 Peng Wu <pwu@redhat.com> - 1.15.7-1
- Update to 1.15.7
- bug fixes
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Florian Weimer <fweimer@redhat.com> - 1.15.6-3
- Add pointer casts for C89 compatibility
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Dec 15 2023 Peng Wu <pwu@redhat.com> - 1.15.6-1
- Update to 1.15.6
- bug fixes
* Mon Nov 27 2023 Peng Wu <pwu@redhat.com> - 1.15.5-1
- Update to 1.15.5
- bug fixes
* Mon Sep 4 2023 Peng Wu <pwu@redhat.com> - 1.15.4-1
- Update to 1.15.4
- Update network dictionary
- Fix Caps Lock for English mode
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jun 1 2023 Peng Wu <pwu@redhat.com> - 1.15.3-2
- Rebuild the package
* Thu Jun 1 2023 Peng Wu <pwu@redhat.com> - 1.15.3-1
- Update to 1.15.3
- bug fixes
* Fri May 19 2023 Peng Wu <pwu@redhat.com> - 1.15.2-2
- Migrate to SPDX license
* Wed Mar 8 2023 Peng Wu <pwu@redhat.com> - 1.15.2-1
- Update to 1.15.2
- bug fixes
* Tue Feb 21 2023 Peng Wu <pwu@redhat.com> - 1.15.1-1
- Update to 1.15.1
- bug fixes
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jan 4 2023 Peng Wu <pwu@redhat.com> - 1.15.0-1
- Update to 1.15.0
- bug fixes
* Wed Oct 19 2022 Peng Wu <pwu@redhat.com> - 1.14.91-1
- Update to 1.14.91
- require libpinyin 2.7.91
- improve suggestion candidates
- improve English candidates
- support longer candidates
- support Legacy mode
* Thu Sep 15 2022 Peng Wu <pwu@redhat.com> - 1.13.1-1
- Update to 1.13.1
- fix setup dialog
* Sat Aug 20 2022 Peng Wu <pwu@redhat.com> - 1.13.0-1
- Update to 1.13.0
- bug fixes
* Thu Aug 11 2022 Peng Wu <pwu@redhat.com> - 1.12.92-1
- Update to 1.12.92
- bug fixes
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.91-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Apr 14 2022 Peng Wu <pwu@redhat.com> - 1.12.91-1
- Update to 1.12.91
- enhance English input mode
- enhance Table input mode
- update setup dialog
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Sep 15 2021 Peng Wu <pwu@redhat.com> - 1.12.1-1
- Update to 1.12.1
- support compatibility display style
- remember cloud input
- bug fixes
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 18 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.12.0-4
- Delete ibus write-cache in scriptlet
* Wed Apr 21 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.12.0-3
- Resolves: #1948197 Change post to posttrans
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Dec 15 2020 Peng Wu <pwu@redhat.com> - 1.12.0-1
- Update to 1.12.0
- bug fixes
* Thu Oct 22 2020 Peng Wu <pwu@redhat.com> - 1.11.94-1
- Update to 1.11.94
- bug fixes
* Mon Oct 12 2020 Peng Wu <pwu@redhat.com> - 1.11.93-3
- Fixes python3-gobject warning in setup dialog
* Sun Sep 27 2020 Peng Wu <pwu@redhat.com> - 1.11.93-2
- Fixes Shift key switch issue
* Wed Aug 26 2020 Peng Wu <pwu@redhat.com> - 1.11.93-1
- Update to 1.11.93
- switch to use GPLv3+ license
- support network dictionary
- bug fixes
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.92-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 1.11.92-3
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Mon Jul 13 2020 Peng Wu <pwu@redhat.com> - 1.11.92-2
- Switch to use py_byte_compile rpm macro
* Thu Mar 19 2020 Peng Wu <pwu@redhat.com> - 1.11.92-1
- Update to 1.11.92
- fixes desktop files
* Thu Mar 19 2020 Peng Wu <pwu@redhat.com> - 1.11.91-1
- Update to 1.11.91
- support compact display style
- bug fixes
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon May 20 2019 Peng Wu <pwu@redhat.com> - 1.11.1-1
- Update to 1.11.1
- use gettext
- add emoji-candidate option
- fixes SuggestionEditor
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jan 21 2019 Peng Wu <pwu@redhat.com> - 1.11.0-1
- Update to 1.11.0
- fixes keypad decimal
- fixes emoji candidates
- support configurable opencc config
* Wed Oct 31 2018 Peng Wu <pwu@redhat.com> - 1.10.92-1
- Update to 1.10.92
- fixes Enter handling
* Thu Oct 11 2018 Peng Wu <pwu@redhat.com> - 1.10.91-1
- Update to 1.10.91
- support ime.register_trigger in lua extension
- support predicted candidates
- support emoji input
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.10.0-2
- Rebuilt for Python 3.7
* Tue Apr 17 2018 Peng Wu <pwu@redhat.com> - 1.10.0-1
- Update to 1.10.0

6
plans/basic.fmf Normal file
View File

@ -0,0 +1,6 @@
summary: Basic smoke test
discover:
how: fmf
dist-git-source: true
execute:
how: tmt

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (ibus-libpinyin-1.15.7.tar.gz) = 084dc38178024ef0d13e2291c2b208c7fe431a7e8c5c4c579205480cae56cdd0076f3c2ce755353a2dc8d8e09141540431c189003a93cb85c598ee64d2947610

27
tests/main.fmf Normal file
View File

@ -0,0 +1,27 @@
test: bash ./make_check.sh ..
duration: 50m
framework: shell
require:
- make
- libappstream-glib
- desktop-file-utils
- python3-gobject
- python3-gobject-base
- glib2
- gtk3
- dconf
- dbus-x11
- ibus
- ibus-devel
- gcc-c++
- gettext-devel
- gcc
- intltool
- libtool
- pkgconfig
- sqlite-devel
- libuuid-devel
- lua-devel
- python3-devel
- libpinyin-devel
- rpm-build

24
tests/make_check.sh Normal file
View File

@ -0,0 +1,24 @@
#!/bin/bash
set -x
check_return_value () {
if [ $1 != 0 ] ; then
exit $1
fi
}
cd $1
VERSION=`rpmspec -q --srpm --qf "%{version}" ibus-libpinyin.spec 2>/dev/null`
if test -d ibus-libpinyin-$VERSION-build;
then cd ibus-libpinyin-$VERSION-build;
fi
cd ibus-libpinyin-$VERSION
./configure --prefix=/usr
check_return_value $?
make check
exit $?