diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libnumbertext/0001-Don-t-depend-on-en_US.UTF-8-locale.patch | 55 | ||||
| -rw-r--r-- | external/libnumbertext/ExternalPackage_numbertext.mk | 2 | ||||
| -rw-r--r-- | external/libnumbertext/UnpackedTarball_libnumbertext.mk | 6 | ||||
| -rw-r--r-- | offapi/com/sun/star/linguistic2/XNumberText.idl | 2 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 6 |
6 files changed, 7 insertions, 68 deletions
diff --git a/download.lst b/download.lst index 6ec71be2e830..61474853e2bd 100644 --- a/download.lst +++ b/download.lst @@ -162,8 +162,8 @@ export LIBGPGERROR_SHA256SUM := 4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf export LIBGPGERROR_TARBALL := libgpg-error-1.27.tar.bz2 export LIBLANGTAG_SHA256SUM := d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2 -export LIBNUMBERTEXT_SHA256SUM := e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7 -export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.5.tar.xz +export LIBNUMBERTEXT_SHA256SUM := 739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57 +export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.6.tar.xz export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483 export LIBTOMMATH_TARBALL := ltm-1.0.zip export XMLSEC_SHA256SUM := 2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8 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: diff --git a/offapi/com/sun/star/linguistic2/XNumberText.idl b/offapi/com/sun/star/linguistic2/XNumberText.idl index 0c304acebb1c..595e1f1adb5e 100644 --- a/offapi/com/sun/star/linguistic2/XNumberText.idl +++ b/offapi/com/sun/star/linguistic2/XNumberText.idl @@ -55,7 +55,7 @@ module com { module sun { module star { module linguistic2 { <li>he : Hebrew</li> <li>hr : Croatian</li> <li>hu : Hungarian</li> - <li>Hung : Old Hungarian</li> + <li>hu-Hung : Old Hungarian</li> <li>id : Indonesian</li> <li>is : Icelandic</li> <li>it : Italian</li> diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 2d15d03eb643..309ca6d8bc45 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -561,10 +561,10 @@ "dest-filename": "external/tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip" }, { - "url": "https://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz", - "sha256": "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7", + "url": "https://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz", + "sha256": "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57", "type": "file", - "dest-filename": "external/tarballs/libnumbertext-1.0.5.tar.xz" + "dest-filename": "external/tarballs/libnumbertext-1.0.6.tar.xz" }, { "url": "https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz", |