diff options
| -rw-r--r-- | download.lst | 2 | ||||
| -rw-r--r-- | libodfgen/UnpackedTarball_libodfgen.mk | 6 | ||||
| -rw-r--r-- | libodfgen/libodfgen-0.0.0-android.patch | 13 |
3 files changed, 1 insertions, 20 deletions
diff --git a/download.lst b/download.lst index 1420a5da3113..06da5adabc7b 100644 --- a/download.lst +++ b/download.lst @@ -69,7 +69,7 @@ export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz export NSS_TARBALL := a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz -export ODFGEN_TARBALL := 396ac8b0a49175f7139e4aa8917e742e-libodfgen-0.0.0.tar.bz2 +export ODFGEN_TARBALL := d77fa4a6e3e485553e30ced8d9bb3b50-libodfgen-0.0.1.tar.bz2 export OPENSSL_TARBALL := 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 diff --git a/libodfgen/UnpackedTarball_libodfgen.mk b/libodfgen/UnpackedTarball_libodfgen.mk index 3a191d283ac4..1a7f26cf9a8c 100644 --- a/libodfgen/UnpackedTarball_libodfgen.mk +++ b/libodfgen/UnpackedTarball_libodfgen.mk @@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libodfgen)) $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,1)) - -$(eval $(call gb_UnpackedTarball_add_patches,libodfgen,\ - libodfgen/libodfgen-0.0.0-android.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/libodfgen/libodfgen-0.0.0-android.patch b/libodfgen/libodfgen-0.0.0-android.patch deleted file mode 100644 index 2fea2caae07e..000000000000 --- a/libodfgen/libodfgen-0.0.0-android.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/OdgGenerator.cxx b/src/OdgGenerator.cxx -index 39d571b..5ebf60d 100644 ---- a/src/OdgGenerator.cxx -+++ b/src/OdgGenerator.cxx -@@ -282,7 +282,7 @@ static WPXString doubleToString(const double value) - { - WPXString tempString; - tempString.sprintf("%.4f", value); --#ifndef ANDROID -+#ifndef __ANDROID__ - std::string decimalPoint(localeconv()->decimal_point); - #else - std::string decimalPoint("."); |