diff options
| author | László Németh <nemeth@numbertext.org> | 2018-07-01 22:22:46 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2018-07-02 14:09:59 +0200 |
| commit | 77f81dabfd75ef756f6ed7ba9086db19a58984c9 (patch) | |
| tree | 35a74234be271c37668fa9ca6b26c321dab7dbf0 | |
| parent | 10b34eb9f33a19e1189bd822244c04484ae06404 (diff) | |
libnumbertext: update to 1.0-1
New languages: Albanian, Galician (by Adrián Chaves),
Norwegian Bokmål and Nynorsk, Ukrainian (based on Russian).
Change-Id: I6b40dfdafe3023edc661b0a9e9f2dedbc94364f8
Reviewed-on: https://gerrit.libreoffice.org/56785
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libnumbertext/ExternalPackage_numbertext.mk | 4 | ||||
| -rw-r--r-- | external/libnumbertext/UnpackedTarball_libnumbertext.mk | 6 | ||||
| -rw-r--r-- | external/libnumbertext/configure.patch | 10 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 6 |
5 files changed, 9 insertions, 21 deletions
diff --git a/download.lst b/download.lst index 205234a725dd..dd3519b74a8d 100644 --- a/download.lst +++ b/download.lst @@ -148,8 +148,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 := 98dd193983c9bdd31af053ddf7687640d2365b470755c8ec669b171d18b72227 -export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.2.tar.xz +export LIBNUMBERTEXT_SHA256SUM := 349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b +export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.4.tar.xz export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483 export LIBTOMMATH_TARBALL := ltm-1.0.zip export XMLSEC_SHA256SUM := 8d8276c9c720ca42a3b0023df8b7ae41a2d6c5f9aa8d20ed1672d84cc8982d50 diff --git a/external/libnumbertext/ExternalPackage_numbertext.mk b/external/libnumbertext/ExternalPackage_numbertext.mk index c041422c2abd..995b97f7c87b 100644 --- a/external/libnumbertext/ExternalPackage_numbertext.mk +++ b/external/libnumbertext/ExternalPackage_numbertext.mk @@ -23,6 +23,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libnumbertext_numbertext,$(L data/fi.sor \ data/fr.sor \ data/fr.sor \ + data/gl.sor \ data/he.sor \ data/hr.sor \ data/hu.sor \ @@ -36,6 +37,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libnumbertext_numbertext,$(L data/lt.sor \ data/lv.sor \ data/ms.sor \ + data/no.sor \ data/nl.sor \ data/pl.sor \ data/pt.sor \ @@ -44,11 +46,13 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libnumbertext_numbertext,$(L data/ru.sor \ data/sh.sor \ data/sl.sor \ + data/sq.sor \ data/sr.sor \ data/Suzhou.sor \ data/sv.sor \ data/th.sor \ data/tr.sor \ + data/uk.sor \ data/vi.sor \ data/zh.sor \ )) diff --git a/external/libnumbertext/UnpackedTarball_libnumbertext.mk b/external/libnumbertext/UnpackedTarball_libnumbertext.mk index f5c1607562e3..ac2a14133205 100644 --- a/external/libnumbertext/UnpackedTarball_libnumbertext.mk +++ b/external/libnumbertext/UnpackedTarball_libnumbertext.mk @@ -13,10 +13,4 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libnumbertext,$(LIBNUMBERTEXT_TARBA $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libnumbertext)) -$(eval $(call gb_UnpackedTarball_set_patchlevel,libnumbertext,0)) - -$(eval $(call gb_UnpackedTarball_add_patches,libnumbertext, \ - external/libnumbertext/configure.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libnumbertext/configure.patch b/external/libnumbertext/configure.patch deleted file mode 100644 index f31ab31cdc57..000000000000 --- a/external/libnumbertext/configure.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -22,7 +22,6 @@ - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_LANG([C++]) --CXXFLAGS='-Wall -std=c++11' - - AC_CHECK_HEADERS([codecvt regex]) - diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 7554a0ddc8c3..a8478dc2d12b 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -585,10 +585,10 @@ "dest-filename": "external/tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip" }, { - "url": "https://dev-www.libreoffice.org/src/libnumbertext-1.0.2.tar.xz", - "sha256": "98dd193983c9bdd31af053ddf7687640d2365b470755c8ec669b171d18b72227", + "url": "https://dev-www.libreoffice.org/src/libnumbertext-1.0.4.tar.xz", + "sha256": "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b", "type": "file", - "dest-filename": "external/tarballs/libnumbertext-1.0.2.tar.xz" + "dest-filename": "external/tarballs/libnumbertext-1.0.4.tar.xz" }, { "url": "https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf", |