Sync from SUSE:SLFO:Main hfst-ospell revision 579b129ae8cac3d214b6dcb2480e1636

This commit is contained in:
Adrian Schröter 2024-10-03 17:19:23 +02:00
parent b7a018deac
commit b88c8a5b9e
6 changed files with 28 additions and 60 deletions

View File

@ -1,27 +0,0 @@
From a9d5afb14aa71893f142dfd3ae735e8930aa0f8a Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Mon, 16 Mar 2020 11:32:10 +0100
Subject: [PATCH] Fix a typo in wide string conversion function (#49).
Revert a hunk from:
04e4843e4c66beb61b756f3ceb2ac94628142185.
---
main.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.cc b/main.cc
index abecf46..e4fd676 100644
--- a/main.cc
+++ b/main.cc
@@ -61,7 +61,7 @@ static bool suggest_reals = false;
#ifdef WINDOWS
static std::string wide_string_to_string(const std::wstring & wstr)
{
- int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)§wstr.size(), NULL, 0, NULL, NULL);
+ int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), NULL, 0, NULL, NULL);
std::string str( size_needed, 0 );
WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), &str[0], size_needed, NULL, NULL);
return str;
--
2.26.0

View File

@ -1,21 +0,0 @@
From 7481bffbf622bc9aee3547183fbe8db9cf8b22ce Mon Sep 17 00:00:00 2001
From: Tino Didriksen <mail@tinodidriksen.com>
Date: Sun, 3 Jul 2022 23:16:52 +0200
Subject: [PATCH] Include cstdint (fixes #57)
---
hfst-ol.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/hfst-ol.h b/hfst-ol.h
index 0a83ec5..ee59b14 100644
--- a/hfst-ol.h
+++ b/hfst-ol.h
@@ -28,6 +28,7 @@
#include <climits>
#include <cstdio>
#include <cstdlib>
+#include <cstdint>
#include <iostream>
#include <cstring>
#include <set>

BIN
hfst-ospell-0.5.4.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri May 10 10:05:10 UTC 2024 - Timo Jyrinki <tjyrinki@suse.com>
- Update to 0.5.4, notable changes:
* Fix minor memory leak
* Try first-lower varianta instead of first-upper and all-lower
* Re-set limits every step
* Caching improvements
* Fix build issues
- Drop gcc build patches, included upstream.
* - gcc10-Fix-a-typo-in-wide-string-conversion-function-49.patch
* - gcc13-fix.patch
-------------------------------------------------------------------
Thu Feb 22 07:56:38 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %autosetup macro. Allows to eliminate the usage of deprecated
%patchN
-------------------------------------------------------------------
Thu Mar 9 07:04:33 UTC 2023 - Martin Liška <mliska@suse.cz>

View File

@ -1,7 +1,7 @@
#
# spec file for package hfst-ospell
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,10 +16,10 @@
#
%define _name hfstospell
%define _name hfst-ospell
%define libname libhfstospell11
Name: hfst-ospell
Version: 0.5.1
Version: 0.5.4
Release: 0
Summary: Spell checker library and tool based on HFST
License: Apache-2.0
@ -27,8 +27,6 @@ Group: Productivity/Text/Spell
URL: https://hfst.github.io/
Source0: https://github.com/hfst/%{name}/releases/download/v%{version}/%{_name}-%{version}.tar.gz
Source99: baselibs.conf
Patch0: gcc10-Fix-a-typo-in-wide-string-conversion-function-49.patch
Patch1: gcc13-fix.patch
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: pkgconfig
@ -57,14 +55,13 @@ Requires: hfst-ospell = %{version}-%{release}
Development headers and libraries for hfst-ospell
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%autosetup -p1 -n %{_name}-%{version}
%build
# disable libxml++ as upstream requires version 2.6
# disable tinyxml2 as upstream requires version < 3.0
export CXXFLAGS="%{optflags} -DU_USING_ICU_NAMESPACE=1"
NO_CONFIGURE=1 ./autogen.sh
%configure \
--disable-static \
--disable-silent-rules \
@ -83,7 +80,7 @@ make %{?_smp_mflags} check
%postun -n %{libname} -p /sbin/ldconfig
%files
%doc AUTHORS NEWS README
%doc AUTHORS NEWS
%{_bindir}/*
%{_mandir}/man1/*

BIN
hfstospell-0.5.1.tar.gz (Stored with Git LFS)

Binary file not shown.