From bde7824c785da3dcdc8d377675b7a865005b2ec5fa14df666e64125c772e1e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 27 Mar 2020 15:15:12 +0000 Subject: [PATCH] Accepting request 789056 from home:marxin:branches:LibreOffice:Factory - Fix boo#1158318 by gcc10-Fix-a-typo-in-wide-string-conversion-function-49.patch. OBS-URL: https://build.opensuse.org/request/show/789056 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/hfst-ospell?expand=0&rev=14 --- ...n-wide-string-conversion-function-49.patch | 27 +++++++++++++++++++ hfst-ospell.changes | 6 +++++ hfst-ospell.spec | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 gcc10-Fix-a-typo-in-wide-string-conversion-function-49.patch diff --git a/gcc10-Fix-a-typo-in-wide-string-conversion-function-49.patch b/gcc10-Fix-a-typo-in-wide-string-conversion-function-49.patch new file mode 100644 index 0000000..9b73be0 --- /dev/null +++ b/gcc10-Fix-a-typo-in-wide-string-conversion-function-49.patch @@ -0,0 +1,27 @@ +From a9d5afb14aa71893f142dfd3ae735e8930aa0f8a Mon Sep 17 00:00:00 2001 +From: Martin Liska +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 + diff --git a/hfst-ospell.changes b/hfst-ospell.changes index 4b1202e..13f3171 100644 --- a/hfst-ospell.changes +++ b/hfst-ospell.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 27 14:25:33 UTC 2020 - Martin Liška + +- Fix boo#1158318 by + gcc10-Fix-a-typo-in-wide-string-conversion-function-49.patch. + ------------------------------------------------------------------- Thu Jan 16 13:08:18 UTC 2020 - Tomáš Chvátal diff --git a/hfst-ospell.spec b/hfst-ospell.spec index 5652e75..7a2cd15 100644 --- a/hfst-ospell.spec +++ b/hfst-ospell.spec @@ -27,6 +27,7 @@ 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 BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig @@ -56,6 +57,7 @@ Development headers and libraries for hfst-ospell %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build # disable libxml++ as upstream requires version 2.6