diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-04-11 19:40:07 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-04-13 01:54:40 -0400 |
| commit | f14e7094f8683ffedbe9173da4f19d32f89d2a47 (patch) | |
| tree | d9a6e85a20217127f9cbc8837157557583c62cdd | |
| parent | 9dbf503b434aeee1a405725d97d2aa2b89625336 (diff) | |
Update the internal liborcus package to 0.5.0.
Change-Id: Ib0070ad8509ba4084a8b0871fbc8c24b550433d7
| -rw-r--r-- | download.lst | 2 | ||||
| -rw-r--r-- | liborcus/ExternalPackage_liborcus.mk | 4 | ||||
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/download.lst b/download.lst index f0888a2e9258..4399a4f89e65 100644 --- a/download.lst +++ b/download.lst @@ -68,7 +68,7 @@ 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 OPENSSL_TARBALL := 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz -export ORCUS_TARBALL := 8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 +export ORCUS_TARBALL := 8a43b3de758dcd529b16ac96b46069fb-liborcus-0.5.0.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 diff --git a/liborcus/ExternalPackage_liborcus.mk b/liborcus/ExternalPackage_liborcus.mk index 159faac67c68..d47e6082d691 100644 --- a/liborcus/ExternalPackage_liborcus.mk +++ b/liborcus/ExternalPackage_liborcus.mk @@ -12,9 +12,9 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,orcus)) $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus)) ifeq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/orcus.lib,src/liborcus/.libs/liborcus-0.4.lib)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/orcus.lib,src/liborcus/.libs/liborcus-0.6.lib)) else -$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.4.a)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.6.a)) endif # vim: set noet sw=4 ts=4: diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 21db3673c309..4be704031956 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -37,7 +37,6 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : --with-pic \ --enable-static \ --disable-shared \ - --without-libzip \ --disable-debug \ --disable-spreadsheet-model \ --disable-werror \ |