From 38c4f46325260ffe176937fa309ef804e3bb0c31 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Wed, 15 Nov 2017 20:42:23 -0500 Subject: Updated liborcus to 0.13.1. Change-Id: Id5aa07f87603879fe7a21dc96cad207f1b168286 Reviewed-on: https://gerrit.libreoffice.org/44850 Tested-by: Jenkins Reviewed-by: Kohei Yoshida --- external/liborcus/ExternalPackage_liborcus.mk | 8 ++++---- external/liborcus/ExternalProject_liborcus.mk | 4 ++-- external/liborcus/Library_orcus.mk | 15 ++++++++------- external/liborcus/UnpackedTarball_liborcus.mk | 4 ---- external/liborcus/nullptr-in-ostringstream.patch.1 | 12 ------------ external/liborcus/orcus_allow_missing_xml_header.patch.1 | 12 ------------ external/liborcus/orcus_allow_underscore_in_names.patch.1 | 12 ------------ external/liborcus/visibility.patch.0 | 15 --------------- 8 files changed, 14 insertions(+), 68 deletions(-) delete mode 100644 external/liborcus/nullptr-in-ostringstream.patch.1 delete mode 100644 external/liborcus/orcus_allow_missing_xml_header.patch.1 delete mode 100644 external/liborcus/orcus_allow_underscore_in_names.patch.1 delete mode 100644 external/liborcus/visibility.patch.0 (limited to 'external') diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk index 4a8b5f8bacd6..32382b7d89a1 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.12.0.dylib,src/liborcus/.libs/liborcus-0.12.0.dylib)) -$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.12.0.dylib,src/parser/.libs/liborcus-parser-0.12.0.dylib)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.13.0.dylib,src/liborcus/.libs/liborcus-0.13.0.dylib)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.13.0.dylib,src/parser/.libs/liborcus-parser-0.13.0.dylib)) else ifeq ($(DISABLE_DYNLOADING),) -$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.12.so.0,src/liborcus/.libs/liborcus-0.12.so.0.0.0)) -$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.12.so.0,src/parser/.libs/liborcus-parser-0.12.so.0.0.0)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.13.so.0,src/liborcus/.libs/liborcus-0.13.so.0.0.0)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.13.so.0,src/parser/.libs/liborcus-parser-0.13.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 3b7ea728b216..01c7c050d04a 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -114,8 +114,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.12.0.dylib \ - $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.12.0.dylib \ + $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.13.0.dylib \ + $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.13.0.dylib \ ) \ ) diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk index adc43cb1cc9b..9916f6fe5236 100644 --- a/external/liborcus/Library_orcus.mk +++ b/external/liborcus/Library_orcus.mk @@ -67,8 +67,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ UnpackedTarball/liborcus/src/liborcus/odf_namespace_types \ UnpackedTarball/liborcus/src/liborcus/odf_number_formatting_context \ UnpackedTarball/liborcus/src/liborcus/odf_para_context \ - UnpackedTarball/liborcus/src/liborcus/odf_styles_context \ UnpackedTarball/liborcus/src/liborcus/odf_styles \ + UnpackedTarball/liborcus/src/liborcus/odf_styles_context \ UnpackedTarball/liborcus/src/liborcus/odf_tokens \ UnpackedTarball/liborcus/src/liborcus/ods_content_xml_context \ UnpackedTarball/liborcus/src/liborcus/ods_content_xml_handler \ @@ -86,23 +86,24 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ UnpackedTarball/liborcus/src/liborcus/orcus_import_ods \ UnpackedTarball/liborcus/src/liborcus/orcus_import_xlsx \ UnpackedTarball/liborcus/src/liborcus/orcus_ods \ - UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \ UnpackedTarball/liborcus/src/liborcus/orcus_xls_xml \ + UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \ UnpackedTarball/liborcus/src/liborcus/orcus_xml \ UnpackedTarball/liborcus/src/liborcus/session_context \ UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \ UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \ UnpackedTarball/liborcus/src/liborcus/string_helper \ - UnpackedTarball/liborcus/src/liborcus/xlsx_autofilter_context \ - UnpackedTarball/liborcus/src/liborcus/xlsx_conditional_format_context \ - UnpackedTarball/liborcus/src/liborcus/xlsx_context \ - UnpackedTarball/liborcus/src/liborcus/xlsx_handler \ - UnpackedTarball/liborcus/src/liborcus/xlsx_helper \ UnpackedTarball/liborcus/src/liborcus/xls_xml_context \ UnpackedTarball/liborcus/src/liborcus/xls_xml_detection_handler \ UnpackedTarball/liborcus/src/liborcus/xls_xml_handler \ UnpackedTarball/liborcus/src/liborcus/xls_xml_namespace_types \ UnpackedTarball/liborcus/src/liborcus/xls_xml_tokens \ + UnpackedTarball/liborcus/src/liborcus/xlsx_autofilter_context \ + UnpackedTarball/liborcus/src/liborcus/xlsx_conditional_format_context \ + UnpackedTarball/liborcus/src/liborcus/xlsx_context \ + UnpackedTarball/liborcus/src/liborcus/xlsx_drawing_context \ + UnpackedTarball/liborcus/src/liborcus/xlsx_handler \ + UnpackedTarball/liborcus/src/liborcus/xlsx_helper \ UnpackedTarball/liborcus/src/liborcus/xlsx_pivot_context \ UnpackedTarball/liborcus/src/liborcus/xlsx_revision_context \ UnpackedTarball/liborcus/src/liborcus/xlsx_session_data \ diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 655aa496e2f2..b3261a5fa993 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -18,10 +18,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \ external/liborcus/rpath.patch.0 \ - external/liborcus/visibility.patch.0 \ - external/liborcus/nullptr-in-ostringstream.patch.1 \ - external/liborcus/orcus_allow_missing_xml_header.patch.1 \ - external/liborcus/orcus_allow_underscore_in_names.patch.1 \ )) ifeq ($(OS),WNT) diff --git a/external/liborcus/nullptr-in-ostringstream.patch.1 b/external/liborcus/nullptr-in-ostringstream.patch.1 deleted file mode 100644 index d8b97ee2c92a..000000000000 --- a/external/liborcus/nullptr-in-ostringstream.patch.1 +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur liborcus.org/src/liborcus/xml_context_base.cpp liborcus/src/liborcus/xml_context_base.cpp ---- liborcus.org/src/liborcus/xml_context_base.cpp 2017-06-30 14:32:19.044195127 +0200 -+++ liborcus/src/liborcus/xml_context_base.cpp 2017-06-30 14:34:27.580268421 +0200 -@@ -171,7 +171,7 @@ - - // Create a generic error message. - ostringstream os; -- os << "element '" << ns << ":" << m_tokens.get_token_name(name) << "' expected, but '"; -+ os << "element '" << (ns ? ns : "") << ":" << m_tokens.get_token_name(name) << "' expected, but '"; - os << elem.first << ":" << m_tokens.get_token_name(elem.second) << "' encountered."; - throw xml_structure_error(os.str()); - } diff --git a/external/liborcus/orcus_allow_missing_xml_header.patch.1 b/external/liborcus/orcus_allow_missing_xml_header.patch.1 deleted file mode 100644 index 2cfd498c7eae..000000000000 --- a/external/liborcus/orcus_allow_missing_xml_header.patch.1 +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur liborcus.org/include/orcus/sax_parser.hpp liborcus/include/orcus/sax_parser.hpp ---- liborcus.org/include/orcus/sax_parser.hpp 2017-08-12 09:44:21.379509116 +0200 -+++ liborcus/include/orcus/sax_parser.hpp 2017-08-12 09:46:06.884259216 +0200 -@@ -20,7 +20,7 @@ - * parsing regardless of whether or not the xml stream begins with a - * declaration. - */ -- static const bool strict_xml_declaration = true; -+ static const bool strict_xml_declaration = false; - }; - - /** diff --git a/external/liborcus/orcus_allow_underscore_in_names.patch.1 b/external/liborcus/orcus_allow_underscore_in_names.patch.1 deleted file mode 100644 index b5acc5a0938b..000000000000 --- a/external/liborcus/orcus_allow_underscore_in_names.patch.1 +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur liborcus.org/src/parser/sax_parser_base.cpp liborcus/src/parser/sax_parser_base.cpp ---- liborcus.org/src/parser/sax_parser_base.cpp 2017-08-12 10:39:49.963174114 +0200 -+++ liborcus/src/parser/sax_parser_base.cpp 2017-08-12 10:41:32.026899749 +0200 -@@ -334,7 +334,7 @@ - { - const char* p0 = mp_char; - char c = cur_char(); -- if (!is_alpha(c)) -+ if (!is_alpha(c) && c != '_') - { - ::std::ostringstream os; - os << "name must begin with an alphabet, but got this instead '" << c << "'"; diff --git a/external/liborcus/visibility.patch.0 b/external/liborcus/visibility.patch.0 deleted file mode 100644 index a62ecf753dc8..000000000000 --- a/external/liborcus/visibility.patch.0 +++ /dev/null @@ -1,15 +0,0 @@ -Upstreamed as - -"Allow passed-in CXXFLAGS to override -fvisibility=hidden": - ---- configure -+++ configure -@@ -4255,7 +4255,7 @@ - - fi - --CXXFLAGS="$CXXFLAGS -fvisibility=hidden -Wall -pthread" -+CXXFLAGS="-fvisibility=hidden $CXXFLAGS -Wall -pthread" - - # =========================== - # Find required base packages -- cgit v1.2.3