| author | Andreas Radke
<andyrtr@archlinux.org> 2020-01-29 19:55:52 UTC |
| committer | Andreas Radke
<andyrtr@archlinux.org> 2020-01-29 19:55:52 UTC |
| parent | 8e74d5c50e28a68603ddeff66f6b6e41bf69924d |
| 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch | +621 | -0 |
| PKGBUILD | +50 | -23 |
| python-3.8.patch | +0 | -199 |
| soffice-template.desktop.in | +7 | -0 |
diff --git a/0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch b/0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch new file mode 100644 index 0000000..85c9530 --- /dev/null +++ b/0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch @@ -0,0 +1,621 @@ +From 8f5dd7babe306a1c9dcdec93372a3d4378e09667 Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida <kohei@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@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) +--- + 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@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@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 + diff --git a/PKGBUILD b/PKGBUILD index a77ba2b..c73af15 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,9 +10,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 pkgbase=libreoffice-still pkgname=('libreoffice-still-sdk' 'libreoffice-still') -_LOver=6.2.8.2 -pkgver=6.2.8 -pkgrel=5 +_LOver=6.3.4.2 +pkgver=6.3.4 +pkgrel=1 arch=('x86_64') license=('LGPL3') url="https://www.libreoffice.org/" @@ -42,66 +42,68 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - ${_additional_source_url}/language-subtag-registry-2018-04-23.tar.bz2 + ${_additional_source_url}/language-subtag-registry-2019-04-03.tar.bz2 ${_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-3550.tar.bz2 + ${_additional_source_url}/pdfium-3794.tar.bz2 ${_additional_source_url}/lxml-4.1.1.tgz ${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2 ${_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}/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf + ${_additional_source_url2}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff - python-3.8.patch + soffice-template.desktop.in libreoffice-still.sh libreoffice-still.csh - libreoffice-poppler-0.82.patch::"https://github.com/LibreOffice/core/commit/2eadd46a.patch" - libreoffice-poppler-0.83.patch::"https://github.com/LibreOffice/core/commit/9065cd8d.patch") + libreoffice-poppler-0.82.patch::"https://github.com/LibreOffice/core/commit/2eadd46a.patch" + libreoffice-poppler-0.83.patch::"https://github.com/LibreOffice/core/commit/9065cd8d.patch" + 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch) noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - language-subtag-registry-2018-04-23.tar.bz2 + language-subtag-registry-2019-04-03.tar.bz2 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - pdfium-3550.tar.bz2 + pdfium-3794.tar.bz2 lxml-4.1.1.tgz Firebird-3.0.0.32483-0.tar.bz2 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite - 49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf + 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf 185d60944ea767075d27247c3162b3bc-unowinreg.dll ) validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org> -sha256sums=('3996f54d44187e600bf04c59f3577ecdbf65f29033f5aeac1c9ad20981f4fdda' +sha256sums=('cb72559aa9774f2c13e8fa78391d8f30f3c6f02e3fd83b2311bd643a5cdde49c' 'SKIP' - '4cf965787ef6689daffa8f4b620888b5e7033debfe8afecd2b2ff73b0795fd51' + '8eac0f6a846c90ab06490c0fec144d108da7f88082175eea28b81a0e8942af06' 'SKIP' - 'ed0f6568ee88c2d51b7d4ca127f36bedbcf4214aeabdb957e1b928c93cd2839f' + '74a11926ba96ad2fa373a3231ad2e283d95e2ba4a1458c4c625686569f6f5fe9' 'SKIP' '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870' '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776' - '14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878' + 'a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d' 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370' '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133' '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' - '572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679' + 'e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4' '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e' '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860' 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504' - '49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63' + '884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' - '98f8ab4fba7b6a1c64f7e3cfe597083cafdd60e31bfd6b2da20456a2089d8581' + 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' 'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2' '07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6' 'd649a07b38af95e9012633e71829fef3001e8a5830544ce7e91856df27f69c4b' - 'a769b0e093a58a0d2b681a1ce4aec2c763157f27b82c86e8644e2055cf5f8e99') + 'a769b0e093a58a0d2b681a1ce4aec2c763157f27b82c86e8644e2055cf5f8e99' + '77214ebc425916990ed80e9508572fd1d565412e1f8c2289424457e3d9bcbc79') prepare() { @@ -130,11 +132,10 @@ prepare() { ARCH_FLAGS="$ARCH_FLAGS $i" done - patch -p1 -i "$srcdir"/python-3.8.patch # Fix build with python 3.8 - # fix build with poppler 0.82 - patch -p1 -i ../libreoffice-poppler-0.82.patch # fix build with poppler 0.83 patch -p1 -i ../libreoffice-poppler-0.83.patch + # 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() { @@ -342,6 +343,32 @@ package_libreoffice-still() { install -v -m644 "${srcdir}"/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \ "${pkgdir}"/usr/share/metainfo + # add kde filemanager templates; FS#61662 - file taken from Debian + install -dm755 "${pkgdir}"/usr/share/templates/.source + install -v -m644 "${srcdir}"/libreoffice-$_LOver/extras/source/shellnew/soffice.* \ + "${pkgdir}"/usr/share/templates/.source + + cat "${srcdir}"/soffice-template.desktop.in \ + | sed -e "s/@APP@/Writer/" \ + | sed -e "s/@EXT@/odt/" \ + | sed -e "s/@TYPE@/text/" \ + > "${pkgdir}"/usr/share/templates/soffice.odt.desktop + cat "${srcdir}"/soffice-template.desktop.in \ + | sed -e "s/@APP@/Calc/" \ + | sed -e "s/@EXT@/ods/" \ + | sed -e "s/@TYPE@/spreadsheet/" \ + > "${pkgdir}"/usr/share/templates/soffice.ods.desktop + cat "${srcdir}"/soffice-template.desktop.in \ + | sed -e "s/@APP@/Impress/" \ + | sed -e "s/@EXT@/odp/" \ + | sed -e "s/@TYPE@/presentation/" \ + > "${pkgdir}"/usr/share/templates/soffice.odp.desktop + cat "${srcdir}"/soffice-template.desktop.in \ + | sed -e "s/@APP@/Draw/" \ + | sed -e "s/@EXT@/odg/" \ + | sed -e "s/@TYPE@/drawing/" \ + > "${pkgdir}"/usr/share/templates/soffice.odg.desktop + # make all i18n lang packages with help section ('1') available to # fix "F1" not opening translated offline help opening in browser # see also /usr/lib/libreoffice/help/en-US/langnames.js diff --git a/python-3.8.patch b/python-3.8.patch deleted file mode 100644 index 4813ed1..0000000 --- a/python-3.8.patch +++ /dev/null @@ -1,199 +0,0 @@ -From a62b45cf541cf47d136bdff87dff4c13fd4296c2 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 7 Jun 2019 15:57:13 +0200 -Subject: [PATCH] Adapt to upcoming Python 3.8 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -...which changed PyTypeObject in <https://github.com/python/cpython/commit/ -aacc77fbd77640a8f03638216fa09372cc21673d> "bpo-36974: implement PEP 590 -(GH-13185)". - -Change-Id: I687ec38aeda05d0747b9ed08221db75a758bed51 -Reviewed-on: https://gerrit.libreoffice.org/73664 -Tested-by: Jenkins -Reviewed-by: Caolán McNamara <caolanm@redhat.com> -Tested-by: Caolán McNamara <caolanm@redhat.com> -(cherry picked from commit 2bd585f31d7abb066e3f53d9b29c822af20aea69) -Reviewed-on: https://gerrit.libreoffice.org/73778 ---- - pyuno/source/module/pyuno.cxx | 9 ++++++++- - pyuno/source/module/pyuno_callable.cxx | 9 ++++++++- - pyuno/source/module/pyuno_iterator.cxx | 18 ++++++++++++++++-- - pyuno/source/module/pyuno_runtime.cxx | 9 ++++++++- - pyuno/source/module/pyuno_struct.cxx | 9 ++++++++- - 5 files changed, 48 insertions(+), 6 deletions(-) - -diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx -index f5f23bf058fa..e59319030eb8 100644 ---- a/pyuno/source/module/pyuno.cxx -+++ b/pyuno/source/module/pyuno.cxx -@@ -1636,7 +1636,11 @@ static PyTypeObject PyUNOType = - sizeof (PyUNO), - 0, - PyUNO_del, -- nullptr, -+#if PY_VERSION_HEX >= 0x03080000 -+ 0, // Py_ssize_t tp_vectorcall_offset -+#else -+ nullptr, // printfunc tp_print -+#endif - PyUNO_getattr, - PyUNO_setattr, - /* this type does not exist in Python 3: (cmpfunc) */ nullptr, -@@ -1680,6 +1684,9 @@ static PyTypeObject PyUNOType = - , 0 - #if PY_VERSION_HEX >= 0x03040000 - , nullptr -+#if PY_VERSION_HEX >= 0x03080000 -+ , nullptr // vectorcallfunc tp_vectorcall -+#endif - #endif - }; - -diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx -index 6519d20734c9..656d1c84cb0e 100644 ---- a/pyuno/source/module/pyuno_callable.cxx -+++ b/pyuno/source/module/pyuno_callable.cxx -@@ -181,7 +181,11 @@ static PyTypeObject PyUNO_callable_Type = - sizeof (PyUNO_callable), - 0, - ::pyuno::PyUNO_callable_del, -- nullptr, -+#if PY_VERSION_HEX >= 0x03080000 -+ 0, // Py_ssize_t tp_vectorcall_offset -+#else -+ nullptr, // printfunc tp_print -+#endif - nullptr, - nullptr, - nullptr, -@@ -225,6 +229,9 @@ static PyTypeObject PyUNO_callable_Type = - , 0 - #if PY_VERSION_HEX >= 0x03040000 - , nullptr -+#if PY_VERSION_HEX >= 0x03080000 -+ , nullptr // vectorcallfunc tp_vectorcall -+#endif - #endif - }; - -diff --git a/pyuno/source/module/pyuno_iterator.cxx b/pyuno/source/module/pyuno_iterator.cxx -index 5f643c13b67e..a7862857d719 100644 ---- a/pyuno/source/module/pyuno_iterator.cxx -+++ b/pyuno/source/module/pyuno_iterator.cxx -@@ -118,7 +118,11 @@ static PyTypeObject PyUNO_iterator_Type = - sizeof (PyUNO_iterator), - 0, - PyUNO_iterator_del, -- nullptr, -+#if PY_VERSION_HEX >= 0x03080000 -+ 0, // Py_ssize_t tp_vectorcall_offset -+#else -+ nullptr, // printfunc tp_print -+#endif - nullptr, - nullptr, - nullptr, -@@ -162,6 +166,9 @@ static PyTypeObject PyUNO_iterator_Type = - 0 - #if PY_VERSION_HEX >= 0x03040000 - , nullptr -+#if PY_VERSION_HEX >= 0x03080000 -+ , nullptr // vectorcallfunc tp_vectorcall -+#endif - #endif - }; - -@@ -248,7 +255,11 @@ static PyTypeObject PyUNO_list_iterator_Type = - sizeof (PyUNO_list_iterator), - 0, - PyUNO_list_iterator_del, -- nullptr, -+#if PY_VERSION_HEX >= 0x03080000 -+ 0, // Py_ssize_t tp_vectorcall_offset -+#else -+ nullptr, // printfunc tp_print -+#endif - nullptr, - nullptr, - nullptr, -@@ -292,6 +303,9 @@ static PyTypeObject PyUNO_list_iterator_Type = - 0 - #if PY_VERSION_HEX >= 0x03040000 - , nullptr -+#if PY_VERSION_HEX >= 0x03080000 -+ , nullptr // vectorcallfunc tp_vectorcall -+#endif - #endif - }; - -diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx -index 9887c1fbc828..d307f9af363c 100644 ---- a/pyuno/source/module/pyuno_runtime.cxx -+++ b/pyuno/source/module/pyuno_runtime.cxx -@@ -75,7 +75,11 @@ static PyTypeObject RuntimeImpl_Type = - sizeof (RuntimeImpl), - 0, - RuntimeImpl::del, -- nullptr, -+#if PY_VERSION_HEX >= 0x03080000 -+ 0, // Py_ssize_t tp_vectorcall_offset -+#else -+ nullptr, // printfunc tp_print -+#endif - nullptr, - nullptr, - nullptr, -@@ -119,6 +123,9 @@ static PyTypeObject RuntimeImpl_Type = - , 0 - #if PY_VERSION_HEX >= 0x03040000 - , nullptr -+#if PY_VERSION_HEX >= 0x03080000 -+ , nullptr // vectorcallfunc tp_vectorcall -+#endif - #endif - }; - -diff --git a/pyuno/source/module/pyuno_struct.cxx b/pyuno/source/module/pyuno_struct.cxx -index 7088fc346145..9ad9439318ce 100644 ---- a/pyuno/source/module/pyuno_struct.cxx -+++ b/pyuno/source/module/pyuno_struct.cxx -@@ -296,7 +296,11 @@ static PyTypeObject PyUNOStructType = - sizeof (PyUNO), - 0, - PyUNOStruct_del, -- nullptr, -+#if PY_VERSION_HEX >= 0x03080000 -+ 0, // Py_ssize_t tp_vectorcall_offset -+#else -+ nullptr, // printfunc tp_print -+#endif - PyUNOStruct_getattr, - PyUNOStruct_setattr, - /* this type does not exist in Python 3: (cmpfunc) */ nullptr, -@@ -340,6 +344,9 @@ static PyTypeObject PyUNOStructType = - , 0 - #if PY_VERSION_HEX >= 0x03040000 - , nullptr -+#if PY_VERSION_HEX >= 0x03080000 -+ , nullptr // vectorcallfunc tp_vectorcall -+#endif - #endif - }; - -diff --git a/configure.ac b/configure.ac -index 77cbacb109b6..39dd082b8366 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8574,6 +8574,9 @@ if test $enable_python = system; then - if test -z "$PKG_CONFIG"; then - PYTHON_CFLAGS="-I$python_include" - PYTHON_LIBS="-L$python_libdir -lpython$python_version $python_libs" -+ elif $PKG_CONFIG --exists python-$python_version-embed; then -+ PYTHON_CFLAGS="`$PKG_CONFIG --cflags python-$python_version-embed`" -+ PYTHON_LIBS="`$PKG_CONFIG --libs python-$python_version-embed` $python_libs" - elif $PKG_CONFIG --exists python-$python_version; then - PYTHON_CFLAGS="`$PKG_CONFIG --cflags python-$python_version`" - PYTHON_LIBS="`$PKG_CONFIG --libs python-$python_version` $python_libs" diff --git a/soffice-template.desktop.in b/soffice-template.desktop.in new file mode 100644 index 0000000..32a28ef --- /dev/null +++ b/soffice-template.desktop.in @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=LibreOffice @APP@ ... +Comment=Enter LibreOffice @APP@ filename: +Comment[de]=Name der LibreOffice @APP@-Datei eingeben: +Type=Link +URL=.source/soffice.@EXT@ +Icon=libreoffice-oasis-@TYPE@