Compare commits

...

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

15 changed files with 193 additions and 15 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

14
.gitignore vendored
View File

@ -1 +1,13 @@
SOURCES/kasumi-2.5.tar.gz
cvs-*
*.bz2
*.gz
*.rpm
kasumi-0.9.tar.gz
kasumi-0.10.tar.gz
kasumi-1.0.tar.gz
kasumi-2.0.tar.gz
kasumi-2.0.1.tar.gz
kasumi-2.2.tar.gz
kasumi-2.3.tar.gz
kasumi-2.4.tar.gz
kasumi-2.5.tar.gz

View File

@ -1 +0,0 @@
38155494d684f61e74ed1498ec90cc0fc68d791a SOURCES/kasumi-2.5.tar.gz

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

52
kasumi-1938091.patch Normal file
View File

@ -0,0 +1,52 @@
diff -pruN kasumi-2.5.orig/KasumiWord.cxx kasumi-2.5/KasumiWord.cxx
--- kasumi-2.5.orig/KasumiWord.cxx 2009-01-20 23:16:46.000000000 +0900
+++ kasumi-2.5/KasumiWord.cxx 2022-02-22 13:23:48.370368975 +0900
@@ -188,7 +188,7 @@ void KasumiWord::setSound(const string &
if(invalidChar != ""){
string message;
- message = string(_("Sound must consist of only Hiragana characters. You have entered invalid character: "));
+ message = string(_("You have entered invalid character: "));
message += invalidChar;
throw KasumiException(message, ERR_DIALOG, ALERT_ONLY);
}
@@ -211,7 +211,7 @@ void KasumiWord::setSoundByUTF8(const st
if(invalidChar != ""){
string message;
- message = string(_("Sound must consist of only Hiragana characters. You have entered invalid character: "));
+ message = string(_("You have entered invalid character: "));
message += invalidChar;
throw KasumiException(message, ERR_DIALOG, ALERT_ONLY);
}
diff -pruN kasumi-2.5.orig/po/it.po kasumi-2.5/po/it.po
--- kasumi-2.5.orig/po/it.po 2009-07-21 18:18:58.000000000 +0900
+++ kasumi-2.5/po/it.po 2022-02-22 13:27:24.171273941 +0900
@@ -19,10 +19,10 @@ msgstr ""
#: KasumiWord.cxx:191 KasumiWord.cxx:214
msgid ""
-"Sound must consist of only Hiragana characters. You have entered invalid "
+"You have entered invalid "
"character: "
msgstr ""
-"Il suono deve contenere solo caratteri Hiragana. Sono stati inseriti "
+"Sono stati inseriti "
"caratteri non validi."
#: KasumiMainWindow.cxx:81
diff -pruN kasumi-2.5.orig/po/ja.po kasumi-2.5/po/ja.po
--- kasumi-2.5.orig/po/ja.po 2009-07-21 18:18:58.000000000 +0900
+++ kasumi-2.5/po/ja.po 2022-02-22 13:25:36.977321153 +0900
@@ -17,9 +17,9 @@ msgstr ""
#: KasumiWord.cxx:191 KasumiWord.cxx:214
msgid ""
-"Sound must consist of only Hiragana characters. You have entered invalid "
+"You have entered invalid "
"character: "
-msgstr "読みにひらがな以外の文字を入力することはできません: "
+msgstr "無効な文字を入力しました: "
#: KasumiMainWindow.cxx:81
msgid "Kasumi"

26
kasumi-c89.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/cellrendererspin.c b/cellrendererspin.c
index 85d3bda690c90272..f68f28971f136d86 100644
--- a/cellrendererspin.c
+++ b/cellrendererspin.c
@@ -73,8 +73,8 @@ static GtkCellEditable *gui_cell_renderer_spin_start_editing (GtkCellRenderer
GdkEvent *event,
GtkWidget *widget,
const gchar *path,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
GtkCellRendererState flags);
struct _GCRSpinInfo
@@ -307,8 +307,8 @@ gui_cell_renderer_spin_start_editing (GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
const gchar *path,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
GtkCellRendererState flags)
{
GtkCellRendererText *celltext;

View File

@ -5,9 +5,9 @@
Name: kasumi
Version: 2.5
Release: 39%{?dist}
Release: 47%{?dist}
License: GPLv2+
License: GPL-2.0-or-later
URL: http://kasumi.sourceforge.jp/
%if 0%{?fedora}
BuildRequires: anthy-devel
@ -21,6 +21,8 @@ Source0: http://jaist.dl.sourceforge.jp/kasumi/41436/%{name}-%{version}.tar.gz
Patch0: kasumi-853099-manpage.patch
Patch1: kasumi-1928410-gtk3.patch
Patch2: kasumi-check-anthy-pkg.patch
Patch3: kasumi-1938091.patch
Patch4: kasumi-c89.patch
Summary: An anthy dictionary management tool
@ -111,23 +113,53 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
%changelog
* Mon Nov 14 2022 Akira TAGOH <tagoh@redhat.com> - 2.5-39
- Rebuilt for CI
Related: rhbz#2032140
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.5-47
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.5-36
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.5-46
- Bump release for June 2024 mass rebuild
* Tue Apr 20 2021 Akira TAGOH <tagoh@redhat.com> - 2.5-35
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Florian Weimer <fweimer@redhat.com> - 2.5-44
- Fix C89 compatibility issue (#2259428)
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jun 15 2023 Stephen Gallagher <sgallagh@redhat.com> - 2.5-41
- Fix typo in RPM macro breaking ELN builds
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Dec 1 2022 Akira TAGOH <tagoh@redhat.com> - 2.5-39
- Convert License tag to SPDX.
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Feb 22 2022 Akira TAGOH <tagoh@redhat.com> - 2.5-37
- To prevent confusion, drop some sentence from the error message
happening when set invalid characters for reading.
Resolves: rhbz#1938091
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Mar 31 2021 Akira TAGOH <tagoh@redhat.com> - 2.5-34
- Drop gtk2 dependency completely.
- Make anthy build conditionally for Fedora release only.
Resolves: rhbz#1939777
- Fix build fail without anthy-devel.
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.5-34
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Feb 16 2021 Takao Fujiwra <tfujiwar@redhat.com> - 2.5-33
- Migrate kasumi GUI to GTK3

5
plans/basic.fmf Normal file
View File

@ -0,0 +1,5 @@
summary: Basic smoke test
discover:
how: fmf
execute:
how: tmt

1
sources Normal file
View File

@ -0,0 +1 @@
f49d010cf1fa5672b4515502b961b8c8 kasumi-2.5.tar.gz

8
tests/basic/main.fmf Normal file
View File

@ -0,0 +1,8 @@
summary: Basic test
require:
- xorg-x11-server-Xwayland
- xwayland-run
- mutter
- kasumi-unicode
test: ./runtest.sh
framework: beakerlib

24
tests/basic/runtest.sh Executable file
View File

@ -0,0 +1,24 @@
#!/bin/bash
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
basedir=$(pwd)
. /usr/share/beakerlib/beakerlib.sh || exit 1
rlJournalStart
rlPhaseStartSetup
rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
rlRun "pushd $tmp"
rlRun "set -o pipefail"
rlPhaseEnd
rlPhaseStartTest
rlRun -t -s "xwfb-run -c mutter -e $tmp/xwfb-run.log -n 99 $basedir/test.sh" 0 "Check kasumi"
rlFileSubmit xwfb-run.log
rlPhaseEnd
rlPhaseStartCleanup
rlRun "popd"
rlRun "rm -r $tmp" 0 "Remove tmp directory"
rlPhaseEnd
rlJournalEnd

12
tests/basic/test.sh Executable file
View File

@ -0,0 +1,12 @@
#! /bin/sh
exec 2>&1
export GDK_BACKEND=x11
export XDG_SESSION_TYPE=x11
mutter --x11 &
sleep 5
echo "mutter started"
kasumi-unicode --help
exit $?