summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2018-07-01 22:22:46 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-07-04 14:34:44 +0200
commit831080baa70186ed8f59ebcaf3b0bce8763f57b4 (patch)
treeeadc9dc19311b6e72ada31dd0fa2a812b90e80ff /external
parentab89b8af4784d9edc2dbab40f14fb47d43bfbb5f (diff)
libnumbertext: update to 1.0-1
New languages: Albanian, Galician (by Adrián Chaves), Norwegian Bokmål and Nynorsk, Ukrainian (based on Russian). Reviewed-on: https://gerrit.libreoffice.org/56785 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry-picked from the commit 77f81dabfd75ef756f6ed7ba9086db19a58984c9) Change-Id: I6b40dfdafe3023edc661b0a9e9f2dedbc94364f8 Reviewed-on: https://gerrit.libreoffice.org/56808 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'external')
-rw-r--r--external/libnumbertext/ExternalPackage_numbertext.mk4
-rw-r--r--external/libnumbertext/UnpackedTarball_libnumbertext.mk6
-rw-r--r--external/libnumbertext/configure.patch10
3 files changed, 4 insertions, 16 deletions
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])
-