diff options
author | László Németh <nemeth@numbertext.org> | 2020-06-01 17:32:49 +0200 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2020-06-03 19:41:37 +0200 |
commit | 38f91bb2ced2eb3685229a05120308cd0c213ebc (patch) | |
tree | f60af039afc45e05db9c3290a6764941385a5e32 /external | |
parent | 172c290f86b961fb786b48d18a81004c7fa14867 (diff) |
bump to libnumbertext 1.0.6
Fixes in various languages, also word transliteration
support in Old Hungarian (renamed to hu_Hung.sor).
Change-Id: I2eed60142273b8c353304a5b714f4e4bde5af1b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95302
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry-picked from commit 2d6395b87218cbf3512aa9b54807a859205006f0)
Change-Id: Idde4c5af647a5ef983201d7c746090d3cd935e89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95377
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
Diffstat (limited to 'external')
3 files changed, 1 insertions, 62 deletions
diff --git a/external/libnumbertext/0001-Don-t-depend-on-en_US.UTF-8-locale.patch b/external/libnumbertext/0001-Don-t-depend-on-en_US.UTF-8-locale.patch deleted file mode 100644 index 4a454a098007..000000000000 --- a/external/libnumbertext/0001-Don-t-depend-on-en_US.UTF-8-locale.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 59a04cb70b261ad77baf671d5059a836ba339bbd Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Tue, 30 Oct 2018 13:51:02 +0100 -Subject: [PATCH] Don't depend on en_US.UTF-8 locale - -Instead, create locale with codecvt_utf8 facet on all platforms (even if -codecvt_utf8 is deprecated since C++17). There is no guarantee that -"en_US.UTF-8" is a supported locale name, so the locale constructor might throw -a runtime_error. (See the discussion in the comments to -<https://gerrit.libreoffice.org/#/c/62508/> "Add check for en_US.utf8 locale" -for a real-live example of issues caused by that.) - -(And the <codecvt> and <locale> headers apparently need to be included always, -regardless of NUMBERTEXT_BOOST.) ---- - src/Numbertext.cxx | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/src/Numbertext.cxx b/src/Numbertext.cxx -index 8cf5198..5f05b48 100644 ---- a/src/Numbertext.cxx -+++ b/src/Numbertext.cxx -@@ -2,6 +2,8 @@ - * 2018 (c) László Németh - * License: LGPL/BSD dual license */ - -+#include <codecvt> -+#include <locale> - #include <sstream> - #include <fstream> - -@@ -11,8 +13,6 @@ - #include <boost/locale/encoding_utf.hpp> - using namespace boost; - #else -- #include <codecvt> -- #include <locale> - using namespace std; - #endif - -@@ -25,11 +25,7 @@ bool readfile(const std::string& filename, std::wstring& result) - std::wifstream wif(filename); - if (wif.fail()) - return false; --#ifdef _MSC_VER - wif.imbue(std::locale(std::locale(), new std::codecvt_utf8<wchar_t>)); --#else -- wif.imbue(std::locale("en_US.UTF-8")); --#endif - std::wstringstream wss; - wss << wif.rdbuf(); - result = wss.str(); --- -2.19.1 - diff --git a/external/libnumbertext/ExternalPackage_numbertext.mk b/external/libnumbertext/ExternalPackage_numbertext.mk index 330a7fe21a3e..5379d08fc53a 100644 --- a/external/libnumbertext/ExternalPackage_numbertext.mk +++ b/external/libnumbertext/ExternalPackage_numbertext.mk @@ -28,7 +28,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libnumbertext_numbertext,$(L data/he.sor \ data/hr.sor \ data/hu.sor \ - data/Hung.sor \ + data/hu_Hung.sor \ data/id.sor \ data/is.sor \ data/it.sor \ diff --git a/external/libnumbertext/UnpackedTarball_libnumbertext.mk b/external/libnumbertext/UnpackedTarball_libnumbertext.mk index 67b147393e31..1969dcf7d08d 100644 --- a/external/libnumbertext/UnpackedTarball_libnumbertext.mk +++ b/external/libnumbertext/UnpackedTarball_libnumbertext.mk @@ -15,10 +15,4 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libnumbertext)) $(eval $(call gb_UnpackedTarball_set_patchlevel,libnumbertext,1)) -# external/libnumbertext/0001-Don-t-depend-on-en_US.UTF-8-locale.patch is upstream at -# <https://github.com/Numbertext/libnumbertext/pull/43>: -$(eval $(call gb_UnpackedTarball_add_patches,libnumbertext, \ - external/libnumbertext/0001-Don-t-depend-on-en_US.UTF-8-locale.patch \ -)) - # vim: set noet sw=4 ts=4: |