Compare commits

..

13 commits

Author SHA1 Message Date
Mamoru TASAKA
f4539cf4c3 Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 2026-01-08 20:55:30 +09:00
Mamoru TASAKA
5da9c6795e Support ruby4 2025-11-17 23:00:09 +09:00
Python Maint
e2a70a5b30 Rebuilt for Python 3.14.0rc3 bytecode 2025-09-19 14:56:49 +02:00
Python Maint
ce265f09fb Rebuilt for Python 3.14.0rc2 bytecode 2025-08-15 15:18:05 +02:00
Fedora Release Engineering
109108f682 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 18:23:19 +00:00
Jitka Plesnikova
7676f5ebc7 Perl 5.42 rebuild 2025-07-07 16:38:25 +02:00
Python Maint
be68a89e6b Rebuilt for Python 3.14 2025-06-02 20:42:31 +02:00
Mamoru TASAKA
a68ddb7067 Support C23 strict prototype 2025-01-17 12:03:40 +09:00
Mamoru TASAKA
7890dfee4f Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 2025-01-08 10:32:15 +09:00
Miroslav Suchý
ed5453eaed Migrate to SPDX license (temporary ids)
BSD and MIT needs to be identified under SPDX - both have more options
for UCD see https://gitlab.com/fedora/legal/fedora-license-data/-/issues/30

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

Note that this is an SPDX identifier, but it still needs to be migrated to the proper identifiers in the fedora-license-data set.

If there will be no comments in two weeks, I will merge this.
2024-09-11 05:58:00 +00:00
Fedora Release Engineering
730cca7889 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 05:46:48 +00:00
Jitka Plesnikova
d000258881 Perl 5.40 rebuild 2024-06-12 13:07:58 +02:00
Python Maint
76671a31d8 Rebuilt for Python 3.13 2024-06-07 09:04:42 +02:00
2 changed files with 141 additions and 2 deletions

View file

