diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2018-02-14 21:04:28 -0500 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2018-02-15 04:27:37 +0100 |
| commit | 45a4e70484e7d90dab07a677914ada2d948b415c (patch) | |
| tree | efd15f248fc68121d6be0bcbd558bb10e868c0aa | |
| parent | 09fcdbd5e0ae35fb7db8c8784329035edd82573b (diff) | |
Update orcus to 0.13.3.
This will be the new baseline for master, since, though this change
is a fully API-compatible, one bug fix wrt the alpha value handling
unfortunately would break some unit tests when using an earlier
version.
Change-Id: I5a17ce4085d3311a165748154d107d12b95e2c71
Reviewed-on: https://gerrit.libreoffice.org/49784
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 101050c2ae3c..e33330cbf939 100644 --- a/configure.ac +++ b/configure.ac @@ -9026,7 +9026,7 @@ AC_SUBST(ENABLE_FUZZERS) dnl =================================================================== dnl Orcus dnl =================================================================== -libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.13 >= 0.13.0]) +libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.13 >= 0.13.3]) if test "$with_system_orcus" != "yes"; then if test "$SYSTEM_BOOST" = "TRUE"; then # =========================================================== diff --git a/download.lst b/download.lst index 70b6833e7e63..12a5f1482c7c 100644 --- a/download.lst +++ b/download.lst @@ -190,8 +190,8 @@ export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89 export OPENLDAP_TARBALL := openldap-2.4.45.tgz export OPENSSL_SHA256SUM := 8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f export OPENSSL_TARBALL := openssl-1.0.2m.tar.gz -export ORCUS_SHA256SUM := 0f8e85dc163881c358bd175227a970e3c70443109e2bb0d8d422439c31641df2 -export ORCUS_TARBALL := liborcus-0.13.2.tar.gz +export ORCUS_SHA256SUM := 62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9 +export ORCUS_TARBALL := liborcus-0.13.3.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 92e461f95e57..3ab387e734be 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -18,10 +18,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \ external/liborcus/rpath.patch.0 \ - external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch \ - external/liborcus/0002-We-are-supposed-to-use-the-foreground-color-for-soli.patch \ - external/liborcus/0001-xls-xml-Pick-up-border-colors.patch \ - external/liborcus/0001-xls-xml-Import-hidden-row-and-column-flags.patch \ )) ifeq ($(OS),WNT) |