From fd937c925648a0a1a0b832a46804ea1fade7cec8 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Thu, 4 May 2023 15:23:18 +0200 Subject: [PATCH 1/4] Update to 1.8.1 - Remove Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch (included upstream) --- .gitignore | 1 + ...7n-with-vi-telex-in-gedit-in-wayland.patch | 27 ------------------- m17n-lib.spec | 10 ++++--- sources | 2 +- 4 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch diff --git a/.gitignore b/.gitignore index 742086d..675c07f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ m17n-lib-1.6.1.tar.gz /m17n-lib-1.7.0.tar.gz /m17n-lib-1.8.0RC.tar.gz /m17n-lib-1.8.0.tar.gz +/m17n-lib-1.8.1.tar.gz diff --git a/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch b/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch deleted file mode 100644 index 3a25ea1..0000000 --- a/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4d815754f9f32c54ec47f9e323940f6332a7cb5d Mon Sep 17 00:00:00 2001 -From: Mike FABIAN -Date: Tue, 30 Apr 2019 10:32:13 +0200 -Subject: [PATCH] Fix segmentation fault when using ibus-m17n with vi-telex in - gedit in Gnome Wayland - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1704156 ---- - src/m17n-core.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/m17n-core.c b/src/m17n-core.c -index fe5aa77..642dfee 100644 ---- a/src/m17n-core.c -+++ b/src/m17n-core.c -@@ -930,6 +930,8 @@ m17n_object_unref (void *object) - M17NObjectRecord *record; - unsigned *count; - -+ if (object == NULL) -+ return -1; - if (! obj->ref_count_extended) - { - if (! --obj->ref_count) --- -2.20.1 - diff --git a/m17n-lib.spec b/m17n-lib.spec index e82680e..e4cc2f2 100644 --- a/m17n-lib.spec +++ b/m17n-lib.spec @@ -6,15 +6,14 @@ %endif Name: m17n-lib -Version: 1.8.0 -Release: 13%{?dist} +Version: 1.8.1 +Release: 1%{?dist} Summary: Multilingual text library License: LGPLv2+ 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: Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch BuildRequires: make BuildRequires: m17n-db-devel libthai-devel @@ -127,6 +126,11 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/libm17n-gui.so.* %changelog +* Fri May 05 2023 Mike FABIAN - 1.8.1-1 +- Update to 1.8.1 +- Remove Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch + (included upstream) + * Thu Jul 21 2022 Fedora Release Engineering - 1.8.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 9fbb7b6..d99b92e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m17n-lib-1.8.0.tar.gz) = 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd +SHA512 (m17n-lib-1.8.1.tar.gz) = d8b97c0145ac9056b962c4ef6204bd9f1766487393def8b31d984199003ba984eb1312b84e2c74261cafee493c370c1676e79dbd850a77bbfb3392f4cd9db437 From 6254b036f17771faadac64d53c994abb948e930e Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Tue, 9 May 2023 20:00:46 +0200 Subject: [PATCH 2/4] Update to 1.8.2 - Fix parallel builds by switching from absolute to relative paths (Resolves: https://savannah.nongnu.org/bugs/index.php?61377) - enable parallel builds in the spec file --- .gitignore | 1 + m17n-lib.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 675c07f..1cf883c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ m17n-lib-1.6.1.tar.gz /m17n-lib-1.8.0RC.tar.gz /m17n-lib-1.8.0.tar.gz /m17n-lib-1.8.1.tar.gz +/m17n-lib-1.8.2.tar.gz diff --git a/m17n-lib.spec b/m17n-lib.spec index e4cc2f2..be2b812 100644 --- a/m17n-lib.spec +++ b/m17n-lib.spec @@ -6,7 +6,7 @@ %endif Name: m17n-lib -Version: 1.8.1 +Version: 1.8.2 Release: 1%{?dist} Summary: Multilingual text library @@ -75,8 +75,7 @@ Tools to test M17n GUI widget library. sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -# parallel make usage with make command fails build on koji -make +%{make_build} %install make install DESTDIR=%{buildroot} INSTALL="install -p" @@ -126,7 +125,12 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/libm17n-gui.so.* %changelog -* Fri May 05 2023 Mike FABIAN - 1.8.1-1 +* Tue May 09 2023 Mike FABIAN - 1.8.2-1 +- Update to 1.8.2 +- Fix parallel builds by switching from absolute to relative paths + (Resolves: https://savannah.nongnu.org/bugs/index.php?61377) +- enable parallel builds in the spec file + - Update to 1.8.1 - Remove Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch (included upstream) diff --git a/sources b/sources index d99b92e..51dfdc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m17n-lib-1.8.1.tar.gz) = d8b97c0145ac9056b962c4ef6204bd9f1766487393def8b31d984199003ba984eb1312b84e2c74261cafee493c370c1676e79dbd850a77bbfb3392f4cd9db437 +SHA512 (m17n-lib-1.8.2.tar.gz) = 715aae4ba64399021c5f29ae35af0ce872eaee23cd70a94726692e6cf9e591e9e6195cce305ad58c12aab756beb257113150e2adfb1e203b91ef3a06ac3424d0 From 5b4ec2376072cd8466e88233df39193d80aed0ab Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Tue, 25 Jul 2023 10:44:59 +0200 Subject: [PATCH 3/4] Update to 1.8.3 --- .gitignore | 1 + m17n-lib.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1cf883c..392e33d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ m17n-lib-1.6.1.tar.gz /m17n-lib-1.8.0.tar.gz /m17n-lib-1.8.1.tar.gz /m17n-lib-1.8.2.tar.gz +/m17n-lib-1.8.3.tar.gz diff --git a/m17n-lib.spec b/m17n-lib.spec index be2b812..8679611 100644 --- a/m17n-lib.spec +++ b/m17n-lib.spec @@ -6,7 +6,7 @@ %endif Name: m17n-lib -Version: 1.8.2 +Version: 1.8.3 Release: 1%{?dist} Summary: Multilingual text library @@ -125,6 +125,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/libm17n-gui.so.* %changelog +* Tue Jul 25 2023 Mike FABIAN - 1.8.3-1 +- Update to 1.8.3 +- Fixes to be able to create m17n-docs-1.8.3: Fix doxygen tags, change all EUC-JP files to UTF-8 + * Tue May 09 2023 Mike FABIAN - 1.8.2-1 - Update to 1.8.2 - Fix parallel builds by switching from absolute to relative paths diff --git a/sources b/sources index 51dfdc6..edead21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m17n-lib-1.8.2.tar.gz) = 715aae4ba64399021c5f29ae35af0ce872eaee23cd70a94726692e6cf9e591e9e6195cce305ad58c12aab756beb257113150e2adfb1e203b91ef3a06ac3424d0 +SHA512 (m17n-lib-1.8.3.tar.gz) = 3f162fded40b3c84fc112c265ebda7a11cf8c4010ec3506a3b20c5f014210914068d47e5338862e86e4d978ef89c6d09938ecf92b0e71a95f29a5f3681dd28b6 From d3dd8276b0278b7479b8a5a7a5f91560fdcdefe6 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Wed, 23 Aug 2023 10:31:44 +0200 Subject: [PATCH 4/4] Update to 1.8.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixes “typedef in m17n-core.h causing error when compiling with C++ code” (Resolves: https://savannah.nongnu.org/bugs/index.php?64566) --- .gitignore | 1 + m17n-lib.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 392e33d..86a0170 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ m17n-lib-1.6.1.tar.gz /m17n-lib-1.8.1.tar.gz /m17n-lib-1.8.2.tar.gz /m17n-lib-1.8.3.tar.gz +/m17n-lib-1.8.4.tar.gz diff --git a/m17n-lib.spec b/m17n-lib.spec index 8679611..840e9eb 100644 --- a/m17n-lib.spec +++ b/m17n-lib.spec @@ -6,7 +6,7 @@ %endif Name: m17n-lib -Version: 1.8.3 +Version: 1.8.4 Release: 1%{?dist} Summary: Multilingual text library @@ -125,6 +125,11 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/libm17n-gui.so.* %changelog +* Wed Aug 23 2023 Mike FABIAN - 1.8.4-1 +- Update to 1.8.4 +- Fixes “typedef in m17n-core.h causing error when compiling with C++ code” + (Resolves: https://savannah.nongnu.org/bugs/index.php?64566) + * Tue Jul 25 2023 Mike FABIAN - 1.8.3-1 - Update to 1.8.3 - Fixes to be able to create m17n-docs-1.8.3: Fix doxygen tags, change all EUC-JP files to UTF-8 diff --git a/sources b/sources index edead21..eb1e9ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m17n-lib-1.8.3.tar.gz) = 3f162fded40b3c84fc112c265ebda7a11cf8c4010ec3506a3b20c5f014210914068d47e5338862e86e4d978ef89c6d09938ecf92b0e71a95f29a5f3681dd28b6 +SHA512 (m17n-lib-1.8.4.tar.gz) = 7e322788aed8a758a8c289112433aabccd12dacf14b247ba9060503bcc44930c9251f0c4e718987b9a151de097e72bc1e07c8096f7f4ad83a7d7183a549721d6