summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2019-02-19 16:06:34 +0000
committerryoon <ryoon@pkgsrc.org>2019-02-19 16:06:34 +0000
commit459bdf35f1c6ab80f0d302f147ff677e040eb3a4 (patch)
treed6fc8fe7f5b1d4a50ee9e02f65840d6f201779e8 /converters
parentd05f53301ae42585e01bd353fd65af35ccac605a (diff)
downloadpkgsrc-459bdf35f1c6ab80f0d302f147ff677e040eb3a4.tar.gz
Update to 0.14.1
Changelog: orcus 0.14.1 * addressed a number of coverity issues. * improved precision of points-to-twips measurement conversions by reducing the number of numeric operations to be performed. This especially helps on i386 platforms. orcus 0.14.0 * spreadsheet interface * import_data_table::set_range() now receives a parameter of type range_t. * import_sheet::set_array_formula() interface methods have been removed and replaced with import_sheet::get_array_formula() that returns an interface of type import_array_formula. * import_formula interface class has been added to replace the formula related methods of import_sheet. As a result, set_formula(), set_shared_formula(), and set_formula_result() methods have been removed from the import_sheet interface class. * import_auto_filter::set_range() now receives a parameter of type range_t, rather than a string value representing a range. * import_sheet::set_fill_pattern_type() interface method now takes an enum value of type fill_pattern_t, rather than a string value. * xls-xml * pick up the character set from the XML declaration, and pass it to the client app via import_global_settings interface. * support importing of array formulas. * xlsx * support importing of array formulas. * fixed a bug where sheet indices being passed to the append_sheet() interface method were incorrect. * shared formula handling code has been re-worked. * spreadsheet::sheet class has been de-coupled from the import and export interfaces. * previously known as import_styles class is now split into styles class and import_styles factory wrapper class. * sax_parser now gracefully ignores leading whitespace(s) if any, rather than aborting the parsing for it's not a valid XML stream to have leading whitespace(s). In the future we should make this behavior configurable. * python * add orcus.xlsx.read() function that takes a file object to load an xlsx file as a replacement for orcus.xlsx.read_file(). * add orcus.ods.read(), orcus.xls_xml.read(), orcus.csv.read(), and orcus.gnumeric.read() functions. * add orcus.Sheet.write() method which exports sheet content to specified format. For now only the csv format type is supported. * xml_map_tree no longer requires the source stream persisted in memory between the read and write. * the sax parser now stores the offset positions of each element rather than their memory positions, in order to make the position values usable between duplicated stream instances. * xml_structure_tree to support selection of an element by element path. * document * correctly set the argument separator depending on the formula grammar type. This change fixes loading of ods documents with formula cells. * fixed a build issue with boost 1.67.
Diffstat (limited to 'converters')
-rw-r--r--converters/orcus/Makefile7
-rw-r--r--converters/orcus/PLIST157
-rw-r--r--converters/orcus/distinfo11
-rw-r--r--converters/orcus/patches/patch-src_spreadsheet_sheet.cpp30
4 files changed, 86 insertions, 119 deletions
diff --git a/converters/orcus/Makefile b/converters/orcus/Makefile
index 53a0ed7800d..e4789dd32fa 100644
--- a/converters/orcus/Makefile
+++ b/converters/orcus/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2018/12/13 19:51:44 adam Exp $
+# $NetBSD: Makefile,v 1.26 2019/02/19 16:06:34 ryoon Exp $
-DISTNAME= liborcus-0.13.4
+DISTNAME= liborcus-0.14.1
PKGNAME= ${DISTNAME:S/liborcus/orcus/}
-PKGREVISION= 2
CATEGORIES= converters
MASTER_SITES= http://kohei.us/files/orcus/src/
EXTRACT_SUFX= .tar.xz
@@ -26,7 +25,7 @@ PKGCONFIG_OVERRIDE+= liborcus-spreadsheet-model.pc.in
PTHREAD_AUTO_VARS= yes
.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/mdds1.2/buildlink3.mk"
+.include "../../devel/mdds/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../math/libixion/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/orcus/PLIST b/converters/orcus/PLIST
index 9e51105fbb0..bb500d8300d 100644
--- a/converters/orcus/PLIST
+++ b/converters/orcus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2018/02/03 00:04:10 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/02/19 16:06:34 ryoon Exp $
bin/orcus-css-dump
bin/orcus-csv
bin/orcus-detect
@@ -13,81 +13,80 @@ bin/orcus-xml
bin/orcus-xml-dump
bin/orcus-yaml
bin/orcus-zip-dump
-include/liborcus-0.13/orcus/base64.hpp
-include/liborcus-0.13/orcus/cell_buffer.hpp
-include/liborcus-0.13/orcus/config.hpp
-include/liborcus-0.13/orcus/css_document_tree.hpp
-include/liborcus-0.13/orcus/css_parser.hpp
-include/liborcus-0.13/orcus/css_parser_base.hpp
-include/liborcus-0.13/orcus/css_selector.hpp
-include/liborcus-0.13/orcus/css_types.hpp
-include/liborcus-0.13/orcus/csv_parser.hpp
-include/liborcus-0.13/orcus/csv_parser_base.hpp
-include/liborcus-0.13/orcus/detail/parser_token_buffer.hpp
-include/liborcus-0.13/orcus/detail/thread.hpp
-include/liborcus-0.13/orcus/dom_tree.hpp
-include/liborcus-0.13/orcus/env.hpp
-include/liborcus-0.13/orcus/exception.hpp
-include/liborcus-0.13/orcus/format_detection.hpp
-include/liborcus-0.13/orcus/global.hpp
-include/liborcus-0.13/orcus/info.hpp
-include/liborcus-0.13/orcus/interface.hpp
-include/liborcus-0.13/orcus/json_document_tree.hpp
-include/liborcus-0.13/orcus/json_global.hpp
-include/liborcus-0.13/orcus/json_parser.hpp
-include/liborcus-0.13/orcus/json_parser_base.hpp
-include/liborcus-0.13/orcus/json_parser_thread.hpp
-include/liborcus-0.13/orcus/measurement.hpp
-include/liborcus-0.13/orcus/mso/encryption_info.hpp
-include/liborcus-0.13/orcus/orcus_csv.hpp
-include/liborcus-0.13/orcus/orcus_gnumeric.hpp
-include/liborcus-0.13/orcus/orcus_import_ods.hpp
-include/liborcus-0.13/orcus/orcus_import_xlsx.hpp
-include/liborcus-0.13/orcus/orcus_ods.hpp
-include/liborcus-0.13/orcus/orcus_xls_xml.hpp
-include/liborcus-0.13/orcus/orcus_xlsx.hpp
-include/liborcus-0.13/orcus/orcus_xml.hpp
-include/liborcus-0.13/orcus/parser_base.hpp
-include/liborcus-0.13/orcus/parser_global.hpp
-include/liborcus-0.13/orcus/pstring.hpp
-include/liborcus-0.13/orcus/sax_ns_parser.hpp
-include/liborcus-0.13/orcus/sax_parser.hpp
-include/liborcus-0.13/orcus/sax_parser_base.hpp
-include/liborcus-0.13/orcus/sax_token_parser.hpp
-include/liborcus-0.13/orcus/sax_token_parser_thread.hpp
-include/liborcus-0.13/orcus/spreadsheet/auto_filter.hpp
-include/liborcus-0.13/orcus/spreadsheet/document.hpp
-include/liborcus-0.13/orcus/spreadsheet/export_interface.hpp
-include/liborcus-0.13/orcus/spreadsheet/factory.hpp
-include/liborcus-0.13/orcus/spreadsheet/global_settings.hpp
-include/liborcus-0.13/orcus/spreadsheet/import_interface.hpp
-include/liborcus-0.13/orcus/spreadsheet/import_interface_pivot.hpp
-include/liborcus-0.13/orcus/spreadsheet/import_interface_view.hpp
-include/liborcus-0.13/orcus/spreadsheet/pivot.hpp
-include/liborcus-0.13/orcus/spreadsheet/shared_strings.hpp
-include/liborcus-0.13/orcus/spreadsheet/sheet.hpp
-include/liborcus-0.13/orcus/spreadsheet/sheet_properties.hpp
-include/liborcus-0.13/orcus/spreadsheet/sheet_range.hpp
-include/liborcus-0.13/orcus/spreadsheet/styles.hpp
-include/liborcus-0.13/orcus/spreadsheet/types.hpp
-include/liborcus-0.13/orcus/spreadsheet/view.hpp
-include/liborcus-0.13/orcus/spreadsheet/view_types.hpp
-include/liborcus-0.13/orcus/stream.hpp
-include/liborcus-0.13/orcus/string_pool.hpp
-include/liborcus-0.13/orcus/threaded_json_parser.hpp
-include/liborcus-0.13/orcus/threaded_sax_token_parser.hpp
-include/liborcus-0.13/orcus/tokens.hpp
-include/liborcus-0.13/orcus/types.hpp
-include/liborcus-0.13/orcus/xml_namespace.hpp
-include/liborcus-0.13/orcus/xml_structure_tree.hpp
-include/liborcus-0.13/orcus/yaml_document_tree.hpp
-include/liborcus-0.13/orcus/yaml_parser.hpp
-include/liborcus-0.13/orcus/yaml_parser_base.hpp
-include/liborcus-0.13/orcus/zip_archive.hpp
-include/liborcus-0.13/orcus/zip_archive_stream.hpp
-lib/liborcus-0.13.la
-lib/liborcus-mso-0.13.la
-lib/liborcus-parser-0.13.la
-lib/liborcus-spreadsheet-model-0.13.la
-lib/pkgconfig/liborcus-0.13.pc
-lib/pkgconfig/liborcus-spreadsheet-model-0.13.pc
+include/liborcus-0.14/orcus/base64.hpp
+include/liborcus-0.14/orcus/cell_buffer.hpp
+include/liborcus-0.14/orcus/config.hpp
+include/liborcus-0.14/orcus/css_document_tree.hpp
+include/liborcus-0.14/orcus/css_parser.hpp
+include/liborcus-0.14/orcus/css_parser_base.hpp
+include/liborcus-0.14/orcus/css_selector.hpp
+include/liborcus-0.14/orcus/css_types.hpp
+include/liborcus-0.14/orcus/csv_parser.hpp
+include/liborcus-0.14/orcus/csv_parser_base.hpp
+include/liborcus-0.14/orcus/detail/parser_token_buffer.hpp
+include/liborcus-0.14/orcus/detail/thread.hpp
+include/liborcus-0.14/orcus/dom_tree.hpp
+include/liborcus-0.14/orcus/env.hpp
+include/liborcus-0.14/orcus/exception.hpp
+include/liborcus-0.14/orcus/format_detection.hpp
+include/liborcus-0.14/orcus/global.hpp
+include/liborcus-0.14/orcus/info.hpp
+include/liborcus-0.14/orcus/interface.hpp
+include/liborcus-0.14/orcus/json_document_tree.hpp
+include/liborcus-0.14/orcus/json_global.hpp
+include/liborcus-0.14/orcus/json_parser.hpp
+include/liborcus-0.14/orcus/json_parser_base.hpp
+include/liborcus-0.14/orcus/json_parser_thread.hpp
+include/liborcus-0.14/orcus/measurement.hpp
+include/liborcus-0.14/orcus/mso/encryption_info.hpp
+include/liborcus-0.14/orcus/orcus_csv.hpp
+include/liborcus-0.14/orcus/orcus_gnumeric.hpp
+include/liborcus-0.14/orcus/orcus_import_ods.hpp
+include/liborcus-0.14/orcus/orcus_import_xlsx.hpp
+include/liborcus-0.14/orcus/orcus_ods.hpp
+include/liborcus-0.14/orcus/orcus_xls_xml.hpp
+include/liborcus-0.14/orcus/orcus_xlsx.hpp
+include/liborcus-0.14/orcus/orcus_xml.hpp
+include/liborcus-0.14/orcus/parser_base.hpp
+include/liborcus-0.14/orcus/parser_global.hpp
+include/liborcus-0.14/orcus/pstring.hpp
+include/liborcus-0.14/orcus/sax_ns_parser.hpp
+include/liborcus-0.14/orcus/sax_parser.hpp
+include/liborcus-0.14/orcus/sax_parser_base.hpp
+include/liborcus-0.14/orcus/sax_token_parser.hpp
+include/liborcus-0.14/orcus/sax_token_parser_thread.hpp
+include/liborcus-0.14/orcus/spreadsheet/auto_filter.hpp
+include/liborcus-0.14/orcus/spreadsheet/config.hpp
+include/liborcus-0.14/orcus/spreadsheet/document.hpp
+include/liborcus-0.14/orcus/spreadsheet/export_interface.hpp
+include/liborcus-0.14/orcus/spreadsheet/factory.hpp
+include/liborcus-0.14/orcus/spreadsheet/import_interface.hpp
+include/liborcus-0.14/orcus/spreadsheet/import_interface_pivot.hpp
+include/liborcus-0.14/orcus/spreadsheet/import_interface_view.hpp
+include/liborcus-0.14/orcus/spreadsheet/pivot.hpp
+include/liborcus-0.14/orcus/spreadsheet/shared_strings.hpp
+include/liborcus-0.14/orcus/spreadsheet/sheet.hpp
+include/liborcus-0.14/orcus/spreadsheet/sheet_range.hpp
+include/liborcus-0.14/orcus/spreadsheet/styles.hpp
+include/liborcus-0.14/orcus/spreadsheet/types.hpp
+include/liborcus-0.14/orcus/spreadsheet/view.hpp
+include/liborcus-0.14/orcus/spreadsheet/view_types.hpp
+include/liborcus-0.14/orcus/stream.hpp
+include/liborcus-0.14/orcus/string_pool.hpp
+include/liborcus-0.14/orcus/threaded_json_parser.hpp
+include/liborcus-0.14/orcus/threaded_sax_token_parser.hpp
+include/liborcus-0.14/orcus/tokens.hpp
+include/liborcus-0.14/orcus/types.hpp
+include/liborcus-0.14/orcus/xml_namespace.hpp
+include/liborcus-0.14/orcus/xml_structure_tree.hpp
+include/liborcus-0.14/orcus/yaml_document_tree.hpp
+include/liborcus-0.14/orcus/yaml_parser.hpp
+include/liborcus-0.14/orcus/yaml_parser_base.hpp
+include/liborcus-0.14/orcus/zip_archive.hpp
+include/liborcus-0.14/orcus/zip_archive_stream.hpp
+lib/liborcus-0.14.la
+lib/liborcus-mso-0.14.la
+lib/liborcus-parser-0.14.la
+lib/liborcus-spreadsheet-model-0.14.la
+lib/pkgconfig/liborcus-0.14.pc
+lib/pkgconfig/liborcus-spreadsheet-model-0.14.pc
diff --git a/converters/orcus/distinfo b/converters/orcus/distinfo
index fc7cd855e8b..675b4418b9f 100644
--- a/converters/orcus/distinfo
+++ b/converters/orcus/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.12 2018/04/30 04:39:41 ryoon Exp $
+$NetBSD: distinfo,v 1.13 2019/02/19 16:06:34 ryoon Exp $
-SHA1 (liborcus-0.13.4.tar.xz) = 14e2e1e1a1b03a85df5dcac4d883611cc6f79b91
-RMD160 (liborcus-0.13.4.tar.xz) = 185a7deb787f81d2e6415143a6b74f66fa957909
-SHA512 (liborcus-0.13.4.tar.xz) = f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b
-Size (liborcus-0.13.4.tar.xz) = 1816340 bytes
+SHA1 (liborcus-0.14.1.tar.xz) = 5494eae7df0bdcaad76ddecc265d02738475a1c9
+RMD160 (liborcus-0.14.1.tar.xz) = 0f10f3f9ff86a82dd1c9c2951e2ea5490a49d62c
+SHA512 (liborcus-0.14.1.tar.xz) = a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f
+Size (liborcus-0.14.1.tar.xz) = 1894680 bytes
SHA1 (patch-configure) = e5c68af9939a198cc63ec9bf5e6acf2aad4f893a
-SHA1 (patch-src_spreadsheet_sheet.cpp) = 67e9612107d8bf417173740bc7a437560f5cab35
diff --git a/converters/orcus/patches/patch-src_spreadsheet_sheet.cpp b/converters/orcus/patches/patch-src_spreadsheet_sheet.cpp
deleted file mode 100644
index 265cc355186..00000000000
--- a/converters/orcus/patches/patch-src_spreadsheet_sheet.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_spreadsheet_sheet.cpp,v 1.1 2018/04/30 04:39:41 ryoon Exp $
-
-* Fix build with boost 1.65.0
-
---- src/spreadsheet/sheet.cpp.orig 2017-11-15 23:12:57.000000000 +0000
-+++ src/spreadsheet/sheet.cpp
-@@ -387,7 +387,7 @@ void sheet::set_date_time(row_t row, col
-
- double days_since_epoch = (d - origin).days();
-
-- double ms = second * 1000000.0;
-+ long ms = second * 1000000.0;
-
- posix_time::time_duration t(
- posix_time::hours(hour) +
-@@ -726,12 +726,12 @@ date_time_t sheet::get_date_time(row_t r
-
- long hours = 0;
- long minutes = 0;
-- double seconds = 0.0;
-+ long seconds = 0.0;
-
- if (time_fraction)
- {
- // Convert a fraction day to microseconds.
-- double ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
-+ long ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
- posix_time::time_duration td = posix_time::microsec(ms);
-
- hours = td.hours();