From 76671a31d81a29bc9239c567cc0266ed4db8a870 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:04:42 +0200 Subject: [PATCH 01/13] Rebuilt for Python 3.13 --- skf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skf.spec b/skf.spec index 3fa8c85..a7b0bf9 100644 --- a/skf.spec +++ b/skf.spec @@ -13,7 +13,7 @@ %undefine betaver %define betarel %(echo %betaver | sed -e 's|-|_|' | sed -e 's|^_||') -%global baserelease 6 +%global baserelease 7 %undefine _changelog_trimtime @@ -356,6 +356,9 @@ sh %{SOURCE1} %{perl_vendorarch}/auto/skf/ %changelog +* Fri Jun 07 2024 Python Maint - 2.10.16-7 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 2.10.16-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d0002588819adcb13842af155fadb2749bb86191 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 12 Jun 2024 13:07:58 +0200 Subject: [PATCH 02/13] Perl 5.40 rebuild --- skf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skf.spec b/skf.spec index a7b0bf9..e404edb 100644 --- a/skf.spec +++ b/skf.spec @@ -13,7 +13,7 @@ %undefine betaver %define betarel %(echo %betaver | sed -e 's|-|_|' | sed -e 's|^_||') -%global baserelease 7 +%global baserelease 8 %undefine _changelog_trimtime @@ -356,6 +356,9 @@ sh %{SOURCE1} %{perl_vendorarch}/auto/skf/ %changelog +* Wed Jun 12 2024 Jitka Plesnikova - 2.10.16-8 +- Perl 5.40 rebuild + * Fri Jun 07 2024 Python Maint - 2.10.16-7 - Rebuilt for Python 3.13 From 730cca78899e62095fed847e5bc0767e7ae95507 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:46:48 +0000 Subject: [PATCH 03/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- skf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skf.spec b/skf.spec index e404edb..b8c233a 100644 --- a/skf.spec +++ b/skf.spec @@ -13,7 +13,7 @@ %undefine betaver %define betarel %(echo %betaver | sed -e 's|-|_|' | sed -e 's|^_||') -%global baserelease 8 +%global baserelease 9 %undefine _changelog_trimtime @@ -356,6 +356,9 @@ sh %{SOURCE1} %{perl_vendorarch}/auto/skf/ %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.10.16-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 12 2024 Jitka Plesnikova - 2.10.16-8 - Perl 5.40 rebuild From ed5453eaed45c50f3808d5236870e8e439ec97b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 11 Sep 2024 05:58:00 +0000 Subject: [PATCH 04/13] 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. --- skf.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skf.spec b/skf.spec index b8c233a..b700abf 100644 --- a/skf.spec +++ b/skf.spec @@ -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 From 7890dfee4fcd675e733809e0f163d8a18d69eaee Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Jan 2025 10:32:15 +0900 Subject: [PATCH 05/13] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 --- skf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skf.spec b/skf.spec index b700abf..b56180d 100644 --- a/skf.spec +++ b/skf.spec @@ -13,7 +13,7 @@ %undefine betaver %define betarel %(echo %betaver | sed -e 's|-|_|' | sed -e 's|^_||') -%global baserelease 9 +%global baserelease 10 %undefine _changelog_trimtime @@ -356,6 +356,9 @@ sh %{SOURCE1} %{perl_vendorarch}/auto/skf/ %changelog +* Wed Jan 08 2025 Mamoru TASAKA - 2.10.16-10 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 + * Sat Jul 20 2024 Fedora Release Engineering - 2.10.16-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a68ddb7067e9a1a0e11a8ecd83a8dcf4e977a8fb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Jan 2025 12:03:40 +0900 Subject: [PATCH 06/13] Support C23 strict prototype --- skf-2.10.16-c23-function-proto.patch | 94 ++++++++++++++++++++++++++++ skf.spec | 8 ++- 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 skf-2.10.16-c23-function-proto.patch diff --git a/skf-2.10.16-c23-function-proto.patch b/skf-2.10.16-c23-function-proto.patch new file mode 100644 index 0000000..18c5911 --- /dev/null +++ b/skf-2.10.16-c23-function-proto.patch @@ -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 */ diff --git a/skf.spec b/skf.spec index b56180d..c3c8948 100644 --- a/skf.spec +++ b/skf.spec @@ -13,7 +13,7 @@ %undefine betaver %define betarel %(echo %betaver | sed -e 's|-|_|' | sed -e 's|^_||') -%global baserelease 10 +%global baserelease 11 %undefine _changelog_trimtime @@ -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 @@ -356,6 +359,9 @@ sh %{SOURCE1} %{perl_vendorarch}/auto/skf/ %changelog +* Fri Jan 17 2025 Mamoru TASAKA - 2.10.16-11 +- Support C23 strict prototype + * Wed Jan 08 2025 Mamoru TASAKA - 2.10.16-10 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 From be68a89e6b7fb207a9949c0c095dce129cbb6f30 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:42:31 +0200 Subject: [PATCH 07/13] Rebuilt for Python 3.14 --- skf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skf.spec b/skf.spec index c3c8948..6ab4f07 100644 --- a/skf.spec +++ b/skf.spec @@ -13,7 +13,7 @@ %undefine betaver %define betarel %(echo %betaver | sed -e 's|-|_|' | sed -e 's|^_||') -%global baserelease 11 +%global baserelease 12 %undefine _changelog_trimtime @@ -359,6 +359,9 @@ sh %{SOURCE1} %{perl_vendorarch}/auto/skf/ %changelog +* Mon Jun 02 2025 Python Maint - 2.10.16-12 +- Rebuilt for Python 3.14 + * Fri Jan 17 2025 Mamoru TASAKA - 2.10.16-11 - Support C23 strict prototype From 7676f5ebc71b84a4a4f478ac7f0048c105edcc9f Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 7 Jul 2025 16:38:25 +0200 Subject: [PATCH 08/13] Perl 5.42 rebuild --- skf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skf.spec b/skf.spec index 6ab4f07..4103558 100644 --- a/skf.spec +++ b/skf.spec @@ -13,7 +13,7 @@ %undefine betaver %define betarel %(echo %betaver | sed -e 's|-|_|' | sed -e 's|^_||') -%global baserelease 12 +%global baserelease 13 %undefine _changelog_trimtime @@ -359,6 +359,9 @@ sh %{SOURCE1} %{perl_vendorarch}/auto/skf/ %changelog +* Mon Jul 07 2025 Jitka Plesnikova - 2.10.16-13 +- Perl 5.42 rebuild + * Mon Jun 02 2025 Python Maint - 2.10.16-12 - Rebuilt for Python 3.14 From 109108f6820328307a9bd76dae1efd072f42b4c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:23:19 +0000 Subject: [PATCH 09/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- skf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skf.spec b/skf.spec index 4103558..a8f2c30 100644 --- a/skf.spec +++ b/skf.spec @@ -13,7 +13,7 @@ %undefine betaver %define betarel %(echo %betaver | sed -e 's|-|_|' | sed -e 's|^_||') -%global baserelease 13 +%global baserelease 14 %undefine _changelog_trimtime @@ -359,6 +359,9 @@ sh %{SOURCE1} %{perl_vendorarch}/auto/skf/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.10.16-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 07 2025 Jitka Plesnikova - 2.10.16-13 - Perl 5.42 rebuild From ce265f09fb20e8693967dc0666f56306ef939abe Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:18:05 +0200 Subject: [PATCH 10/13] Rebuilt for Python 3.14.0rc2 bytecode --- skf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skf.spec b/skf.spec index a8f2c30..e3523c0 100644 --- a/skf.spec +++ b/skf.spec @@ -13,7 +13,7 @@ %undefine betaver %define betarel %(echo %betaver | sed -e 's|-|_|' | sed -e 's|^_||') -%global baserelease 14 +%global baserelease 15 %undefine _changelog_trimtime @@ -359,6 +359,9 @@ sh %{SOURCE1} %{perl_vendorarch}/auto/skf/ %changelog +* Fri Aug 15 2025 Python Maint - 2.10.16-15 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 2.10.16-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e2a70a5b30c0157fff9894ab4dcf67cdce81c293 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:56:49 +0200 Subject: [PATCH 11/13] Rebuilt for Python 3.14.0rc3 bytecode --- skf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skf.spec b/skf.spec index e3523c0..6ee5ea1 100644 --- a/skf.spec +++ b/skf.spec @@ -13,7 +13,7 @@ %undefine betaver %define betarel %(echo %betaver | sed -e 's|-|_|' | sed -e 's|^_||') -%global baserelease 15 +%global baserelease 16 %undefine _changelog_trimtime @@ -359,6 +359,9 @@ sh %{SOURCE1} %{perl_vendorarch}/auto/skf/ %changelog +* Fri Sep 19 2025 Python Maint - 2.10.16-16 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 2.10.16-15 - Rebuilt for Python 3.14.0rc2 bytecode From 5da9c6795e2608fdc5f13678a35b1e25477901b6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 17 Nov 2025 23:00:09 +0900 Subject: [PATCH 12/13] Support ruby4 --- skf.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/skf.spec b/skf.spec index 6ee5ea1..7f66f49 100644 --- a/skf.spec +++ b/skf.spec @@ -13,7 +13,7 @@ %undefine betaver %define betarel %(echo %betaver | sed -e 's|-|_|' | sed -e 's|^_||') -%global baserelease 16 +%global baserelease 17 %undefine _changelog_trimtime @@ -145,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 @@ -359,6 +365,9 @@ sh %{SOURCE1} %{perl_vendorarch}/auto/skf/ %changelog +* Mon Nov 17 2025 Mamoru TASAKA - 2.10.16-17 +- Support ruby4 + * Fri Sep 19 2025 Python Maint - 2.10.16-16 - Rebuilt for Python 3.14.0rc3 bytecode From f4539cf4c3d191a857560519ed23f2453136e4e2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 20:55:30 +0900 Subject: [PATCH 13/13] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 --- skf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skf.spec b/skf.spec index 7f66f49..4f293d3 100644 --- a/skf.spec +++ b/skf.spec @@ -13,7 +13,7 @@ %undefine betaver %define betarel %(echo %betaver | sed -e 's|-|_|' | sed -e 's|^_||') -%global baserelease 17 +%global baserelease 18 %undefine _changelog_trimtime @@ -365,6 +365,9 @@ sh %{SOURCE1} %{perl_vendorarch}/auto/skf/ %changelog +* Thu Jan 08 2026 Mamoru TASAKA - 2.10.16-18 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 + * Mon Nov 17 2025 Mamoru TASAKA - 2.10.16-17 - Support ruby4