@ -0,0 +1,94 @@
diff --git a/skf-2.10/dyn_table.c b/skf-2.10/dyn_table.c
index f4fd2c4..e1b0bfb 100644
--- a/skf-2.10/dyn_table.c
+++ b/skf-2.10/dyn_table.c
@@ -102,9 +102,9 @@ void emoticon_table_gen();
void emoti_ntt_otbl_gen();
void emoti_sb_otbl_gen();
void emoti_au_otbl_gen();
-void emoticon_otbl_gen();
+void emoticon_otbl_gen P_((int));
void nyukan_otbl_gen();
-void set_out_table();
+void set_out_table P_((long, long));
void aribsjis_table_gen();
void aribjis_table_gen();
void aribaltmb_table_gen();
@@ -117,7 +117,7 @@ void aribbmp_table_gen();
void tscii_tbl_gen();
#else
void emoticon_table_gen();
-void emoticon_otbl_gen();
+void emoticon_otbl_gen P_((int));
#endif
void iso2022ms_table_gen();
diff --git a/skf-2.10/skf.c b/skf-2.10/skf.c
index 8315806..bea2666 100644
--- a/skf-2.10/skf.c
+++ b/skf-2.10/skf.c
@@ -237,7 +237,7 @@ int **arib_macro_tbl = NULL; /* arib macro area */
/* converters */
static int argeval P_((int,char **,int));
-int skf_in_converter();
+int skf_in_converter P_((skfFILE *));
static int skf_kanaconv_parser P_((int));
#ifndef SWIG_EXT
diff --git a/skf-2.10/skf.h b/skf-2.10/skf.h
index 5c2d3c0..a422c1a 100644
--- a/skf-2.10/skf.h
+++ b/skf-2.10/skf.h
@@ -2270,7 +2270,6 @@ extern skf_ucode **arib_macro_tbl;
/* --- SWIG-EXTENSION related fixes ---------------------------- */
extern void fold_value_setup();
-extern int skf_in_converter();
#ifdef SWIG_EXT
extern int swig_state;
diff --git a/skf-2.10/skf_convert.i b/skf-2.10/skf_convert.i
index bc365bb..d8c68e6 100644
--- a/skf-2.10/skf_convert.i
+++ b/skf-2.10/skf_convert.i
@@ -1164,7 +1164,7 @@ static void r_skf_convert(struct Skf_localestring *lstr, long ibuflen,
/* --- conversion loop ------------------------------------------- */
if ((errc = setjmp(skf_errbuf)) == 0) {
- sy = skf_in_converter((FILE *)0);
+ sy = skf_in_converter(0);
} else {
#if defined(SKF_PYTHON3) && defined(SWIGPYTHON)
if (errc == 1) PyErr_NoMemory();
diff --git a/skf-2.10/skf_fileio.h b/skf-2.10/skf_fileio.h
index b551898..74dcc6c 100644
--- a/skf-2.10/skf_fileio.h
+++ b/skf-2.10/skf_fileio.h
@@ -53,8 +53,6 @@ extern const char *skf_outmode;
/* encoding controls */
/* -------------------------------------------------------------- */
-extern int decode_hook();
-
#define sEOF (-1)
#define sOCD (-2)
#define sKAN (-3)
@@ -144,7 +142,7 @@ typedef int skfFILE; /* file type */
extern unsigned char stdobuf[O_BUFSIZ]; /* output buffer */
-extern int skf_fillbuf();
+extern int skf_fillbuf P_((int *));
extern /*@-retalias@*/ skfFILE *skf_fopen P_((char *, const char *));
extern size_t skf_strlen P_((char *,int));
@@ -253,6 +251,8 @@ extern skfoFILE *fout;
#endif
extern void skf_setvbuf P_ ((FILE *,char *,size_t));
+extern int skf_in_converter P_((skfFILE *));
+extern int decode_hook P_((skfFILE*, int));
/* -------------------------------------------------------------- */
/* exception handling */

View file

@ -13,7 +13,7 @@
%undefine betaver
%define betarel %(echo %betaver | sed -e 's|-|_|' | sed -e 's|^_||')
%global baserelease 6
%global baserelease 18
%undefine _changelog_trimtime
@ -22,7 +22,7 @@ Version: %{mainver}
Release: %{?betaver:0.}%{baserelease}%{?betaver:.%betarel}%{?dist}
Summary: Utility binary files in Simple Kanji Filter
License: BSD and MIT and UCD
License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-UCD
URL: http://osdn.jp/projects/skf
Source0: https://ftp.iij.ad.jp/pub/osdn.jp/skf/%{repoid}/skf_%{mainver}%{?betaver}.tar.xz
Source1: skf-basic-test.sh
@ -34,6 +34,8 @@ Source11: https://ymu.dl.osdn.jp/ticket/g/s/sk/skf/39882/5733/pythontest
Patch0: skf-2.10.16-rubyext-ptr-conversion.patch
# rubyext: type check for argument (ref: bug 2256789)
Patch1: skf-2.10.16-rubyext-ptr-typecheck.patch
# Support C23 strict prototype
Patch2: skf-2.10.16-c23-function-proto.patch
# common BR
BuildRequires: gcc
@ -120,6 +122,7 @@ pushd main
%patch -P0 -p1 -b .rubyptr
%patch -P1 -p1 -b .rubycheck
%patch -P2 -p2 -b .c23
%if 0%{?usescm} >= 1
autoconf
@ -142,6 +145,12 @@ sed -i configure.ac configure \
-e '\@^RUBY=.*false@d' \
%{nil}
# Support ruby4
sed -i.ruby4 \
skf_convert.i config.h.in \
-e 's@|| defined(SKF_RUBY3)@|| defined(SKF_RUBY3) || defined(SKF_RUBY4)@' \
%{nil}
## configure option, etc
# change optflags, don't strip
# believe upstream
@ -356,6 +365,42 @@ sh %{SOURCE1}
%{perl_vendorarch}/auto/skf/
%changelog
* Thu Jan 08 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.10.16-18
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0
* Mon Nov 17 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.10.16-17
- Support ruby4
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 2.10.16-16
- Rebuilt for Python 3.14.0rc3 bytecode
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 2.10.16-15
- Rebuilt for Python 3.14.0rc2 bytecode
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.16-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon Jul 07 2025 Jitka Plesnikova <jplesnik@redhat.com> - 2.10.16-13
- Perl 5.42 rebuild
* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 2.10.16-12
- Rebuilt for Python 3.14
* Fri Jan 17 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.10.16-11
- Support C23 strict prototype
* Wed Jan 08 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.10.16-10
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.16-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed Jun 12 2024 Jitka Plesnikova <jplesnik@redhat.com> - 2.10.16-8
- Perl 5.40 rebuild
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 2.10.16-7
- Rebuilt for Python 3.13
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.16-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild