Compare commits

...

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

11 changed files with 104 additions and 70 deletions

8
.gitignore vendored
View File

@ -1,7 +1 @@
m17n-lib-1.6.1.tar.gz SOURCES/m17n-lib-1.8.0.tar.gz
/m17n-lib-1.6.2.tar.gz
/m17n-lib-1.6.3.tar.gz
/m17n-lib-1.6.4.tar.gz
/m17n-lib-1.7.0.tar.gz
/m17n-lib-1.8.0RC.tar.gz
/m17n-lib-1.8.0.tar.gz

1
.m17n-lib.metadata Normal file
View File

@ -0,0 +1 @@
298923e2f7f6b8763769b74c8b2da8fe4d13ecce SOURCES/m17n-lib-1.8.0.tar.gz

View File

@ -0,0 +1,27 @@
From 4d815754f9f32c54ec47f9e323940f6332a7cb5d Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
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

View File

@ -1,13 +1,22 @@
# note this duplicates native anthy IMEs
%if 0%{?fedora}
%bcond_without anthy
%else
%bcond_with anthy
%endif
Name: m17n-lib Name: m17n-lib
Version: 1.8.0 Version: 1.8.0
Release: 2%{?dist} Release: 13%{?dist}
Summary: Multilingual text library Summary: Multilingual text library
License: LGPLv2+ License: LGPLv2+
URL: http://www.nongnu.org/m17n/ URL: http://www.nongnu.org/m17n/
Source0: http://download.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz Source0: http://download.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz
Patch0: %{name}-1.8.0-multilib.patch 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 BuildRequires: m17n-db-devel libthai-devel
BuildRequires: libxml2-devel libXft-devel BuildRequires: libxml2-devel libXft-devel
BuildRequires: fontconfig-devel freetype-devel BuildRequires: fontconfig-devel freetype-devel
@ -16,6 +25,14 @@ BuildRequires: libXaw-devel libotf-devel
BuildRequires: autoconf gettext-devel BuildRequires: autoconf gettext-devel
BuildRequires: automake libtool BuildRequires: automake libtool
# The upstream source contains part of gnulib
# library which includes directories intl and m4
Provides: bundled(gnulib)
%if %{with anthy}
BuildRequires: anthy-devel
%endif
Requires: m17n-db Requires: m17n-db
%description %description
@ -24,6 +41,15 @@ the input of many languages with the input table maps from m17n-db.
The package provides the core and input method backend libraries. The package provides the core and input method backend libraries.
%if %{with anthy}
%package anthy
Summary: Anthy module for m17n
Requires: %{name}%{?_isa} = %{version}-%{release}
%description anthy
Anthy module for %{name} allows ja-anthy.mim to support input conversion.
%endif
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Requires: %{name}-tools = %{version}-%{release} Requires: %{name}-tools = %{version}-%{release}
@ -42,7 +68,7 @@ Tools to test M17n GUI widget library.
%prep %prep
%autosetup %autosetup -p1
%build %build
#autoreconf -ivf #autoreconf -ivf
@ -59,16 +85,15 @@ make install DESTDIR=%{buildroot} INSTALL="install -p"
# fix bug rh#680363 # fix bug rh#680363
rm %{buildroot}%{_libdir}/m17n/1.0/libmimx-ispell.so rm %{buildroot}%{_libdir}/m17n/1.0/libmimx-ispell.so
# fix for bug rh#1587975 %if %{without anthy}
rm %{buildroot}%{_libdir}/m17n/1.0/libmimx-anthy.so rm %{buildroot}%{_libdir}/m17n/1.0/libmimx-anthy.so
%endif
find %{buildroot} -name '*.la' -exec rm -f {} ';' find %{buildroot} -name '*.la' -exec rm -f {} ';'
%post -p /sbin/ldconfig %ldconfig_scriptlets
%postun -p /sbin/ldconfig
%post tools -p /sbin/ldconfig %ldconfig_scriptlets tools
%postun tools -p /sbin/ldconfig
%files %files
%doc AUTHORS NEWS ChangeLog README %doc AUTHORS NEWS ChangeLog README
@ -81,6 +106,12 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/libm17n-core.so.* %{_libdir}/libm17n-core.so.*
%{_libdir}/libm17n-flt.so.* %{_libdir}/libm17n-flt.so.*
#Anthy module
%if %{with anthy}
%files anthy
%{_libdir}/m17n/1.0/libmimx-anthy.so
%endif
%files devel %files devel
%{_includedir}/* %{_includedir}/*
%{_libdir}/lib*.so %{_libdir}/lib*.so
@ -96,9 +127,43 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/libm17n-gui.so.* %{_libdir}/libm17n-gui.so.*
%changelog %changelog
* Wed Jun 06 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-2 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.8.0-13
- Drop Anthy support in favor of libkkc - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
- Resolves: rh#1587975 Related: rhbz#1991688
* Mon Jun 07 2021 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-12
- Resolves:rhbz#1967892 - Add conditional for anthy module subpackage
* Tue May 25 2021 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-11
- Resolves:rhbz#1961998 - Add gating tests from rhel-8
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.8.0-10
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Apr 30 2019 Mike FABIAN <mfabian@redhat.com> - 1.8.0-5
- Fix segmentation fault when using ibus-m17n with vi-telex in gedit in Gnome Wayland
- Resolves: rhbz#1704156
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Nov 26 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-3
- Added Provides: bundled(gnulib)
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sat Feb 10 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-1 * Sat Feb 10 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-1
- Update to 1.8.0 version (#1543670) - Update to 1.8.0 version (#1543670)

View File

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

View File

@ -1 +0,0 @@
SHA512 (m17n-lib-1.8.0.tar.gz) = 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd

View File

@ -1,15 +0,0 @@
hallo
እው ሰላም ነው
مرحبا
হ্যালো
你好
Ciao
こんにちは
नमस्कार
ਸਤ ਸ੍ਰੀ ਅਕਾਲ
Привет
හෙලෝ
வணக்கம்
สวัสดี
ہیلو
xin chào

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

View File

@ -1,20 +0,0 @@
#!/bin/bash
# If one of the commands below returns non-zero then exit immediately
set -e
echo "Testing m17n-dump tool"
old_size=`stat -c "%s" old.png`
echo "old_size is $old_size"
m17n-dump hello.txt
new_size=`stat -c "%s" hello.txt.png`
echo "new_size is $new_size"
file old.png hello.txt.png
echo "Using font `fc-match`"
if [ $old_size -ne $new_size ]; then
echo "m17n-dump generated different png file"
else
echo "m17n-dump generated same png file"
fi

View File

@ -1,11 +0,0 @@
---
- hosts: localhost
tags:
- classic
roles:
- role: standard-test-basic
tests:
- smoke
required_packages:
- m17n-lib-tools
- m17n-lib-devel