mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update liborcus to 0.15.2.

Browse Source 
Change-Id: I1a16e7ba9a096862933536268dacf5ab49476896
Reviewed-on: https://gerrit.libreoffice.org/78246
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
This commit is contained in:
Kohei Yoshida
2019-08-28 22:16:27 -04:00
parent 4e144c1ab2
commit df2b4a9daa
3 changed files with 2 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
download.lst
View File

@@ -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 := ab835e131c861401d52a30a74d0c83f175650f3f45460ae95bbf95493cab2579
export ORCUS_TARBALL := liborcus-0.15.1.tar.gz
export ORCUS_SHA256SUM := aa9bd86da242bf67de1cb0785afd457b5398798c8a86d6c5492c9e6c3d3e8aa4
export ORCUS_TARBALL := liborcus-0.15.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

130
external/liborcus/0001-Blind-fix-attempt-for-older-macOS-builds.patch vendored
View File

@@ -1,130 +0,0 @@
From a0d47fff81ac100192ada343574da75d992dd00d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 23 Aug 2019 10:26:51 +0200
Subject: [PATCH] Blind fix attempt for older macOS builds
...like <https://ci.libreoffice.org/job/gerrit_mac/40711/> (which builds with
MacOSX10.13.sdk, but not sure with what Clang and libc++ versions):
> In file included from xml_map_tree.cpp:8:
> In file included from ./xml_map_tree.hpp:11:
> In file included from ../../include/orcus/pstring.hpp:14:
> In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/string:470:
> In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/string_view:169:
> In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/__string:56:
> In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/algorithm:643:
> In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/memory:653:
> /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/tuple:227:10: error: static_assert failed "Attempted to construct a reference element in a tuple with an rvalue"
> {static_assert(__can_bind_reference<_Tp>(),
> ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/tuple:385:13: note: in instantiation of function template specialization 'std::__1::__tuple_leaf<2, const orcus::pstring &, false>::__tuple_leaf<orcus::pstring, void>' requested here
> __tuple_leaf<_Uf, _Tf>(_VSTD::forward<_Up>(__u))...,
> ^
> /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/tuple:738:15: note: in instantiation of function template specialization 'std::__1::__tuple_impl<std::__1::__tuple_indices<0, 1, 2, 3, 4>, orcus::xml_map_tree &, const char *, const orcus::pstring &, orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type>::__tuple_impl<0, 1, 2, 3, 4, orcus::xml_map_tree &, const char *, const orcus::pstring &, orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type, orcus::xml_map_tree &, const char *&, orcus::pstring, orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type>' requested here
> : __base_(typename __make_tuple_indices<sizeof...(_Up)>::type(),
> ^
> xml_map_tree.cpp:216:13: note: in instantiation of function template specialization 'std::__1::tuple<orcus::xml_map_tree &, const char *, const orcus::pstring &, orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type>::tuple<orcus::xml_map_tree &, const char *&, orcus::pstring, orcus::xml_map_tree::element_type, orcus::xml_map_tree::reference_type, false, false>' requested here
> element::args_type(
> ^
> 1 error generated.
> Makefile:1804: recipe for target 'liborcus_0.15_la-xml_map_tree.lo' failed
> make[5]: *** [liborcus_0.15_la-xml_map_tree.lo] Error 1
(while building orcus as part of LibreOffice).
(Using "nm" instead of a more descriptive variable name "name" to avoid
-Wshadow warnings like
> xml_map_tree.cpp: In member function ‘orcus::xml_map_tree::element* orcus::xml_map_tree::element::get_or_create_child(orcus::xml_map_tree&, orcus::xmlns_id_t, const orcus::pstring&)’:
> xml_map_tree.cpp:214:16: warning: declaration of ‘name’ shadows a member of ‘orcus::xml_map_tree::element’ [-Wshadow]
> 214 | auto const name = sp.intern(_name.get(), _name.size()).first;
> | ^~~~
> In file included from xml_map_tree.cpp:8:
> xml_map_tree.hpp:126:17: note: shadowed declaration is here
> 126 | pstring name;
> | ^~~~
)
---
src/liborcus/xml_map_tree.cpp | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/liborcus/xml_map_tree.cpp b/src/liborcus/xml_map_tree.cpp
index 8338b930..1a9251c8 100644
--- a/src/liborcus/xml_map_tree.cpp
+++ b/src/liborcus/xml_map_tree.cpp
@@ -211,12 +211,13 @@ xml_map_tree::element* xml_map_tree::element::get_or_create_child(
string_pool& sp = parent.m_names;
// Insert a new element of this name.
+ auto const nm = sp.intern(_name.get(), _name.size()).first;
child_elements->push_back(
parent.m_element_pool.construct(
element::args_type(
parent,
_ns,
- sp.intern(_name.get(), _name.size()).first,
+ nm,
element_unlinked,
reference_unknown
)
@@ -251,12 +252,13 @@ xml_map_tree::element* xml_map_tree::element::get_or_create_linked_child(
string_pool& sp = parent.m_names;
// Insert a new linked element of this name.
+ auto const nm = sp.intern(_name.get(), _name.size()).first;
child_elements->push_back(
parent.m_element_pool.construct(
element::args_type(
parent,
_ns,
- sp.intern(_name.get(), _name.size()).first,
+ nm,
element_linked,
_ref_type
)
@@ -699,11 +701,12 @@ xml_map_tree::linked_node_type xml_map_tree::get_linked_node(const pstring& xpat
if (token.attribute)
throw xpath_error("root element cannot be an attribute.");
+ auto const nm = m_names.intern(token.name).first;
mp_root = m_element_pool.construct(
element::args_type(
*this,
token.ns,
- m_names.intern(token.name).first,
+ nm,
element_unlinked,
reference_unknown
)
@@ -748,11 +751,12 @@ xml_map_tree::linked_node_type xml_map_tree::get_linked_node(const pstring& xpat
if (it != attrs.end())
throw xpath_error("This attribute is already linked. You can't link the same attribute twice.");
+ auto const nm = m_names.intern(token.name.get(), token.name.size()).first;
attribute* p = m_attribute_pool.construct(
attribute::args_type(
*this,
token.ns,
- m_names.intern(token.name.get(), token.name.size()).first,
+ nm,
ref_type
)
);
@@ -789,11 +793,12 @@ xml_map_tree::element* xml_map_tree::get_element(const pstring& xpath)
if (token.attribute)
throw xpath_error("root element cannot be an attribute.");
+ auto const nm = m_names.intern(token.name).first;
mp_root = m_element_pool.construct(
element::args_type(
*this,
token.ns,
- m_names.intern(token.name).first,
+ nm,
element_unlinked,
reference_unknown
)
--
2.21.0

1
external/liborcus/UnpackedTarball_liborcus.mk vendored
View File

@@ -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/0001-Blind-fix-attempt-for-older-macOS-builds.patch \
))
ifeq ($(OS),WNT)