[Libreoffice-commits] core.git: download.lst external/liborcus

[Kohei Yoshida]

 download.lst                                  |    4 ++--
 external/liborcus/UnpackedTarball_liborcus.mk |    1 -
 external/liborcus/silence-assert.patch        |   11 -----------
 3 files changed, 2 insertions(+), 14 deletions(-)

New commits:
commit e13acfcac9571da7efeec8fe5b27b11249d51c27
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Mon Jan 29 18:13:50 2018 -0500

    Update liborcus to 0.13.2.
    
    Change-Id: I485757eb743e066730509202a3c077e5d822a311
    Reviewed-on: https://gerrit.libreoffice.org/48863
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/download.lst b/download.lst
index 038dfdd5838e..c19ddcbef60a 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 := d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937
-export ORCUS_TARBALL := liborcus-0.13.1.tar.gz
+export ORCUS_SHA256SUM := 0f8e85dc163881c358bd175227a970e3c70443109e2bb0d8d422439c31641df2
+export ORCUS_TARBALL := liborcus-0.13.2.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 0dc6627de4a2..3ab387e734be 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 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/silence-assert.patch b/external/liborcus/silence-assert.patch
deleted file mode 100644
index fb0bba200df7..000000000000
--- a/external/liborcus/silence-assert.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- liborcus/src/parser/sax_parser_base.cpp	2017-11-23 15:26:54.307416084 +0000
-+++ liborcus/src/parser/sax_parser_base.cpp	2017-11-16 00:38:32.000000000 +0000
-@@ -296,7 +296,7 @@
-         str = pstring(buf.get(), buf.size());
- 
-     // Skip the closing quote.
--    assert(cur_char() == '"');
-+    assert(!has_char() || cur_char() == '"');
-     next();
- }
-