summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2018-01-31 21:27:44 -0500
committerMike Kaganski <mike.kaganski@collabora.com>2018-02-23 07:18:56 +0100
commite81e8f8807e7dce62e91845a94920c91a69f7af5 (patch)
treeffda6c42cc07b7d6651cbbde17bbd1ddd64ddb7c /external
parent1ee5162cd58f61d645d72e51113fe4645e8629eb (diff)
Update orcus to 0.13.3 and make necessary adjustments.
This is a collection of the following: (cherry picked from commit 20945a9a4de6684010fd5b3603595e6da543807d) (cherry picked from commit a1c36eff089c3cd695bd78090575ca1c7677121e) (cherry picked from commit 45a4e70484e7d90dab07a677914ada2d948b415c) with all necessary changes to resolve conflicts & preserve correct handling of font and cell background color imports. Change-Id: I08eb3495adf74858bb23a84245a9923ebe2a13e2 Reviewed-on: https://gerrit.libreoffice.org/50213 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'external')
-rw-r--r--external/liborcus/UnpackedTarball_liborcus.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
index 7fadaa46b1c9..6941760cd71a 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,7 +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/silence-assert.patch \
external/liborcus/0001-protect-the-self-closing-xml-element-code-against-se.patch \
))