[arch-commits] Commit in libreoffice-still/trunk (7 files)
Andreas Radke
andyrtr at archlinux.org
Sun Aug 23 12:25:38 UTC 2020
Date: Sunday, August 23, 2020 @ 12:25:38
Author: andyrtr
Revision: 394597
upgpkg: libreoffice-still 6.4.6-1: upstream update 6.4.6
Modified:
libreoffice-still/trunk/PKGBUILD
libreoffice-still/trunk/libreoffice-still.csh
libreoffice-still/trunk/libreoffice-still.sh
Deleted:
libreoffice-still/trunk/0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch
libreoffice-still/trunk/adapt-o3tl-span-to-newer-libstdc++.patch
libreoffice-still/trunk/disable-latest-c++.diff
libreoffice-still/trunk/libreoffice-poppler-0.86.patch
--------------------------------------------------------+
0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch | 621 ---------------
PKGBUILD | 56 -
adapt-o3tl-span-to-newer-libstdc++.patch | 254 ------
disable-latest-c++.diff | 149 ---
libreoffice-poppler-0.86.patch | 15
libreoffice-still.csh | 3
libreoffice-still.sh | 3
7 files changed, 21 insertions(+), 1080 deletions(-)
Deleted: 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch
===================================================================
--- 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch 2020-08-23 11:42:46 UTC (rev 394596)
+++ 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch 2020-08-23 12:25:38 UTC (rev 394597)
@@ -1,621 +0,0 @@
-From 8f5dd7babe306a1c9dcdec93372a3d4378e09667 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei at libreoffice.org>
-Date: Mon, 12 Aug 2019 13:57:34 -0400
-Subject: [PATCH] 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 at 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 at 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 at 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 at redhat.com>
-(cherry picked from commit 6c286f807c03321a79f8aaa98c6a785da005d619)
----
- RepositoryExternal.mk | 4 +-
- configure.ac | 4 +-
- ...1-Prevent-unsigned-integer-underflow.patch | 27 ---------
- external/liborcus/ExternalPackage_liborcus.mk | 8 +--
- external/liborcus/ExternalProject_liborcus.mk | 4 +-
- external/liborcus/Library_orcus-parser.mk | 2 +
- external/liborcus/Library_orcus.mk | 7 +++
- external/liborcus/UnpackedTarball_liborcus.mk | 7 +--
- external/liborcus/create-element.patch.0 | 55 +++++++++++++++++++
- external/liborcus/version.patch.0 | 11 ----
- external/mdds/UnpackedTarball_mdds.mk | 1 -
- .../mdds/use-position-hint-also-back.patch | 50 -----------------
- sc/inc/mtvelements.hxx | 8 +--
- sc/inc/orcusxml.hxx | 1 +
- sc/qa/unit/dataproviders_test.cxx | 1 +
- sc/source/core/tool/scmatrix.cxx | 8 +--
- sc/source/filter/inc/orcusinterface.hxx | 2 +
- sc/source/filter/orcus/interface.cxx | 8 ++-
- sc/source/filter/orcus/orcusfiltersimpl.cxx | 4 +-
- sc/source/filter/orcus/xmlcontext.cxx | 9 ++-
- sc/source/ui/xmlsource/xmlsourcedlg.cxx | 6 ++
- svl/source/misc/gridprinter.cxx | 2 +-
- 23 files changed, 114 insertions(+), 123 deletions(-)
- delete mode 100644 external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
- create mode 100644 external/liborcus/create-element.patch.0
- delete mode 100644 external/liborcus/version.patch.0
- delete mode 100644 external/mdds/use-position-hint-also-back.patch
-
-diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
-index a75ca5097b62..1c6c0c59538b 100644
---- a/RepositoryExternal.mk
-+++ b/RepositoryExternal.mk
-@@ -3262,7 +3262,7 @@ $(call gb_LinkTarget_set_include,$(1),\
- )
-
- $(call gb_LinkTarget_add_libs,$(1),\
-- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.14 \
-+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.15 \
- )
-
- $(if $(SYSTEM_BOOST), \
-@@ -3281,7 +3281,7 @@ $(call gb_LinkTarget_set_include,$(1),\
- )
-
- $(call gb_LinkTarget_add_libs,$(1),\
-- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.14 \
-+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.15 \
- )
-
- endef
-diff --git a/configure.ac b/configure.ac
-index c77ce67f332b..9863d02a48c6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -9250,7 +9250,7 @@ AC_SUBST(SYSTEM_BOOST)
- dnl ===================================================================
- dnl Check for system mdds
- dnl ===================================================================
--libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.4 >= 1.4.1], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
-+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.5 >= 1.5.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
-
- dnl ===================================================================
- dnl Check for system glm
-@@ -9556,7 +9556,7 @@ AC_SUBST(ENABLE_FUZZERS)
- dnl ===================================================================
- dnl Orcus
- dnl ===================================================================
--libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.14 >= 0.14.0])
-+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.15 >= 0.15.0])
- if test "$with_system_orcus" != "yes"; then
- if test "$SYSTEM_BOOST" = "TRUE"; then
- # ===========================================================
-diff --git a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch b/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
-deleted file mode 100644
-index 3353857a2d10..000000000000
---- a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
-+++ /dev/null
-@@ -1,27 +0,0 @@
--From 1967be013804f4f578b53659d7ef459b4c35de9f Mon Sep 17 00:00:00 2001
--From: Kohei Yoshida <kohei.yoshida at gmail.com>
--Date: Wed, 7 Nov 2018 21:08:40 -0500
--Subject: [PATCH] Prevent unsigned integer underflow.
--
--(cherry picked from commit 40bbce85048b77c545103af124f3d9831dd4a458)
-----
-- src/parser/parser_base.cpp | 3 ++-
-- 1 file changed, 2 insertions(+), 1 deletion(-)
--
--diff --git a/src/parser/parser_base.cpp b/src/parser/parser_base.cpp
--index 586d495f..9d426efb 100644
----- a/src/parser/parser_base.cpp
--+++ b/src/parser/parser_base.cpp
--@@ -120,7 +120,8 @@ double parser_base::parse_double()
--
-- size_t parser_base::remaining_size() const
-- {
--- return std::distance(mp_char, mp_end) - 1;
--+ size_t n = std::distance(mp_char, mp_end);
--+ return n ? (n - 1) : 0;
-- }
--
-- std::ptrdiff_t parser_base::offset() const
----
--2.17.1
--
-diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk
-index ffa0b38bea19..21dd1bfb1ce5 100644
---- a/external/liborcus/ExternalPackage_liborcus.mk
-+++ b/external/liborcus/ExternalPackage_liborcus.mk
-@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
- $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
-
- ifeq ($(OS),MACOSX)
--$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.0.dylib,src/liborcus/.libs/liborcus-0.14.0.dylib))
--$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.0.dylib,src/parser/.libs/liborcus-parser-0.14.0.dylib))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.0.dylib,src/liborcus/.libs/liborcus-0.15.0.dylib))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.0.dylib,src/parser/.libs/liborcus-parser-0.15.0.dylib))
- else ifeq ($(DISABLE_DYNLOADING),)
--$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.so.0,src/liborcus/.libs/liborcus-0.14.so.0.0.0))
--$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.so.0,src/parser/.libs/liborcus-parser-0.14.so.0.0.0))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.so.0,src/liborcus/.libs/liborcus-0.15.so.0.0.0))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.so.0,src/parser/.libs/liborcus-parser-0.15.so.0.0.0))
- endif
-
- # vim: set noet sw=4 ts=4:
-diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
-index 8cc1c030fa98..0bd36c379d9b 100644
---- a/external/liborcus/ExternalProject_liborcus.mk
-+++ b/external/liborcus/ExternalProject_liborcus.mk
-@@ -122,8 +122,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
- $(MAKE) \
- $(if $(filter MACOSX,$(OS)),\
- && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
-- $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.14.0.dylib \
-- $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.14.0.dylib \
-+ $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.15.0.dylib \
-+ $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.15.0.dylib \
- ) \
- )
-
-diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk
-index 32367b843f68..d25d82163d9a 100644
---- a/external/liborcus/Library_orcus-parser.mk
-+++ b/external/liborcus/Library_orcus-parser.mk
-@@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_unpacked,orcus-parser,liborcus))
-
- $(eval $(call gb_Library_use_externals,orcus-parser,\
- boost_headers \
-+ boost_filesystem \
- boost_system \
- mdds_headers \
- zlib \
-@@ -22,6 +23,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus-parser))
-
- $(eval $(call gb_Library_set_include,orcus-parser,\
- -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
-+ -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \
- $$(INCLUDE) \
- ))
-
-diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk
-index 2b20cdf84ea4..3793805c3c00 100644
---- a/external/liborcus/Library_orcus.mk
-+++ b/external/liborcus/Library_orcus.mk
-@@ -24,6 +24,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus))
-
- $(eval $(call gb_Library_set_include,orcus,\
- -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
-+ -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \
- $$(INCLUDE) \
- ))
-
-@@ -68,6 +69,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
- UnpackedTarball/liborcus/src/liborcus/info \
- UnpackedTarball/liborcus/src/liborcus/interface \
- UnpackedTarball/liborcus/src/liborcus/json_document_tree \
-+ UnpackedTarball/liborcus/src/liborcus/json_map_tree \
-+ UnpackedTarball/liborcus/src/liborcus/json_structure_mapper \
-+ UnpackedTarball/liborcus/src/liborcus/json_structure_tree \
- UnpackedTarball/liborcus/src/liborcus/json_util \
- UnpackedTarball/liborcus/src/liborcus/measurement \
- UnpackedTarball/liborcus/src/liborcus/odf_helper \
-@@ -92,12 +96,15 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
- UnpackedTarball/liborcus/src/liborcus/orcus_gnumeric \
- UnpackedTarball/liborcus/src/liborcus/orcus_import_ods \
- UnpackedTarball/liborcus/src/liborcus/orcus_import_xlsx \
-+ UnpackedTarball/liborcus/src/liborcus/orcus_json \
- UnpackedTarball/liborcus/src/liborcus/orcus_ods \
- UnpackedTarball/liborcus/src/liborcus/orcus_xls_xml \
- UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \
- UnpackedTarball/liborcus/src/liborcus/orcus_xml \
-+ UnpackedTarball/liborcus/src/liborcus/orcus_xml_map_def \
- UnpackedTarball/liborcus/src/liborcus/session_context \
- UnpackedTarball/liborcus/src/liborcus/spreadsheet_iface_util \
-+ UnpackedTarball/liborcus/src/liborcus/spreadsheet_impl_types \
- UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \
- UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \
- UnpackedTarball/liborcus/src/liborcus/string_helper \
-diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
-index e1d810a49dc2..eb1d5af676ce 100644
---- a/external/liborcus/UnpackedTarball_liborcus.mk
-+++ b/external/liborcus/UnpackedTarball_liborcus.mk
-@@ -15,16 +15,11 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
-
- $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
-
--# * external/liborcus/version.patch.0 covered by upstream
--# <https://gitlab.com/orcus/orcus/commit/0dfa88f2adca7887dbe44bdb7025985777c89673> "Remove unused
--# VERSION file":
- $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
-- external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
- external/liborcus/rpath.patch.0 \
- external/liborcus/gcc9.patch.0 \
-- external/liborcus/version.patch.0 \
- external/liborcus/libtool.patch.0 \
-- external/liborcus/0001-Prevent-unsigned-integer-underflow.patch \
-+ 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
-new file mode 100644
-index 000000000000..b1012e5c90d8
---- /dev/null
-+++ b/external/liborcus/create-element.patch.0
-@@ -0,0 +1,55 @@
-+--- 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;
-diff --git a/external/liborcus/version.patch.0 b/external/liborcus/version.patch.0
-deleted file mode 100644
-index 2c0b5ae4ca07..000000000000
---- a/external/liborcus/version.patch.0
-+++ /dev/null
-@@ -1,11 +0,0 @@
----- configure
--+++ configure
--@@ -21055,7 +21055,7 @@
--
-- fi
--
---ac_config_files="$ac_config_files Makefile liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in VERSION include/Makefile include/orcus/Makefile include/orcus/detail/Makefile include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile parser_handlers/Makefile benchmark/Makefile doc_example/Makefile"
--+ac_config_files="$ac_config_files Makefile liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in include/Makefile include/orcus/Makefile include/orcus/detail/Makefile include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile parser_handlers/Makefile benchmark/Makefile doc_example/Makefile"
--
-- cat >confcache <<\_ACEOF
-- # This file is a shell script that caches the results of configure
-diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk
-index 625204d29619..c015f4c13f5a 100644
---- a/external/mdds/UnpackedTarball_mdds.mk
-+++ b/external/mdds/UnpackedTarball_mdds.mk
-@@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
- $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0))
-
- $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
-- external/mdds/use-position-hint-also-back.patch \
- ))
-
- # vim: set noet sw=4 ts=4:
-diff --git a/external/mdds/use-position-hint-also-back.patch b/external/mdds/use-position-hint-also-back.patch
-deleted file mode 100644
-index 0b38c38d5536..000000000000
---- a/external/mdds/use-position-hint-also-back.patch
-+++ /dev/null
-@@ -1,50 +0,0 @@
--From 726e2f02d14833bde2f7eef9677f5564c485a992 Mon Sep 17 00:00:00 2001
--From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak at centrum.cz>
--Date: Fri, 17 May 2019 13:55:20 +0200
--Subject: [PATCH] use position hint also when it is past the actual position
--
--The m_blocks data structure is a vector. It means that it can be
--also walked back, instead of resetting and starting from the very
--start.
--
--Allows a noticeable performance improvement in
--https://gerrit.libreoffice.org/#/c/72424/ .
-----
-- include/mdds/multi_type_vector_def.inl | 21 ++++++++++++++++++++-
-- 1 file changed, 20 insertions(+), 1 deletion(-)
--
--diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl
--index 22a0ee2..09894e6 100644
----- include/mdds/multi_type_vector_def.inl
--+++ include/mdds/multi_type_vector_def.inl
--@@ -861,7 +861,26 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::get_block_position(
--
-- if (pos < start_row)
-- {
--- // Position hint is past the insertion position. Reset.
--+ // Position hint is past the insertion position.
--+ // Walk back if that seems efficient.
--+ if (pos > start_row / 2)
--+ {
--+ for (size_type i = block_index; i > 0;)
--+ {
--+ --i;
--+ const block& blk = m_blocks[i];
--+ start_row -= blk.m_size;
--+ if (pos >= start_row)
--+ {
--+ // Row is in this block.
--+ block_index = i;
--+ return;
--+ }
--+ // Specified row is not in this block.
--+ }
--+ assert(start_row == 0);
--+ }
--+ // Otherwise reset.
-- start_row = 0;
-- block_index = 0;
-- }
----
--2.16.4
--
-diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
-index 407f0392c4cd..382fb4d2b688 100644
---- a/sc/inc/mtvelements.hxx
-+++ b/sc/inc/mtvelements.hxx
-@@ -52,9 +52,9 @@ const mdds::mtv::element_t element_type_formula = mdds::mtv::element_type_user_s
- const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_start + 5;
-
- /// Mapped standard element types (for convenience).
--const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric;
-+const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_double;
- const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty;
--const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort;
-+const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_uint16;
-
- /// Custom element blocks.
-
-@@ -66,8 +66,8 @@ typedef mdds::mtv::noncopyable_managed_element_block<element_type_edittext, Edit
- typedef mdds::mtv::noncopyable_managed_element_block<element_type_formula, ScFormulaCell> formula_block;
-
- /// Mapped standard element blocks (for convenience).
--typedef mdds::mtv::numeric_element_block numeric_block;
--typedef mdds::mtv::ushort_element_block uint16_block;
-+typedef mdds::mtv::double_element_block numeric_block;
-+typedef mdds::mtv::uint16_element_block uint16_block;
-
- /// This needs to be in the same namespace as CellTextAttr.
- MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellTextAttr(), celltextattr_block)
-diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
-index b635eca2d43d..d292134597ad 100644
---- a/sc/inc/orcusxml.hxx
-+++ b/sc/inc/orcusxml.hxx
-@@ -70,6 +70,7 @@ struct ScOrcusImportXMLParam
- {
- ScAddress maPos;
- std::vector<OString> maFieldPaths;
-+ std::vector<OString> maRowGroups;
- };
-
- typedef std::vector<CellLink> CellLinksType;
-diff --git a/sc/qa/unit/dataproviders_test.cxx b/sc/qa/unit/dataproviders_test.cxx
-index 1e9cf97e8dc3..a9b6b1142c7f 100644
---- a/sc/qa/unit/dataproviders_test.cxx
-+++ b/sc/qa/unit/dataproviders_test.cxx
-@@ -156,6 +156,7 @@ void ScDataProvidersTest::testXMLImport()
- aRangeLink.maPos = ScAddress(0,0,0);
- aRangeLink.maFieldPaths.push_back("/bookstore/book/title");
- aRangeLink.maFieldPaths.push_back("/bookstore/book/author");
-+ aRangeLink.maRowGroups.push_back("/bookstore/book");
- aParam.maRangeLinks.push_back(aRangeLink);
-
- createFileURL("test1.", "xml", aFileURL);
-diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
-index 0291c84a04d7..9eaa14f751f3 100644
---- a/sc/source/core/tool/scmatrix.cxx
-+++ b/sc/source/core/tool/scmatrix.cxx
-@@ -1935,8 +1935,8 @@ public:
- {
- case mdds::mtm::element_numeric:
- {
-- numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data);
-- numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data);
-+ double_element_block::const_iterator it = double_element_block::begin(*node.data);
-+ double_element_block::const_iterator itEnd = double_element_block::end(*node.data);
- for (; it != itEnd; ++it, ++miPos)
- *miPos = *it;
- }
-@@ -2012,8 +2012,8 @@ public:
- {
- case mdds::mtm::element_numeric:
- {
-- numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data);
-- numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data);
-+ double_element_block::const_iterator it = double_element_block::begin(*node.data);
-+ double_element_block::const_iterator itEnd = double_element_block::end(*node.data);
- for (; it != itEnd; ++it, ++miPos)
- {
- if (GetDoubleErrorValue(*miPos) == FormulaError::ElementNaN)
-diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
-index 9d090b744619..7c7c4f20bb3c 100644
---- a/sc/source/filter/inc/orcusinterface.hxx
-+++ b/sc/source/filter/inc/orcusinterface.hxx
-@@ -332,6 +332,8 @@ public:
-
- virtual orcus::spreadsheet::range_size_t get_sheet_size() const override;
-
-+ virtual void fill_down_cells(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::row_t range_size) override;
-+
- SCTAB getIndex() const { return mnTab; }
-
- const sc::SharedFormulaGroups& getSharedFormulaGroups() const;
-diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
-index 833fb278e397..23f17a1dc854 100644
---- a/sc/source/filter/orcus/interface.cxx
-+++ b/sc/source/filter/orcus/interface.cxx
-@@ -61,8 +61,7 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t
- case orcus::spreadsheet::formula_grammar_t::ods:
- eGrammar = formula::FormulaGrammar::GRAM_ODFF;
- break;
-- case orcus::spreadsheet::formula_grammar_t::xlsx_2007:
-- case orcus::spreadsheet::formula_grammar_t::xlsx_2010:
-+ case orcus::spreadsheet::formula_grammar_t::xlsx:
- eGrammar = formula::FormulaGrammar::GRAM_OOXML;
- break;
- case orcus::spreadsheet::formula_grammar_t::gnumeric:
-@@ -1188,6 +1187,11 @@ orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const
- return ret;
- }
-
-+void ScOrcusSheet::fill_down_cells(os::row_t /*row*/, os::col_t /*col*/, os::row_t /*range_size*/)
-+{
-+ // TODO : implement this.
-+}
-+
- const sc::SharedFormulaGroups& ScOrcusSheet::getSharedFormulaGroups() const
- {
- return maFormulaGroups;
-diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx
-index cdfb70d71c1b..8e9b0b1a5f04 100644
---- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
-+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
-@@ -139,10 +139,10 @@ bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, OUString& aPath) con
-
- try
- {
-- std::string content = orcus::load_file_content(path);
-+ orcus::file_content content(path);
- ScOrcusFactory aFactory(rDoc);
- ScOrcusStyles aStyles(aFactory);
-- orcus::import_ods::read_styles(content.c_str(), content.size(), &aStyles);
-+ orcus::import_ods::read_styles(content.data(), content.size(), &aStyles);
- }
- catch (const std::exception& e)
- {
-diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx
-index 2548f5b19d9f..71c44bc35823 100644
---- a/sc/source/filter/orcus/xmlcontext.cxx
-+++ b/sc/source/filter/orcus/xmlcontext.cxx
-@@ -269,10 +269,17 @@ void ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam)
-
- std::for_each(rLink.maFieldPaths.begin(), rLink.maFieldPaths.end(), InsertFieldPath(filter));
-
-+ std::for_each(rLink.maRowGroups.begin(), rLink.maRowGroups.end(),
-+ [&filter] (const OString& rRowGroup)
-+ {
-+ filter.set_range_row_group(rRowGroup.getStr());
-+ }
-+ );
-+
- filter.commit_range();
- }
-
-- std::string content = orcus::load_file_content(path);
-+ orcus::file_content content(path);
- filter.read_stream(content.data(), content.size());
-
- aFactory.finalize();
-diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
-index e24367342713..d9cd8b5b515c 100644
---- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
-+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
-@@ -536,6 +536,12 @@ void ScXMLSourceDlg::OkPressed()
- // Go through all its child elements.
- getFieldLinks(aRangeLink, aParam.maNamespaces, *mxLbTree, *rEntry);
-
-+ // Add the anchor node as a grouping node, which will be used as a
-+ // row position increment point.
-+ OUString aThisEntry = getXPath(*mxLbTree, *rEntry, aParam.maNamespaces);
-+ aRangeLink.maRowGroups.push_back(
-+ OUStringToOString(aThisEntry, RTL_TEXTENCODING_UTF8));
-+
- aParam.maRangeLinks.push_back(aRangeLink);
- }
- }
-diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
-index 9ed7f43b41d5..21264745e4f8 100644
---- a/svl/source/misc/gridprinter.cxx
-+++ b/svl/source/misc/gridprinter.cxx
-@@ -29,7 +29,7 @@ typedef mdds::mtv::default_element_block<element_type_string, OUString> string_b
- struct matrix_trait
- {
- typedef string_block string_element_block;
-- typedef mdds::mtv::ushort_element_block integer_element_block;
-+ typedef mdds::mtv::uint16_element_block integer_element_block;
-
- typedef mdds::mtv::custom_block_func1<string_block> element_block_func;
- };
---
-2.21.0
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-08-23 11:42:46 UTC (rev 394596)
+++ PKGBUILD 2020-08-23 12:25:38 UTC (rev 394597)
@@ -10,9 +10,9 @@
pkgbase=libreoffice-still
pkgname=('libreoffice-still-sdk' 'libreoffice-still')
-_LOver=6.3.6.2
-pkgver=6.3.6
-pkgrel=2
+_LOver=6.4.6.2
+pkgver=6.4.6
+pkgrel=1
arch=('x86_64')
license=('LGPL3')
url="https://www.libreoffice.org/"
@@ -21,7 +21,7 @@
'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu'
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
- 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs'
+ 'desktop-file-utils' 'shared-mime-info' 'gst-plugins-base-libs'
'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
'gperf' 'gtk3' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell' 'clucene'
'junit' 'libmythes' 'libwpg' 'java-environment=8' 'postgresql-libs' 'mariadb-libs' 'libgl'
@@ -31,6 +31,7 @@
'libexttextcat' 'libcmis' 'gobject-introspection' # 'libfbclient'
'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode'
'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext'
+ 'libffi'
)
_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
@@ -46,9 +47,10 @@
${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${_additional_source_url}/pdfium-3794.tar.bz2
+ ${_additional_source_url}/pdfium-3963.tar.bz2
${_additional_source_url}/lxml-4.1.1.tgz
${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2
+ ${_additional_source_url}/QR-Code-generator-1.4.0.tar.gz
${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite
${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
${_additional_source_url2}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
@@ -55,11 +57,7 @@
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
make-pyuno-work-with-system-wide-module-install.diff
soffice-template.desktop.in
- libreoffice-still.sh libreoffice-still.csh
- 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch
- libreoffice-poppler-0.86.patch
- adapt-o3tl-span-to-newer-libstdc++.patch
- disable-latest-c++.diff)
+ libreoffice-still.sh libreoffice-still.csh)
noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@@ -68,9 +66,10 @@
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- pdfium-3794.tar.bz2
+ pdfium-3963.tar.bz2
lxml-4.1.1.tgz
Firebird-3.0.0.32483-0.tar.bz2
+ QR-Code-generator-1.4.0.tar.gz
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
@@ -77,11 +76,11 @@
185d60944ea767075d27247c3162b3bc-unowinreg.dll
)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('c39a4c7bb6e3bea604b0bfb2743492cb908166b464336272dac92c7dcf48af58'
+sha256sums=('ab8281c5290e23eb46c4d4aee4abb16d2dcc5ff6daf46991c0370bee6ec0aa4c'
'SKIP'
- '391723f757f30ed8c372005d64d0845fe62034f61a116dc7554981d2f7afbfc0'
+ '4af036e3f2a033b620b31acff24c0ce7b239ddd40a3782fb77640c0b386e04c8'
'SKIP'
- '20986af32f9eb656ad05989509d9d5d165f3bc496421131bd3380683ee7ea8ac'
+ 'a3a95168ed9845d28f5e10f1a729383dae9e706f63e5a898de72b4843fe5352a'
'SKIP'
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@@ -91,9 +90,10 @@
'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
'1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
'233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
- 'e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4'
+ '80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895'
'940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e'
'6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
+ 'fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a'
'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
'984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
'884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc'
@@ -100,27 +100,13 @@
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
- 'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2'
- '07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6'
- '77214ebc425916990ed80e9508572fd1d565412e1f8c2289424457e3d9bcbc79'
- 'f52ef5d64d7a74ca90bc96614260566720130d91f3764874eac673f6b3336b5e'
- 'ee182026fe28bb1a1fc86c4a6ead2522e4d611326d65d3b9d6c686a36e073a6e'
- 'fde9801d839028c1e9ce0403b0ad7625620fe1ee3d54cb439f4651f3ab9b886f')
+ 'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
+ 'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1')
prepare() {
cd libreoffice-$_LOver
- patch -p1 -i ../libreoffice-poppler-0.86.patch # Fix build with poppler 0.86
-
- # fix build with recent toolchain
- # https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-6-4&id=f0b74640137f07ed74027f98fbf6d1c0d98939bf
- # prerequisite: https://cgit.freedesktop.org/libreoffice/core/commit/?id=a9f77e87f3e6ca3333bbb16dec5456f3bf2903b8
- patch -Np1 -i ../disable-latest-c++.diff
- # https://cgit.freedesktop.org/libreoffice/core/commit/?id=8e6865188242bccb3d8aa857ddc990d72a058d3d
- # https://cgit.freedesktop.org/libreoffice/core/commit/?id=6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c
- patch -Np1 -i ../adapt-o3tl-span-to-newer-libstdc++.patch
-
# move external sources into place
mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources
for source in "${noextract[@]}"; do
@@ -143,9 +129,6 @@
esac
ARCH_FLAGS="$ARCH_FLAGS $i"
done
-
- # fix build with updated system liborcus/mdds; patch taken from Fedora
- patch -Np1 -i ../0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch
}
build() {
@@ -173,11 +156,10 @@
--enable-evolution2\
--enable-gio\
--enable-gtk3-kde5 \
- --enable-kde5 \
+ --enable-kf5 \
--enable-qt5 \
--enable-gtk3 \
--enable-introspection \
- --disable-gstreamer-0-10 \
--enable-openssl \
--enable-odk\
--enable-python=system \
@@ -203,6 +185,7 @@
--with-system-libetonyek \
--with-system-libfreehand \
--without-system-firebird \
+ --without-system-qrcodegen \
--with-system-libtommath \
--with-system-libatomic-ops \
--with-system-libebook \
@@ -303,7 +286,6 @@
'postgresql-libs: for postgresql-connector'
'mariadb-libs: for mysql-connector'
'coin-or-mp: required by the Calc solver'
- 'gtk2: for GTK2 integration'
'gtk3: for GTK3 integration'
'kio: for KF5 KDE desktop integration')
backup=(etc/libreoffice/sofficerc
Deleted: adapt-o3tl-span-to-newer-libstdc++.patch
===================================================================
--- adapt-o3tl-span-to-newer-libstdc++.patch 2020-08-23 11:42:46 UTC (rev 394596)
+++ adapt-o3tl-span-to-newer-libstdc++.patch 2020-08-23 12:25:38 UTC (rev 394597)
@@ -1,254 +0,0 @@
-From 99354a1c4b6f56871d50d07421ba1773fce0d928 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Fri, 6 Dec 2019 16:36:01 +0100
-Subject: [PATCH 1/2] Adapt o3tl::span to P1872R0
-
-..."span should have size_type, not index_type"
-(<http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1872r0.pdf>), as
-implemented by libc++ since <https://github.com/llvm/llvm-project/commit/
-1466335cf4b2854a0be1defcf279fe50772bad6f> "[libc++][P1872] span should have
-size_type, not index_type."
-
-All uses of index_type had been added to mitigate the previous std::span change
-from signed (ptrdiff_t) to unsigned (size_t) index_type, see
-6ef8420fdbf8dff16de13147c5ab833bc5e01121 "Adapt o3tl::span to updated C++2a
-std::span". There is no easy solution to transparently support all three
-std::span variants currently out there (signed index_type, unsigned index_type,
-unsigned size_type), without causing compilation failures due to
-CPPUNIT_ASSERT_EQUAL with arguments of different types, or compiler warnings
-about mixed signed/unsigned comparisons. So rule out the oldest std::span
-variant (signed index_type) in configure.ac (so that o3tl::span will use its
-own hand-rolled code in that case) and simplify the uses of index_type to
-std::size_t (as had already been mentioned in
-6ef8420fdbf8dff16de13147c5ab833bc5e01121).
-
-Change-Id: I6ddf424ffb7941da3f69ad66fd29ecd35f09afae
-Reviewed-on: https://gerrit.libreoffice.org/84652
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
-
-(cherry picked from commit 8e6865188242bccb3d8aa857ddc990d72a058d3d)
----
- config_host/config_global.h.in | 3 +++
- configure.ac | 16 ++++++++++++++++
- include/o3tl/span.hxx | 14 ++++++++------
- o3tl/qa/test-span.cxx | 7 ++++---
- sfx2/source/control/dispatch.cxx | 3 ++-
- 5 files changed, 33 insertions(+), 10 deletions(-)
-
-diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
-index 2e986fbe24b6..0b44ad05373e 100644
---- a/config_host/config_global.h.in
-+++ b/config_host/config_global.h.in
-@@ -24,6 +24,9 @@ Any change in this header will cause a rebuild of almost everything.
- /* Guaranteed copy elision (C++17), __cpp_guaranteed_copy_elision (C++2a): */
- #define HAVE_CPP_GUARANTEED_COPY_ELISION 0
-
-+// Useable C++2a <span>:
-+#define HAVE_CPP_SPAN 0
-+
- /* GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87150> "move ctor wrongly chosen in return
- stmt (derived vs. base)": */
- #define HAVE_GCC_BUG_87150 0
-diff --git a/configure.ac b/configure.ac
-index 052782189056..704fff55a7ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -6760,6 +6760,22 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- CXXFLAGS=$save_CXXFLAGS
- AC_LANG_POP([C++])
-
-+AC_MSG_CHECKING([whether $CXX supports C++2a <span> with unsigned size_type])
-+AC_LANG_PUSH([C++])
-+save_CXXFLAGS=$CXXFLAGS
-+CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-+ #include <span>
-+ #include <type_traits>
-+ // Don't check size_type directly, as it was called index_type before P1872R0:
-+ void f(std::span<int> s) { static_assert(std::is_unsigned_v<decltype(s.size())>); };
-+ ])], [
-+ AC_DEFINE([HAVE_CPP_SPAN],[1])
-+ AC_MSG_RESULT([yes])
-+ ], [AC_MSG_RESULT([no])])
-+CXXFLAGS=$save_CXXFLAGS
-+AC_LANG_POP([C++])
-+
- AC_MSG_CHECKING([whether $CXX has GCC bug 87150])
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
-diff --git a/include/o3tl/span.hxx b/include/o3tl/span.hxx
-index 1618b86df897..b19d2d847ac7 100644
---- a/include/o3tl/span.hxx
-+++ b/include/o3tl/span.hxx
-@@ -12,7 +12,9 @@
-
- #include <sal/config.h>
-
--#if __has_include(<span>)
-+#include <config_global.h>
-+
-+#if HAVE_CPP_SPAN
-
- #include <span>
-
-@@ -40,7 +42,7 @@ public:
- using iterator = pointer;
- using const_reverse_iterator = std::reverse_iterator<const_iterator>;
- using reverse_iterator = std::reverse_iterator<iterator>;
-- using index_type = std::size_t;
-+ using size_type = std::size_t;
- using difference_type = std::ptrdiff_t;
-
- constexpr span() noexcept : data_(nullptr), size_(0) {}
-@@ -48,7 +50,7 @@ public:
- template<std::size_t N>
- constexpr span (T (&a)[N]) noexcept : data_(a), size_(N) {}
-
-- constexpr span (T *a, index_type len) noexcept
-+ constexpr span (T *a, size_type len) noexcept
- : data_(a), size_(len)
- {
- // not terribly sure about this, might need to strengthen it
-@@ -72,9 +74,9 @@ public:
- { return rbegin(); }
- constexpr const_reverse_iterator crend() const noexcept { return rend(); }
-
-- constexpr index_type size() const noexcept { return size_; }
-+ constexpr size_type size() const noexcept { return size_; }
-
-- constexpr reference operator [](index_type pos) const {
-+ constexpr reference operator [](size_type pos) const {
- assert(pos < size());
- return data_[pos];
- }
-@@ -83,7 +85,7 @@ public:
-
- private:
- pointer data_;
-- index_type size_;
-+ size_type size_;
- };
-
- } // namespace o3tl
-diff --git a/o3tl/qa/test-span.cxx b/o3tl/qa/test-span.cxx
-index 7ec67fa7fd91..3cb78ace1db2 100644
---- a/o3tl/qa/test-span.cxx
-+++ b/o3tl/qa/test-span.cxx
-@@ -9,6 +9,7 @@
-
- #include <sal/config.h>
-
-+#include <cstddef>
- #include <utility>
-
- #include <cppunit/TestAssert.h>
-@@ -42,7 +43,7 @@ private:
- CPPUNIT_ASSERT_EQUAL(3, *v.crbegin());
- CPPUNIT_ASSERT_EQUAL(
- o3tl::span<int>::difference_type(3), v.crend() - v.crbegin());
-- CPPUNIT_ASSERT_EQUAL(o3tl::span<int>::index_type(3), v.size());
-+ CPPUNIT_ASSERT_EQUAL(std::size_t(3), v.size());
- CPPUNIT_ASSERT(!v.empty());
- CPPUNIT_ASSERT_EQUAL(2, v[1]);
- CPPUNIT_ASSERT_EQUAL(1, *v.data());
-@@ -52,8 +53,8 @@ private:
- o3tl::span<int const> v1( d1 );
- o3tl::span<int const> v2( d2 );
- std::swap(v1, v2);
-- CPPUNIT_ASSERT_EQUAL(o3tl::span<int>::index_type(4), v1.size());
-- CPPUNIT_ASSERT_EQUAL(o3tl::span<int>::index_type(2), v2.size());
-+ CPPUNIT_ASSERT_EQUAL(std::size_t(4), v1.size());
-+ CPPUNIT_ASSERT_EQUAL(std::size_t(2), v2.size());
- }
- }
- };
-diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
-index 702e6064f157..c3f3ad60c10c 100644
---- a/sfx2/source/control/dispatch.cxx
-+++ b/sfx2/source/control/dispatch.cxx
-@@ -20,6 +20,7 @@
- #include <config_features.h>
-
- #include <algorithm>
-+#include <cstddef>
- #include <deque>
- #include <vector>
-
-@@ -1547,7 +1548,7 @@ void SfxDispatcher::SetSlotFilter(SfxSlotFilterState nEnable,
- {
- #ifdef DBG_UTIL
- // Check Array
-- for ( o3tl::span<sal_uInt16 const>::index_type n = 1; n < pSIDs.size(); ++n )
-+ for ( std::size_t n = 1; n < pSIDs.size(); ++n )
- DBG_ASSERT( pSIDs[n] > pSIDs[n-1], "SetSlotFilter: SIDs not sorted" );
- #endif
-
-
-From 3bf38cc5f6d61f43509d8dc500479d66b8233bab Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Sat, 22 Feb 2020 17:29:15 +0100
-Subject: [PATCH 2/2] Adapt o3tl::span to removal of std::span::cbegin et al
-
-<https://cplusplus.github.io/LWG/issue3320> "span::cbegin/cend methods produce
-different results than std::[ranges::]cbegin/cend", as implemented now in
-<https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;a=commit;
-h=247f410b83797a1840573840cc2a539ef9d7f96b> "libstdc++: Remove std::span::cbegin
-and std::span::cend (LWG 3320)".
-
-Turns out we only used the removed member functions in o3tl/qa/test-span.cxx.
-
-Change-Id: I6c73797594b4e0e753a88840033d54961e271df5
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89261
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
-
-(cherry picked from commit 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c)
----
- include/o3tl/span.hxx | 7 -------
- o3tl/qa/test-span.cxx | 6 ------
- 2 files changed, 13 deletions(-)
-
-diff --git a/include/o3tl/span.hxx b/include/o3tl/span.hxx
-index b19d2d847ac7..8af8ba846b65 100644
---- a/include/o3tl/span.hxx
-+++ b/include/o3tl/span.hxx
-@@ -62,18 +62,11 @@ public:
- constexpr iterator begin() const noexcept { return data_; }
- constexpr iterator end() const noexcept { return begin() + size(); }
-
-- constexpr const_iterator cbegin() const noexcept { return begin(); }
-- constexpr const_iterator cend() const noexcept { return end(); }
--
- reverse_iterator rbegin() const noexcept
- { return reverse_iterator(end()); }
- reverse_iterator rend() const noexcept
- { return reverse_iterator(begin()); }
-
-- constexpr const_reverse_iterator crbegin() const noexcept
-- { return rbegin(); }
-- constexpr const_reverse_iterator crend() const noexcept { return rend(); }
--
- constexpr size_type size() const noexcept { return size_; }
-
- constexpr reference operator [](size_type pos) const {
-diff --git a/o3tl/qa/test-span.cxx b/o3tl/qa/test-span.cxx
-index 3cb78ace1db2..26eedfc21938 100644
---- a/o3tl/qa/test-span.cxx
-+++ b/o3tl/qa/test-span.cxx
-@@ -34,15 +34,9 @@ private:
- CPPUNIT_ASSERT_EQUAL(1, *v.begin());
- CPPUNIT_ASSERT_EQUAL(
- o3tl::span<int>::difference_type(3), v.end() - v.begin());
-- CPPUNIT_ASSERT_EQUAL(1, *v.cbegin());
-- CPPUNIT_ASSERT_EQUAL(
-- o3tl::span<int>::difference_type(3), v.cend() - v.cbegin());
- CPPUNIT_ASSERT_EQUAL(3, *v.rbegin());
- CPPUNIT_ASSERT_EQUAL(
- o3tl::span<int>::difference_type(3), v.rend() - v.rbegin());
-- CPPUNIT_ASSERT_EQUAL(3, *v.crbegin());
-- CPPUNIT_ASSERT_EQUAL(
-- o3tl::span<int>::difference_type(3), v.crend() - v.crbegin());
- CPPUNIT_ASSERT_EQUAL(std::size_t(3), v.size());
- CPPUNIT_ASSERT(!v.empty());
- CPPUNIT_ASSERT_EQUAL(2, v[1]);
Deleted: disable-latest-c++.diff
===================================================================
--- disable-latest-c++.diff 2020-08-23 11:42:46 UTC (rev 394596)
+++ disable-latest-c++.diff 2020-08-23 12:25:38 UTC (rev 394597)
@@ -1,149 +0,0 @@
-From a9f77e87f3e6ca3333bbb16dec5456f3bf2903b8 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Sun, 20 Oct 2019 14:42:56 +0200
-Subject: We do not need a C++ GNU dialect
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-1cf7ab61a71d4b7295942ff5c855896e60c15081 "use -std=gnu++0x rather than
--std=c++0x" appears to have started this, but the only rationale it gives is
-that it keeps things in sync with GCC's default behavior when no -std= is given.
-But it apparently works fine to build with a -std=c++... standard dialect.
-
-This allows to get rid of the check introduced with
-50cd28e5728b6a64c1e605567540739ea6ef42ca "Ensure configuration that defines
-math_errhandling in <cmath>".
-
-(It kept bothering me to say "I observe this-and-this with -std=c++2a" when what
-configure.ac made me actually use was -std=gnu++2a. And truthfully saying
-"-std=gnu++2a" would have been a distraction, as what is relevant for such an
-observation is most likely the "2a" and not the "gnu" part.)
-
-Change-Id: I7c213a702ffb7df6f4c2c4a421008e30e2712a51
-Reviewed-on: https://gerrit.libreoffice.org/81176
-Tested-by: Jenkins
-Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
----
- configure.ac | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-(limited to 'configure.ac')
-
-diff --git a/configure.ac b/configure.ac
-index 422efbdc7b46..9c8d512be07b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -6432,7 +6432,7 @@ CXXFLAGS_CXX11=
- if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
- CXXFLAGS_CXX11='-std:c++17 -Zc:__cplusplus'
- elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
-- my_flags='-std=gnu++2a -std=c++2a -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z'
-+ my_flags='-std=c++2a -std=c++17 -std=c++1z'
- for flag in $my_flags; do
- if test "$COM" = MSC; then
- flag="-Xclang $flag"
-@@ -6475,7 +6475,6 @@ elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
- ])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <algorithm>
-- #include <cmath>
- #include <functional>
- #include <vector>
-
-@@ -6495,13 +6494,6 @@ elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
- void f(std::vector<int> & v, std::function<bool(int, int)> fn) {
- std::sort(v.begin(), v.end(), fn);
- }
--
-- // At least with glibc-headers-2.28-26.fc29.x86_64, when building for Linux x86 32-bit
-- // (via -m32) and passed-in CXXFLAGS setting -O1 (or higher; overriding -Os as set in
-- // solenv/gbuild/platform/LINUX_INTEL_GCC.mk), std=gnu* would cause math_errhandling to
-- // get undef'ed in /usr/include/bits/mathinline.h, while std=c* keeps it defined (as
-- // needed by sc/source/core/tool/math.cxx):
-- int g() { return math_errhandling; }
- ]])],[CXXFLAGS_CXX11=$flag $my_float128hack])
- AC_LANG_POP([C++])
- CXXFLAGS=$save_CXXFLAGS
---
-cgit v1.2.1
-
-From f0b74640137f07ed74027f98fbf6d1c0d98939bf Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Mon, 20 Apr 2020 11:40:24 +0200
-Subject: Add --with-latest-c++ to explicitly opt in for
- -std=c++20/-std:c++latest
-
-Adaptation of this change to this branch. The point is to avoid
-compiling as C++2a as the code for externals has not been patched
-properly for that here. Here is the original commit message even if I
-assume it is a bit misleading in this branch:
-
-cd472d1d8489f30797f47d3f6dafede28c1feb90 "Compile as C++2a, where available" had
-started to unconditionally check for support of -std=c++2a (and later also
--std=c++20) for Clang and GCC, but that can cause occasional issues especially
-for Linux distros, see e.g. 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 "replace
-boost::bimap in sdext pdfimport" or
-<https://bugzilla.redhat.com/show_bug.cgi?id=1818723>
-"/usr/include/boost/format/alt_sstream_impl.hpp incompatible with -std=c++20
-(std::allocator::allocate hint argument)" (where
-677c8de4fa79cd9b278b142013ba7f1c9e4e41c3 "external/boost: Adapt to
-std::allocator parts removed in C++20" is not picked up due to
---with-system-boost).
-
-So better require an explicit opt-in via a new --with-latest-c++. And while at
-it, also make that enable -std:c++latest for MSVC.
-
-Change-Id: I2d1f03144fad9a7884562e56b1b76cab5eb8f080
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92555
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93204
-Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
-Reviewed-by: Tor Lillqvist <tml at collabora.com>
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93692
-Tested-by: Tor Lillqvist <tml at collabora.com>
----
- configure.ac | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 78080305f3d6..8364138bdc96 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2143,6 +2143,12 @@ libo_FUZZ_ARG_WITH(lxml,
- report widget classes and ids.]),
- ,)
-
-+libo_FUZZ_ARG_WITH(latest-c++,
-+ AS_HELP_STRING([--with-latest-c++],
-+ [Try to enable the latest features of the C++ compiler, even if they are not yet part of a
-+ published standard.]),,
-+ [$with_latest_c__=no])
-+
- dnl ===================================================================
- dnl Branding
- dnl ===================================================================
-@@ -6456,9 +6462,17 @@ dnl ===================================================================
- AC_MSG_CHECKING([whether $CXX_BASE supports C++17])
- CXXFLAGS_CXX11=
- if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
-- CXXFLAGS_CXX11='-std:c++17 -Zc:__cplusplus'
-+ if test "$with_latest_c__" = yes; then
-+ CXXFLAGS_CXX11=-std:c++latest
-+ else
-+ CXXFLAGS_CXX11=-std:c++17
-+ fi
-+ CXXFLAGS_CXX11="$CXXFLAGS_CXX11 -Zc:__cplusplus"
- elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
-- my_flags='-std=c++2a -std=c++17 -std=c++1z'
-+ my_flags='-std=c++17 -std=c++1z'
-+ if test "$with_latest_c__" = yes; then
-+ my_flags="-std=gnu++2a -std=c++2a $my_flags"
-+ fi
- for flag in $my_flags; do
- if test "$COM" = MSC; then
- flag="-Xclang $flag"
---
-cgit v1.2.1
-
Deleted: libreoffice-poppler-0.86.patch
===================================================================
--- libreoffice-poppler-0.86.patch 2020-08-23 11:42:46 UTC (rev 394596)
+++ libreoffice-poppler-0.86.patch 2020-08-23 12:25:38 UTC (rev 394597)
@@ -1,15 +0,0 @@
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index e9c2a407c279..16ad04bf660a 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
- if (!(pAction && pAction->getKind() == actionURI))
- return;
-
--#if POPPLER_CHECK_VERSION(0, 72, 0)
-+#if POPPLER_CHECK_VERSION(0, 86, 0)
-+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
-+#elif POPPLER_CHECK_VERSION(0, 72, 0)
- const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
- #else
- const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
Modified: libreoffice-still.csh
===================================================================
--- libreoffice-still.csh 2020-08-23 11:42:46 UTC (rev 394596)
+++ libreoffice-still.csh 2020-08-23 12:25:38 UTC (rev 394597)
@@ -2,7 +2,6 @@
#setenv SAL_USE_VCLPLUGIN gen
#setenv SAL_USE_VCLPLUGIN gtk3_kde5
-#setenv SAL_USE_VCLPLUGIN kde5
+#setenv SAL_USE_VCLPLUGIN kf5
#setenv SAL_USE_VCLPLUGIN qt5
-#setenv SAL_USE_VCLPLUGIN gtk
#setenv SAL_USE_VCLPLUGIN gtk3
Modified: libreoffice-still.sh
===================================================================
--- libreoffice-still.sh 2020-08-23 11:42:46 UTC (rev 394596)
+++ libreoffice-still.sh 2020-08-23 12:25:38 UTC (rev 394597)
@@ -2,7 +2,6 @@
#export SAL_USE_VCLPLUGIN=gen
#export SAL_USE_VCLPLUGIN=gtk3_kde5
-#export SAL_USE_VCLPLUGIN=kde5
+#export SAL_USE_VCLPLUGIN=kf5
#export SAL_USE_VCLPLUGIN=qt5
-#export SAL_USE_VCLPLUGIN=gtk
#export SAL_USE_VCLPLUGIN=gtk3
More information about the arch-commits
mailing list