From 861a86dfca00bc42b57d70621605d5831e6305a5 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 1 May 2015 20:09:28 +0000 Subject: Revert "update to liborcus 0.9.0" This reverts commit a1280bd47fddd668f1ff224f18639c8d595ec6f7. Change-Id: I2ad873f012ebae6858c8895c14ed695dbd881fc4 Reviewed-on: https://gerrit.libreoffice.org/15586 Tested-by: Markus Mohrhard Reviewed-by: Markus Mohrhard --- external/liborcus/UnpackedTarball_liborcus.mk | 13 +- external/liborcus/liborcus-boost-msvc.patch.1 | 14 -- external/liborcus/liborcus-fix-win-build.patch.1 | 265 ---------------------- external/liborcus/liborcus-mdds-configure.patch.1 | 70 ------ external/liborcus/liborcus_0.1.0-dllimport.patch | 24 ++ external/liborcus/visibility.patch | 11 + 6 files changed, 45 insertions(+), 352 deletions(-) delete mode 100644 external/liborcus/liborcus-boost-msvc.patch.1 delete mode 100644 external/liborcus/liborcus-fix-win-build.patch.1 delete mode 100644 external/liborcus/liborcus-mdds-configure.patch.1 create mode 100644 external/liborcus/liborcus_0.1.0-dllimport.patch create mode 100644 external/liborcus/visibility.patch (limited to 'external/liborcus') diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 537291175b5f..126f250ffb48 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -18,11 +18,18 @@ liborcus_patches := # make config.sub recognize arm-linux-androideabi # liborcus_patches += liborcus_0.1.0-configure.patch -liborcus_patches += liborcus-mdds-configure.patch.1 +# don't use dllimport +liborcus_patches += liborcus_0.1.0-dllimport.patch -liborcus_patches += liborcus-boost-msvc.patch.1 +# Any -fvisibility= etc. settings are passed into liborcus' CXXFLAGS via +# gb_VISIBILITY_FLAGS[_CXX]: +liborcus_patches += visibility.patch -liborcus_patches += liborcus-fix-win-build.patch.1 +# : + +liborcus_patches += liborcus_0.7.0-configure.gcc5.patch.0 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ $(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \ diff --git a/external/liborcus/liborcus-boost-msvc.patch.1 b/external/liborcus/liborcus-boost-msvc.patch.1 deleted file mode 100644 index c25bbf73e6d8..000000000000 --- a/external/liborcus/liborcus-boost-msvc.patch.1 +++ /dev/null @@ -1,14 +0,0 @@ -Only in liborcus: build.log -Only in liborcus: config.log -diff -ur liborcus.org/configure liborcus/configure ---- liborcus.org/configure 2015-04-25 20:24:21.650666000 -0500 -+++ liborcus/configure 2015-04-25 20:25:44.689795700 -0500 -@@ -17021,6 +17021,7 @@ - grep -v '#' | - tr -d '\r' | - tr -s '\n' ' ' | -+ $SED "s/^conftest.$ac_ext //" | - $SED -n -e "/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 2>&1; then : - boost_cv_lib_version=`cat conftest.i` - fi -Only in liborcus: vc120.pdb diff --git a/external/liborcus/liborcus-fix-win-build.patch.1 b/external/liborcus/liborcus-fix-win-build.patch.1 deleted file mode 100644 index 629ff82a7a14..000000000000 --- a/external/liborcus/liborcus-fix-win-build.patch.1 +++ /dev/null @@ -1,265 +0,0 @@ -Only in liborcus: build.log -Only in liborcus: config.h -Only in liborcus: config.log -Only in liborcus: config.status -Only in liborcus/include: Makefile -diff -ur liborcus.org/include/orcus/cell_buffer.hpp liborcus/include/orcus/cell_buffer.hpp ---- liborcus.org/include/orcus/cell_buffer.hpp 2015-05-01 19:01:50.434009426 +0200 -+++ liborcus/include/orcus/cell_buffer.hpp 2015-05-01 19:07:40.932129012 +0200 -@@ -18,7 +18,7 @@ - * Temporary cell buffer used to convert cell values when needed. This is - * used in the sax and csv parsers. - */ --class ORCUS_DLLPUBLIC cell_buffer -+class ORCUS_PSR_DLLPUBLIC cell_buffer - { - std::string m_buffer; - size_t m_buf_size; /// Logical buffer size. May differ from the actual buffer size. -Only in liborcus/include/orcus: Makefile -Only in liborcus/include/orcus/mso: Makefile -Only in liborcus/include/orcus/spreadsheet: Makefile -diff -ur liborcus.org/include/orcus/zip_archive.hpp liborcus/include/orcus/zip_archive.hpp ---- liborcus.org/include/orcus/zip_archive.hpp 2015-05-01 19:01:50.434009426 +0200 -+++ liborcus/include/orcus/zip_archive.hpp 2015-05-01 19:06:53.114202183 +0200 -@@ -22,7 +22,7 @@ - class zip_archive_impl; - class pstring; - --class ORCUS_DLLPUBLIC zip_error : public std::exception -+class ORCUS_PSR_DLLPUBLIC zip_error : public std::exception - { - std::string m_msg; - public: -@@ -33,7 +33,7 @@ - virtual const char* what() const throw(); - }; - --class ORCUS_DLLPUBLIC zip_archive -+class ORCUS_PSR_DLLPUBLIC zip_archive - { - zip_archive_impl* mp_impl; - -diff -ur liborcus.org/include/orcus/zip_archive_stream.hpp liborcus/include/orcus/zip_archive_stream.hpp ---- liborcus.org/include/orcus/zip_archive_stream.hpp 2015-05-01 19:01:50.434009426 +0200 -+++ liborcus/include/orcus/zip_archive_stream.hpp 2015-05-01 19:07:26.067529711 +0200 -@@ -14,7 +14,7 @@ - - namespace orcus { - --class ORCUS_DLLPUBLIC zip_archive_stream -+class ORCUS_PSR_DLLPUBLIC zip_archive_stream - { - public: - virtual ~zip_archive_stream(); -@@ -29,7 +29,7 @@ - * Zip archive based on file descriptor. The caller needs to provide the - * file path to the zip archive. - */ --class ORCUS_DLLPUBLIC zip_archive_stream_fd : public zip_archive_stream -+class ORCUS_PSR_DLLPUBLIC zip_archive_stream_fd : public zip_archive_stream - { - FILE* m_stream; - -@@ -48,7 +48,7 @@ - /** - * Zip archive whose content is already loaded onto memory. - */ --class ORCUS_DLLPUBLIC zip_archive_stream_blob : public zip_archive_stream -+class ORCUS_PSR_DLLPUBLIC zip_archive_stream_blob : public zip_archive_stream - { - const unsigned char* m_blob; - const unsigned char* m_cur; -Only in liborcus: liborcus-0.10.pc -Only in liborcus: liborcus-spreadsheet-model-0.10.pc -Only in liborcus: libtool -Only in liborcus: Makefile -Only in liborcus/parser_handlers: .deps -Only in liborcus/parser_handlers: Makefile -Only in liborcus/src: .deps -Only in liborcus/src/liborcus: .deps -Only in liborcus/src/liborcus: liborcus-0.10.la -Only in liborcus/src/liborcus: liborcus_0.10_la-config.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-config.o -Only in liborcus/src/liborcus: liborcus_0.10_la-css_document_tree.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-css_document_tree.o -Only in liborcus/src/liborcus: liborcus_0.10_la-css_selector.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-css_selector.o -Only in liborcus/src/liborcus: liborcus_0.10_la-detection_result.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-detection_result.o -Only in liborcus/src/liborcus: liborcus_0.10_la-dom_tree.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-dom_tree.o -Only in liborcus/src/liborcus: liborcus_0.10_la-format_detection.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-format_detection.o -Only in liborcus/src/liborcus: liborcus_0.10_la-global.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-global.o -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_cell_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_cell_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_detection_handler.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_detection_handler.o -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_handler.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_handler.o -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_helper.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_helper.o -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_namespace_types.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_namespace_types.o -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_sheet_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_sheet_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_tokens.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-gnumeric_tokens.o -Only in liborcus/src/liborcus: liborcus_0.10_la-interface.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-interface.o -Only in liborcus/src/liborcus: liborcus_0.10_la-measurement.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-measurement.o -Only in liborcus/src/liborcus: liborcus_0.10_la-odf_namespace_types.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-odf_namespace_types.o -Only in liborcus/src/liborcus: liborcus_0.10_la-odf_para_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-odf_para_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-odf_styles_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-odf_styles_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-odf_styles.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-odf_styles.o -Only in liborcus/src/liborcus: liborcus_0.10_la-odf_tokens.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-odf_tokens.o -Only in liborcus/src/liborcus: liborcus_0.10_la-ods_content_xml_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-ods_content_xml_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-ods_content_xml_handler.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-ods_content_xml_handler.o -Only in liborcus/src/liborcus: liborcus_0.10_la-ods_session_data.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-ods_session_data.o -Only in liborcus/src/liborcus: liborcus_0.10_la-ooxml_content_types.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-ooxml_content_types.o -Only in liborcus/src/liborcus: liborcus_0.10_la-ooxml_global.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-ooxml_global.o -Only in liborcus/src/liborcus: liborcus_0.10_la-ooxml_namespace_types.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-ooxml_namespace_types.o -Only in liborcus/src/liborcus: liborcus_0.10_la-ooxml_schemas.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-ooxml_schemas.o -Only in liborcus/src/liborcus: liborcus_0.10_la-ooxml_tokens.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-ooxml_tokens.o -Only in liborcus/src/liborcus: liborcus_0.10_la-ooxml_types.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-ooxml_types.o -Only in liborcus/src/liborcus: liborcus_0.10_la-opc_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-opc_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-opc_reader.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-opc_reader.o -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_csv.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_csv.o -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_gnumeric.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_gnumeric.o -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_import_xlsx.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_import_xlsx.o -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_ods.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_ods.o -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_xlsx.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_xls_xml.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_xls_xml.o -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_xlsx.o -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_xml.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-orcus_xml.o -Only in liborcus/src/liborcus: liborcus_0.10_la-session_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-session_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-spreadsheet_interface.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-spreadsheet_interface.o -Only in liborcus/src/liborcus: liborcus_0.10_la-spreadsheet_types.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-spreadsheet_types.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_autofilter_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_autofilter_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_conditional_format_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_conditional_format_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_handler.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_handler.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_helper.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_helper.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xls_xml_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xls_xml_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xls_xml_detection_handler.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xls_xml_detection_handler.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xls_xml_handler.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xls_xml_handler.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xls_xml_namespace_types.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xls_xml_namespace_types.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xls_xml_tokens.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xls_xml_tokens.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_pivot_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_pivot_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_revision_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_revision_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_session_data.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_session_data.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_sheet_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_sheet_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_table_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_table_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_types.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_types.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_workbook_context.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xlsx_workbook_context.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_context_base.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_context_base.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_context_global.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_context_global.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_map_tree.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_map_tree.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_simple_stream_handler.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_simple_stream_handler.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_stream_handler.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_stream_handler.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_stream_parser.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_stream_parser.o -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_structure_tree.lo -Only in liborcus/src/liborcus: liborcus_0.10_la-xml_structure_tree.o -Only in liborcus/src/liborcus: .libs -Only in liborcus/src/liborcus: Makefile -Only in liborcus/src: Makefile -Only in liborcus/src/mso: .deps -Only in liborcus/src/mso: encryption_info.lo -Only in liborcus/src/mso: encryption_info.o -Only in liborcus/src/mso: liborcus-mso-0.10.la -Only in liborcus/src/mso: .libs -Only in liborcus/src/mso: Makefile -Only in liborcus/src/parser: base64.lo -Only in liborcus/src/parser: base64.o -Only in liborcus/src/parser: cell_buffer.lo -Only in liborcus/src/parser: cell_buffer.o -Only in liborcus/src/parser: css_parser_base.lo -Only in liborcus/src/parser: css_parser_base.o -Only in liborcus/src/parser: css_types.lo -Only in liborcus/src/parser: css_types.o -Only in liborcus/src/parser: csv_parser_base.lo -Only in liborcus/src/parser: csv_parser_base.o -Only in liborcus/src/parser: .deps -Only in liborcus/src/parser: exception.lo -Only in liborcus/src/parser: exception.o -Only in liborcus/src/parser: liborcus-parser-0.10.la -Only in liborcus/src/parser: .libs -Only in liborcus/src/parser: Makefile -Only in liborcus/src/parser: parser_global.lo -Only in liborcus/src/parser: parser_global.o -Only in liborcus/src/parser: pstring.lo -Only in liborcus/src/parser: pstring.o -Only in liborcus/src/parser: sax_parser_base.lo -Only in liborcus/src/parser: sax_parser_base.o -Only in liborcus/src/parser: sax_token_parser.lo -Only in liborcus/src/parser: sax_token_parser.o -Only in liborcus/src/parser: stream.lo -Only in liborcus/src/parser: stream.o -Only in liborcus/src/parser: string_pool.lo -Only in liborcus/src/parser: string_pool.o -Only in liborcus/src/parser: tokens.lo -Only in liborcus/src/parser: tokens.o -Only in liborcus/src/parser: types.lo -Only in liborcus/src/parser: types.o -Only in liborcus/src/parser: xml_namespace.lo -Only in liborcus/src/parser: xml_namespace.o -Only in liborcus/src/parser: zip_archive.lo -Only in liborcus/src/parser: zip_archive.o -Only in liborcus/src/parser: zip_archive_stream.lo -Only in liborcus/src/parser: zip_archive_stream.o -Only in liborcus/src/spreadsheet: .deps -Only in liborcus/src/spreadsheet: Makefile -Only in liborcus: stamp-h1 -Only in liborcus: VERSION diff --git a/external/liborcus/liborcus-mdds-configure.patch.1 b/external/liborcus/liborcus-mdds-configure.patch.1 deleted file mode 100644 index 75845ccf8f24..000000000000 --- a/external/liborcus/liborcus-mdds-configure.patch.1 +++ /dev/null @@ -1,70 +0,0 @@ -Only in liborcus: build.log -Only in liborcus: config.h -Only in liborcus: config.log -Only in liborcus: config.status -diff -ur liborcus.org/configure liborcus/configure ---- liborcus.org/configure 2015-04-24 00:27:45.989048698 +0200 -+++ liborcus/configure 2015-04-24 00:28:16.978301439 +0200 -@@ -19323,7 +19323,7 @@ - $as_echo "yes" >&6; } - - fi --CXXFLAGS="$CXXFLAGS -DMDDS_HASH_CONTAINER_BOOST" -+CXXFLAGS="$CXXFLAGS -DMDDS_HASH_CONTAINER_BOOST $MDDS_CFLAGS" - - # ================= - # Spreadsheet model -Only in liborcus/include: Makefile -Only in liborcus/include/orcus: Makefile -Only in liborcus/include/orcus/mso: Makefile -Only in liborcus/include/orcus/spreadsheet: Makefile -Only in liborcus: liborcus-0.10.pc -Only in liborcus: liborcus-spreadsheet-model-0.10.pc -Only in liborcus: libtool -Only in liborcus: Makefile -Only in liborcus/parser_handlers: .deps -Only in liborcus/parser_handlers: Makefile -Only in liborcus/src: .deps -Only in liborcus/src/liborcus: .deps -Only in liborcus/src/liborcus: Makefile -Only in liborcus/src: Makefile -Only in liborcus/src/mso: .deps -Only in liborcus/src/mso: Makefile -Only in liborcus/src/parser: base64.lo -Only in liborcus/src/parser: base64.o -Only in liborcus/src/parser: cell_buffer.lo -Only in liborcus/src/parser: cell_buffer.o -Only in liborcus/src/parser: css_parser_base.lo -Only in liborcus/src/parser: css_parser_base.o -Only in liborcus/src/parser: csv_parser_base.lo -Only in liborcus/src/parser: csv_parser_base.o -Only in liborcus/src/parser: .deps -Only in liborcus/src/parser: exception.lo -Only in liborcus/src/parser: exception.o -Only in liborcus/src/parser: Makefile -Only in liborcus/src/parser: parser_global.lo -Only in liborcus/src/parser: parser_global.o -Only in liborcus/src/parser: pstring.lo -Only in liborcus/src/parser: pstring.o -Only in liborcus/src/parser: sax_parser_base.lo -Only in liborcus/src/parser: sax_parser_base.o -Only in liborcus/src/parser: sax_token_parser.lo -Only in liborcus/src/parser: sax_token_parser.o -Only in liborcus/src/parser: stream.lo -Only in liborcus/src/parser: stream.o -Only in liborcus/src/parser: string_pool.lo -Only in liborcus/src/parser: string_pool.o -Only in liborcus/src/parser: tokens.lo -Only in liborcus/src/parser: tokens.o -Only in liborcus/src/parser: types.lo -Only in liborcus/src/parser: types.o -Only in liborcus/src/parser: xml_namespace.lo -Only in liborcus/src/parser: xml_namespace.o -Only in liborcus/src/parser: zip_archive.lo -Only in liborcus/src/parser: zip_archive.o -Only in liborcus/src/parser: zip_archive_stream.lo -Only in liborcus/src/parser: zip_archive_stream.o -Only in liborcus/src/spreadsheet: .deps -Only in liborcus/src/spreadsheet: Makefile -Only in liborcus: stamp-h1 -Only in liborcus: VERSION diff --git a/external/liborcus/liborcus_0.1.0-dllimport.patch b/external/liborcus/liborcus_0.1.0-dllimport.patch new file mode 100644 index 000000000000..8940155c9308 --- /dev/null +++ b/external/liborcus/liborcus_0.1.0-dllimport.patch @@ -0,0 +1,24 @@ +--- include/orcus/env.hpp ++++ include/orcus/env.hpp +@@ -35,19 +35,13 @@ + #else + #define ORCUS_DLLPUBLIC __declspec(dllexport) + #endif +- #elif defined __ORCUS_STATIC_LIB ++ #else + #define ORCUS_DLLPUBLIC +- #else +- #ifdef __GNUC__ +- #define ORCUS_DLLPUBLIC __attribute__ ((dllimport)) +- #else +- #define ORCUS_DLLPUBLIC __declspec(dllimport) +- #endif + #endif + #define ORCUS_DLLLOCAL + #else + #if __GNUC__ >= 4 +- #define ORCUS_DLLPUBLIC __attribute__ ((visibility ("default"))) ++ #define ORCUS_DLLPUBLIC __attribute__ ((visibility ("hidden"))) + #define ORCUS_DLLLOCAL __attribute__ ((visibility ("hidden"))) + #else + #define ORCUS_DLLPUBLIC diff --git a/external/liborcus/visibility.patch b/external/liborcus/visibility.patch new file mode 100644 index 000000000000..a5af6398b839 --- /dev/null +++ b/external/liborcus/visibility.patch @@ -0,0 +1,11 @@ +--- configure ++++ configure +@@ -3211,7 +3211,7 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +-CXXFLAGS="$CXXFLAGS -O2 -fvisibility=hidden -Wall" ++CXXFLAGS="$CXXFLAGS -O2 -Wall" + + # =========================== + # Find required base packages -- cgit