diff options
author | Kohei Yoshida <kohei@libreoffice.org> | 2019-08-22 16:48:50 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei@libreoffice.org> | 2019-08-23 01:41:23 +0200 |
commit | 52800fd6d9867252b795b6afacce19f66b5a5107 (patch) | |
tree | c1c8cb6d55abc43fda48517d7dde2da38d949c30 | |
parent | ff398785bede2b403f8f8e6391ce07538f6cc213 (diff) |
Update orcus to 0.15.1.
Change-Id: Ifd945d03719bf2ed1fb145b405f1ea9297ebeb68
Reviewed-on: https://gerrit.libreoffice.org/77983
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
-rw-r--r-- | download.lst | 4 | ||||
-rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 1 | ||||
-rw-r--r-- | external/liborcus/create-element.patch.0 | 55 |
3 files changed, 2 insertions, 58 deletions
diff --git a/download.lst b/download.lst index c0217d93b9d0..1b2d943defe8 100644 --- a/download.lst +++ b/download.lst @@ -194,8 +194,8 @@ export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89 export OPENLDAP_TARBALL := openldap-2.4.45.tgz export OPENSSL_SHA256SUM := ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6 export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz -export ORCUS_SHA256SUM := 06ec7567896d76ca579efada794cc281a5d6b427195def01cbcfd79795e8a944 -export ORCUS_TARBALL := liborcus-0.15.0.tar.gz +export ORCUS_SHA256SUM := ab835e131c861401d52a30a74d0c83f175650f3f45460ae95bbf95493cab2579 +export ORCUS_TARBALL := liborcus-0.15.1.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 834b8128d39f..e1aef32edcf7 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -22,7 +22,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/rpath.patch.0 \ external/liborcus/gcc9.patch.0 \ external/liborcus/libtool.patch.0 \ - external/liborcus/create-element.patch.0 \ )) ifeq ($(OS),WNT) diff --git a/external/liborcus/create-element.patch.0 b/external/liborcus/create-element.patch.0 deleted file mode 100644 index b1012e5c90d8..000000000000 --- a/external/liborcus/create-element.patch.0 +++ /dev/null @@ -1,55 +0,0 @@ ---- src/liborcus/xml_map_tree.cpp -+++ src/liborcus/xml_map_tree.cpp -@@ -723,35 +723,28 @@ - element* elem = r.first; - bool created = r.second; - -- if (created) -- { -- // No element of that name exists. -- elem->elem_type = element_linked; -- elem->ref_type = ref_type; -- } -- else -+ if (!created) - { - // This element already exists. Check if this is already linked. - if (elem->ref_type != reference_unknown || elem->elem_type != element_unlinked) - throw xpath_error("This element is already linked. You can't link the same element twice."); -- -- // Turn this existing non-linked element into a linked one. -- delete elem->child_elements; -- elem->elem_type = element_linked; -- elem->ref_type = ref_type; -- switch (ref_type) -- { -- case reference_cell: -- elem->cell_ref = new cell_reference; -- break; -- case reference_range_field: -- elem->field_ref = new field_in_range; -- break; -- default: -- throw general_error("Unknown reference type in xml_map_tree::get_element_stack."); -- } -- - } -+ -+ // Turn this existing non-linked element into a linked one. -+ delete elem->child_elements; -+ elem->elem_type = element_linked; -+ elem->ref_type = ref_type; -+ switch (ref_type) -+ { -+ case reference_cell: -+ elem->cell_ref = new cell_reference; -+ break; -+ case reference_range_field: -+ elem->field_ref = new field_in_range; -+ break; -+ default: -+ throw general_error("Unknown reference type in xml_map_tree::get_element_stack."); -+ } - - ret.elem_stack.push_back(elem); - ret.node = elem; |