Switch mdds to 1.5.0 and liborcus to 0.15.0.
authorKohei Yoshida <kohei@libreoffice.org>
Mon, 12 Aug 2019 17:57:34 +0000 (13:57 -0400)
committerRene Engelhard <rene@debian.org>
Thu, 12 Dec 2019 21:52:05 +0000 (21:52 +0000)
commit4339ea1b4f8399a0fd2325b1c46cfe1b2a55c323
treea9a8b301d96072f8542f50375347d3c863060fc0
parent1e23fbd59e6280a4388ce3a9a07eb310f3c87385
Switch mdds to 1.5.0 and liborcus to 0.15.0.

Change-Id: Ibff9a5e0f0771e4cf12b4dc3985661a01195e265
Reviewed-on: https://gerrit.libreoffice.org/77482
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
(cherry picked from commit 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4)

Correctly pack mdds 1.5.0.

Turns out the earlier mdds 1.5.0 package was not correctly packaged.
I've fixed that now, and re-published the 1.5.0 package, which does
contain the patch from Lubos.

Change-Id: I1ff7d6568568860f7cccd3be3bc29aaaebe7fd73
Reviewed-on: https://gerrit.libreoffice.org/77483
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
(cherry picked from commit 1c59fed7c43654736775580799f1165e8b8740a0)

Fix linking of newly created element in liborcus 0.15.0

After 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 "Switch mdds to 1.5.0 and
liborcus to 0.15.0", CppunitTest_sc_dataprovider started to fail in ASan builds
with

> ERROR: AddressSanitizer: new-delete-type-mismatch on 0x6060005b9340 in thread T4 (XML Fetch Threa):
>   object passed to delete has wrong type:
>   size of the allocated type:   56 bytes;
>   size of the deallocated type: 16 bytes.
>  #0 in operator delete(void*, unsigned long) at llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:172:3
>  #1 in orcus::xml_map_tree::element::~element() at workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:238:13
[...]
>  #25 in std::unique_ptr<orcus::orcus_xml::impl, std::default_delete<orcus::orcus_xml::impl> >::~unique_ptr()
>  #26 in orcus::orcus_xml::~orcus_xml() at workdir/UnpackedTarball/liborcus/src/liborcus/orcus_xml.cpp:530:26
>  #27 in ScOrcusXMLContextImpl::importXML(ScOrcusImportXMLParam const&) at sc/source/filter/orcus/xmlcontext.cxx:286:5
[...]
> 0x6060005b9340 is located 0 bytes inside of 56-byte region [0x6060005b9340,0x6060005b9378)
> allocated by thread T4 (XML Fetch Threa) here:
>  #0 in operator new(unsigned long) at llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:99:3
>  #1 in orcus::xml_map_tree::element::element(char const*, orcus::pstring const&, orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type) at workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:203:26
>  #2 in std::unique_ptr<orcus::xml_map_tree::element, std::default_delete<orcus::xml_map_tree::element> > orcus::make_unique<orcus::xml_map_tree::element, char const*&, orcus::pstring, orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type>(char const*&, orcus::pstring&&, orcus::xml_map_tree::element_type&&, orcus::xml_map_tree::reference_type&&) at workdir/UnpackedTarball/liborcus/src/liborcus/../../include/orcus/global.hpp:61:35
>  #3 in orcus::xml_map_tree::element::get_or_create_child(orcus::string_pool&, char const*, orcus::pstring const&) at workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:271:9
>  #4 in orcus::xml_map_tree::get_linked_node(orcus::pstring const&, orcus::xml_map_tree::reference_type) at workdir/UnpackedTarball/liborcus/src/liborcus/xml_map_tree.cpp:722:31
[...]

Change-Id: Iad8e06ead6f2655a3e26ceeab368e9b50028402f
Reviewed-on: https://gerrit.libreoffice.org/77519
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit ffdc97898b145c9b0cebd22f0393da2c27e17a47)

external/liborcus/version.patch.0 is gone

...since 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 "Switch mdds to 1.5.0 and
liborcus to 0.15.0."

Change-Id: I03c5336bbaf65a13f883a30a3fc4238b140a9cef
Reviewed-on: https://gerrit.libreoffice.org/77521
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 6c286f807c03321a79f8aaa98c6a785da005d619)

Gbp-Pq: Name Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.diff
22 files changed:
RepositoryExternal.mk
configure.ac
external/liborcus/0001-Prevent-unsigned-integer-underflow.patch [deleted file]
external/liborcus/ExternalPackage_liborcus.mk
external/liborcus/ExternalProject_liborcus.mk
external/liborcus/Library_orcus-parser.mk
external/liborcus/Library_orcus.mk
external/liborcus/UnpackedTarball_liborcus.mk
external/liborcus/create-element.patch.0 [new file with mode: 0644]
external/liborcus/version.patch.0 [deleted file]
external/mdds/UnpackedTarball_mdds.mk
external/mdds/use-position-hint-also-back.patch [deleted file]
sc/inc/mtvelements.hxx
sc/inc/orcusxml.hxx
sc/qa/unit/dataproviders_test.cxx
sc/source/core/tool/scmatrix.cxx
sc/source/filter/inc/orcusinterface.hxx
sc/source/filter/orcus/interface.cxx
sc/source/filter/orcus/orcusfiltersimpl.cxx
sc/source/filter/orcus/xmlcontext.cxx
sc/source/ui/xmlsource/xmlsourcedlg.cxx
svl/source/misc/gridprinter.cxx