Accepting request 829039 from home:dirkmueller:branches:M17N

- update to 1.8.0:
  This release is just for bug fixing. 
- remove m17n-lib-1.7.0-fix-crash-in-marathi-transliteration.patch,
  m17n-lib-fix-warnings.diff: upstream

OBS-URL: https://build.opensuse.org/request/show/829039
OBS-URL: https://build.opensuse.org/package/show/M17N/m17n-lib?expand=0&rev=25

m17n-lib-1.7.0-fix-crash-in-marathi-transliteration.patch

@@ -1,43 +0,0 @@
-From 868093b0b0504da6693f5e868e7deb468009b5af Mon Sep 17 00:00:00 2001
-From: Mike FABIAN <mfabian@redhat.com>
-Date: Wed, 26 Aug 2015 15:42:28 +0200
-Subject: [PATCH] Bug 1256244 - Transliteration not working on Marathi language
-
----
- src/input.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/input.c b/src/input.c
-index 1160085..5a86b10 100644
---- a/src/input.c
-+++ b/src/input.c
-@@ -1083,7 +1083,7 @@ load_translation (MIMMap *map, MPlist *keylist, MPlist *map_actions,
-       len = MPLIST_LENGTH (elt);
-       if (MFAILP (len > 0))
- 	return -1;
--      keyseq = (MSymbol *) alloca (sizeof (int) * len);
-+      keyseq = (MSymbol *) alloca (sizeof (MSymbol) * len);
-       for (i = 0; i < len; i++, elt = MPLIST_NEXT (elt))
- 	{
- 	  if (MPLIST_INTEGER_P (elt))
-@@ -4264,7 +4264,7 @@ filter (MInputContext *ic, MSymbol key, void *arg)
-   if (ic_info->commit_key_head > 0)
-     {
-       memmove (ic_info->keys, ic_info->keys + ic_info->commit_key_head,
--	       sizeof (int) * (ic_info->used - ic_info->commit_key_head));
-+	       sizeof (MSymbol *) * (ic_info->used - ic_info->commit_key_head));
-       ic_info->used -= ic_info->commit_key_head;
-       ic_info->key_head -= ic_info->commit_key_head;
-       ic_info->state_key_head -= ic_info->commit_key_head;
-@@ -4278,7 +4278,7 @@ filter (MInputContext *ic, MSymbol key, void *arg)
-       if (ic_info->key_head > 0)
- 	{
- 	  memmove (ic_info->keys, ic_info->keys + ic_info->key_head,
--		   sizeof (int) * (ic_info->used - ic_info->key_head));
-+		   sizeof (MSymbol *) * (ic_info->used - ic_info->key_head));
- 	  ic_info->used -= ic_info->key_head;
- 	  ic_info->key_head = ic_info->state_key_head
- 	    = ic_info->commit_key_head = 0;
--- 
-2.4.3
-

m17n-lib-1.7.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8eb853e1e0c86a70a09871f3264f950e5d62bba98960b3ffcde11511c138db83
-size 1063169

m17n-lib-fix-warnings.diff

@@ -1,36 +0,0 @@
----
- src/font.c    |    5 +++--
- src/fontset.c |    1 -
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/src/font.c
-+++ b/src/font.c
-@@ -1354,7 +1354,7 @@
- {
-   int i;
-   MSymbol spec_list[MFONT_REGISTRY + 1];
--  MSymbol registry;
-+  MSymbol registry = Mnil;
-   char *reg;
- 
-   MFONT_INIT (spec);
-@@ -1365,7 +1365,8 @@
- 	MERROR (MERROR_FONT, Mnil);	
-       spec_list[i] = MPLIST_SYMBOL (plist);
-     }
--  registry = spec_list[i - 1];
-+  if (i > 0)
-+    registry = spec_list[i - 1];
-   if (i > 1 && registry != Mnil)
-     {
-       reg = MSYMBOL_NAME (registry);
---- a/src/fontset.c
-+++ b/src/fontset.c
-@@ -846,7 +846,6 @@
- 
- 	if (MPLIST_KEY (plist) != Mlatin)
- 	  request.property[MFONT_FOUNDRY]
--	    = request.property[MFONT_FAMILY]
- 	    = request.property[MFONT_FAMILY] = 0;
- 	if ((per_lang = mplist_get (MPLIST_PLIST (plist), language))
- 	    && (rfont = try_font_group (realized, &request, per_lang,

m17n-lib.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug 24 19:59:25 UTC 2020 - Dirk Mueller <dmueller@suse.com>
+
+- update to 1.8.0:
+  This release is just for bug fixing. 
+
+- remove m17n-lib-1.7.0-fix-crash-in-marathi-transliteration.patch,
+  m17n-lib-fix-warnings.diff: upstream
+
 -------------------------------------------------------------------
 Sat Aug 12 16:17:23 UTC 2017 - jengelh@inai.de
 

m17n-lib.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package m17n-lib
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,23 +12,21 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %define	appdefdir  %{_datadir}/X11
 Name:           m17n-lib
-Version:        1.7.0
+Version:        1.8.0
 Release:        0
 Summary:        Multilingual Text Processing Library for the C Language
-License:        LGPL-2.1+ AND GPL-2.0+
+License:        LGPL-2.1-or-later AND GPL-2.0-or-later
 Group:          System/I18n/Japanese
-Url:            http://www.m17n.org/m17n-lib/
+URL:            https://www.m17n.org/m17n-lib/
 Source0:        http://download.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz
 Source1:        m17n-lib-rpmlintrc
 Source2:        baselibs.conf
-Patch0:         m17n-lib-fix-warnings.diff
-Patch1:         m17n-lib-1.7.0-fix-crash-in-marathi-transliteration.patch
 BuildRequires:  fdupes
 BuildRequires:  libotf-devel
 BuildRequires:  pkgconfig
@@ -58,28 +56,27 @@ This package contains shared libraries.
 %package devel
 Summary:        Multilingual text processing library for the C language
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
+BuildRequires:  pkgconfig
-Requires:       glibc-devel
 BuildRequires:  pkgconfig(xaw7)
 BuildRequires:  pkgconfig(xft)
+Requires:       %{name} = %{version}
+Requires:       glibc-devel
 
 %description devel
 A multilingual text processing library for the C language
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure \
   --disable-static
 # Not thread safe at all
-make -j1
+%make_build -j1
 
 %check
 export MALLOC_CHECK_=2
-make -j1 check
+%make_build -j1 check
 unset MALLOC_CHECK_
 
 %install
@@ -105,7 +102,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %postun -n libm17n0 -p /sbin/ldconfig
 
 %files
-%doc AUTHORS COPYING NEWS README ChangeLog
+%license COPYING
+%doc AUTHORS NEWS README ChangeLog
 %{_bindir}/*
 %dir %{appdefdir}/??
 %dir %{appdefdir}/??_*