From 1cee685bd75e70acec5f08d2a207eab49f790e9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 16:39:20 +0000 Subject: [PATCH 1/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From aeed128a117388dacf22ed9b07ee2a61f1d015ab Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Wed, 22 Jan 2025 11:39:22 +0100 Subject: [PATCH 2/5] Fix build on rawhide (F42) --- m17n-lib-1.8.4-fix-build.patch | 12 ++++++++++++ m17n-lib.spec | 1 + 2 files changed, 13 insertions(+) create mode 100644 m17n-lib-1.8.4-fix-build.patch diff --git a/m17n-lib-1.8.4-fix-build.patch b/m17n-lib-1.8.4-fix-build.patch new file mode 100644 index 0000000..2c63a6b --- /dev/null +++ b/m17n-lib-1.8.4-fix-build.patch @@ -0,0 +1,12 @@ +diff -ru m17n-lib-1.8.4.orig/example/medit.c m17n-lib-1.8.4/example/medit.c +--- m17n-lib-1.8.4.orig/example/medit.c 2023-06-29 15:51:21.000000000 +0200 ++++ m17n-lib-1.8.4/example/medit.c 2025-01-22 11:33:48.713029732 +0100 +@@ -1861,7 +1861,7 @@ + } + + MText * +-read_file () ++read_file (const char *filename) + { + FILE *fp = fopen (filename, "r"); + diff --git a/m17n-lib.spec b/m17n-lib.spec index 7754ca5..4a86817 100644 --- a/m17n-lib.spec +++ b/m17n-lib.spec @@ -14,6 +14,7 @@ License: LGPL-2.1-or-later URL: http://www.nongnu.org/m17n/ Source0: http://download.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz Patch0: %{name}-1.8.0-multilib.patch +Patch1: %{name}-1.8.4-fix-build.patch BuildRequires: make BuildRequires: m17n-db-devel libthai-devel From 0a384be7ba1c10d93d02259295e0f674b3cccbf1 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Sun, 9 Feb 2025 22:43:28 +0100 Subject: [PATCH 3/5] Update to 1.8.5 - Use UTF-8 instead of EUC-JP in example/mimx-anthy.c This fixes encoding problems when ja-anthy is used by ibus-m17n (m17n:ja:anthy - ja-anthy (m17n)) or by ibus-typing-booster. - Enable anthy-unicode (thanks to Takao Fujiwara ) - Fix build on Fedora rawhide (Fedora 42) (Now included in upstream tarball, remove patch) - configure.ac: fix incorrect bashism (thanks to Eli Schwartz ) --- .gitignore | 1 + m17n-lib-1.8.4-fix-build.patch | 12 ------------ m17n-lib.spec | 5 ++--- sources | 2 +- 4 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 m17n-lib-1.8.4-fix-build.patch diff --git a/.gitignore b/.gitignore index 86a0170..9bc4420 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ m17n-lib-1.6.1.tar.gz /m17n-lib-1.8.2.tar.gz /m17n-lib-1.8.3.tar.gz /m17n-lib-1.8.4.tar.gz +/m17n-lib-1.8.5.tar.gz diff --git a/m17n-lib-1.8.4-fix-build.patch b/m17n-lib-1.8.4-fix-build.patch deleted file mode 100644 index 2c63a6b..0000000 --- a/m17n-lib-1.8.4-fix-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru m17n-lib-1.8.4.orig/example/medit.c m17n-lib-1.8.4/example/medit.c ---- m17n-lib-1.8.4.orig/example/medit.c 2023-06-29 15:51:21.000000000 +0200 -+++ m17n-lib-1.8.4/example/medit.c 2025-01-22 11:33:48.713029732 +0100 -@@ -1861,7 +1861,7 @@ - } - - MText * --read_file () -+read_file (const char *filename) - { - FILE *fp = fopen (filename, "r"); - diff --git a/m17n-lib.spec b/m17n-lib.spec index 4a86817..c74e1e2 100644 --- a/m17n-lib.spec +++ b/m17n-lib.spec @@ -6,7 +6,7 @@ %endif Name: m17n-lib -Version: 1.8.4 +Version: 1.8.5 Release: %autorelease Summary: Multilingual text library @@ -14,7 +14,6 @@ License: LGPL-2.1-or-later URL: http://www.nongnu.org/m17n/ Source0: http://download.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz Patch0: %{name}-1.8.0-multilib.patch -Patch1: %{name}-1.8.4-fix-build.patch BuildRequires: make BuildRequires: m17n-db-devel libthai-devel @@ -30,7 +29,7 @@ BuildRequires: automake libtool Provides: bundled(gnulib) %if %{with anthy} -BuildRequires: anthy-devel +BuildRequires: anthy-unicode-devel %endif Requires: m17n-db diff --git a/sources b/sources index eb1e9ea..0005908 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m17n-lib-1.8.4.tar.gz) = 7e322788aed8a758a8c289112433aabccd12dacf14b247ba9060503bcc44930c9251f0c4e718987b9a151de097e72bc1e07c8096f7f4ad83a7d7183a549721d6 +SHA512 (m17n-lib-1.8.5.tar.gz) = ac343e27df790161d9459bb0ef9827302cad6e1e291a5b245867d4bc93b2aa53faf5feb22af655de3402afda0665ac1d0ed0b765bd48c6bd458cea15dc325fc3 From 8e2fbedce473160492817555e48e0f5b18867113 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Tue, 3 Jun 2025 16:05:00 +0200 Subject: [PATCH 4/5] Update to 1.8.6 - Add m17n-input-test program (by David Mandelberg ) - input.c (regularize_action): Do not update the element of action_list if the element is a symbol that is defined as a variable (By K. Handa ). - Increment buffer index correctly in read_mtext_element () (Resolves: https://savannah.nongnu.org/bugs/index.php?67107) (by David Mandelberg ) - Simplify configure check for anthy/anthy-unicode --- .gitignore | 1 + m17n-lib.spec | 3 ++- sources | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9bc4420..0aba3eb 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ m17n-lib-1.6.1.tar.gz /m17n-lib-1.8.3.tar.gz /m17n-lib-1.8.4.tar.gz /m17n-lib-1.8.5.tar.gz +/m17n-lib-1.8.6.tar.gz diff --git a/m17n-lib.spec b/m17n-lib.spec index c74e1e2..58c646a 100644 --- a/m17n-lib.spec +++ b/m17n-lib.spec @@ -6,7 +6,7 @@ %endif Name: m17n-lib -Version: 1.8.5 +Version: 1.8.6 Release: %autorelease Summary: Multilingual text library @@ -120,6 +120,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_bindir}/m17n-dump %{_bindir}/m17n-edit %{_bindir}/m17n-view +%{_bindir}/m17n-input-test %{_libdir}/m17n/1.0/libm17n-X.so %{_libdir}/m17n/1.0/libm17n-gd.so %{_libdir}/libm17n-gui.so.* diff --git a/sources b/sources index 0005908..2a38cb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m17n-lib-1.8.5.tar.gz) = ac343e27df790161d9459bb0ef9827302cad6e1e291a5b245867d4bc93b2aa53faf5feb22af655de3402afda0665ac1d0ed0b765bd48c6bd458cea15dc325fc3 +SHA512 (m17n-lib-1.8.6.tar.gz) = 4fe3e9d2f88a90e8e9b30ee53a71612f937ab3d4c5243075f39de13818522e5c595840f67b3411b03d403affeafeb1802158b6ae8ddf80a1e695d1105b595a59 From aaf7d119d54ed71a5b612fe1ebdfcfddf5c2d510 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:09:52 +0000 Subject: [PATCH 5/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild