summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2021-02-06 06:29:04 +0000
committerryoon <ryoon@pkgsrc.org>2021-02-06 06:29:04 +0000
commitcb1b648e68b0c2e407948c76ea5e3aba4b151018 (patch)
treedf92341956a2bf7bb09ff444cb25d9a17b22e6cd /converters
parent42b9d6f6370af8b830328cea0cc0c983dbc565ba (diff)
downloadpkgsrc-cb1b648e68b0c2e407948c76ea5e3aba4b151018.tar.gz
orcus: Update to 0.16.1
Changelog: 0.16.1 fixed a build issue on 32-bit linux platforms, which was indirectly caused by ixion. fixed json parsing bug caused by an uninitialized variable, which manifested itself on debian 32-bit platform. removed compiler warnings on unused variables from the base parser handlers. 0.16.0 general full formula recalculations are now optional when loading documents. It makes more effective use of cached formula results. added the option of failing on the first faulty cell, or skipping them. fixed a bug that caused the threaded_sax_token_parser to deadlock. added base parser handler classes in the public headers so that they can be sub-classed to overwrite necessary handler methods. json-parser parsing of numeric values are now more strict for better conformance to the specs. ods added support for loading named expressions from ods documents. fixed an infinite loop when loading one of the attached ods documents from https://bugs.documentfoundation.org/show_bug.cgi?id=82414 xlsx fixed a segfault when loading the xlsx document from https://bugs.documentfoundation.org/show_bug.cgi?id=83711. xls-xml fixed a bug that prevented formulas from referencing cells located in later sheets. xml-map adjusted the xml path expressions to be more like XPath. Previously, an attribute was expressed as '@' in the old expression, but XPath uses '/@'. The new expression uses '/@' for an attribute. added the ability to identify and import ranges from XML documents without map file. added the ability to generate map file from XML documents for user customization. added support to specify default namespace in the map file. python added orcus.Cell class to represent individual cell values and attributes. fixed several memory leaks in the python binding layer. modified orcus.csv.read() function to take string input, instead of bytes. added __version__ attribute to the orcus module. cleaned up orcus.detect_format function to only take the stream parameter. added named_expressions properties to Document and Sheet class objects. added Python API to bulk-process a number of spreadsheet documents (orcus.tools.file_processor). added Python API to download attachments from bugzilla services via REST API (orcus.tools.bugzilla).
Diffstat (limited to 'converters')
-rw-r--r--converters/orcus/DESCR2
-rw-r--r--converters/orcus/Makefile7
-rw-r--r--converters/orcus/PLIST161
-rw-r--r--converters/orcus/buildlink3.mk4
-rw-r--r--converters/orcus/distinfo11
-rw-r--r--converters/orcus/patches/patch-configure15
6 files changed, 92 insertions, 108 deletions
diff --git a/converters/orcus/DESCR b/converters/orcus/DESCR
index a0ce382df9c..618e66d8b93 100644
--- a/converters/orcus/DESCR
+++ b/converters/orcus/DESCR
@@ -1,3 +1,3 @@
Standalone file import filter library for spreadsheet documents.
-This package contains the 0.15 branch of the library.
+This package contains the 0.16 branch of the library.
diff --git a/converters/orcus/Makefile b/converters/orcus/Makefile
index 0ebdd0ef477..f7f2571c3a6 100644
--- a/converters/orcus/Makefile
+++ b/converters/orcus/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.33 2021/01/01 08:24:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.34 2021/02/06 06:29:04 ryoon Exp $
-DISTNAME= liborcus-0.15.4
+DISTNAME= liborcus-0.16.1
PKGNAME= ${DISTNAME:S/liborcus/orcus/}
-PKGREVISION= 2
CATEGORIES= converters
MASTER_SITES= https://kohei.us/files/orcus/src/
EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://gitlab.com/orcus/orcus
-COMMENT= Import filter library for spreadsheet documents (0.15 branch)
+COMMENT= Import filter library for spreadsheet documents (0.16 branch)
LICENSE= mpl-2.0
USE_LANGUAGES= c c++
diff --git a/converters/orcus/PLIST b/converters/orcus/PLIST
index 41e5dc7e218..1ee4502e48e 100644
--- a/converters/orcus/PLIST
+++ b/converters/orcus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2020/02/05 13:54:29 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.9 2021/02/06 06:29:04 ryoon Exp $
bin/orcus-css-dump
bin/orcus-csv
bin/orcus-detect
@@ -12,82 +12,83 @@ bin/orcus-xlsx
bin/orcus-xml
bin/orcus-yaml
bin/orcus-zip-dump
-include/liborcus-0.15/orcus/base64.hpp
-include/liborcus-0.15/orcus/cell_buffer.hpp
-include/liborcus-0.15/orcus/config.hpp
-include/liborcus-0.15/orcus/css_document_tree.hpp
-include/liborcus-0.15/orcus/css_parser.hpp
-include/liborcus-0.15/orcus/css_parser_base.hpp
-include/liborcus-0.15/orcus/css_selector.hpp
-include/liborcus-0.15/orcus/css_types.hpp
-include/liborcus-0.15/orcus/csv_parser.hpp
-include/liborcus-0.15/orcus/csv_parser_base.hpp
-include/liborcus-0.15/orcus/detail/parser_token_buffer.hpp
-include/liborcus-0.15/orcus/detail/thread.hpp
-include/liborcus-0.15/orcus/dom_tree.hpp
-include/liborcus-0.15/orcus/env.hpp
-include/liborcus-0.15/orcus/exception.hpp
-include/liborcus-0.15/orcus/format_detection.hpp
-include/liborcus-0.15/orcus/global.hpp
-include/liborcus-0.15/orcus/info.hpp
-include/liborcus-0.15/orcus/interface.hpp
-include/liborcus-0.15/orcus/json_document_tree.hpp
-include/liborcus-0.15/orcus/json_global.hpp
-include/liborcus-0.15/orcus/json_parser.hpp
-include/liborcus-0.15/orcus/json_parser_base.hpp
-include/liborcus-0.15/orcus/json_parser_thread.hpp
-include/liborcus-0.15/orcus/json_structure_tree.hpp
-include/liborcus-0.15/orcus/measurement.hpp
-include/liborcus-0.15/orcus/mso/encryption_info.hpp
-include/liborcus-0.15/orcus/orcus_csv.hpp
-include/liborcus-0.15/orcus/orcus_gnumeric.hpp
-include/liborcus-0.15/orcus/orcus_import_ods.hpp
-include/liborcus-0.15/orcus/orcus_import_xlsx.hpp
-include/liborcus-0.15/orcus/orcus_json.hpp
-include/liborcus-0.15/orcus/orcus_ods.hpp
-include/liborcus-0.15/orcus/orcus_xls_xml.hpp
-include/liborcus-0.15/orcus/orcus_xlsx.hpp
-include/liborcus-0.15/orcus/orcus_xml.hpp
-include/liborcus-0.15/orcus/parser_base.hpp
-include/liborcus-0.15/orcus/parser_global.hpp
-include/liborcus-0.15/orcus/pstring.hpp
-include/liborcus-0.15/orcus/sax_ns_parser.hpp
-include/liborcus-0.15/orcus/sax_parser.hpp
-include/liborcus-0.15/orcus/sax_parser_base.hpp
-include/liborcus-0.15/orcus/sax_token_parser.hpp
-include/liborcus-0.15/orcus/sax_token_parser_thread.hpp
-include/liborcus-0.15/orcus/spreadsheet/auto_filter.hpp
-include/liborcus-0.15/orcus/spreadsheet/config.hpp
-include/liborcus-0.15/orcus/spreadsheet/document.hpp
-include/liborcus-0.15/orcus/spreadsheet/export_interface.hpp
-include/liborcus-0.15/orcus/spreadsheet/factory.hpp
-include/liborcus-0.15/orcus/spreadsheet/import_interface.hpp
-include/liborcus-0.15/orcus/spreadsheet/import_interface_pivot.hpp
-include/liborcus-0.15/orcus/spreadsheet/import_interface_view.hpp
-include/liborcus-0.15/orcus/spreadsheet/pivot.hpp
-include/liborcus-0.15/orcus/spreadsheet/shared_strings.hpp
-include/liborcus-0.15/orcus/spreadsheet/sheet.hpp
-include/liborcus-0.15/orcus/spreadsheet/sheet_range.hpp
-include/liborcus-0.15/orcus/spreadsheet/styles.hpp
-include/liborcus-0.15/orcus/spreadsheet/types.hpp
-include/liborcus-0.15/orcus/spreadsheet/view.hpp
-include/liborcus-0.15/orcus/spreadsheet/view_types.hpp
-include/liborcus-0.15/orcus/stream.hpp
-include/liborcus-0.15/orcus/string_pool.hpp
-include/liborcus-0.15/orcus/threaded_json_parser.hpp
-include/liborcus-0.15/orcus/threaded_sax_token_parser.hpp
-include/liborcus-0.15/orcus/tokens.hpp
-include/liborcus-0.15/orcus/types.hpp
-include/liborcus-0.15/orcus/xml_namespace.hpp
-include/liborcus-0.15/orcus/xml_structure_tree.hpp
-include/liborcus-0.15/orcus/yaml_document_tree.hpp
-include/liborcus-0.15/orcus/yaml_parser.hpp
-include/liborcus-0.15/orcus/yaml_parser_base.hpp
-include/liborcus-0.15/orcus/zip_archive.hpp
-include/liborcus-0.15/orcus/zip_archive_stream.hpp
-lib/liborcus-0.15.la
-lib/liborcus-mso-0.15.la
-lib/liborcus-parser-0.15.la
-lib/liborcus-spreadsheet-model-0.15.la
-lib/pkgconfig/liborcus-0.15.pc
-lib/pkgconfig/liborcus-spreadsheet-model-0.15.pc
+include/liborcus-0.16/orcus/base64.hpp
+include/liborcus-0.16/orcus/cell_buffer.hpp
+include/liborcus-0.16/orcus/config.hpp
+include/liborcus-0.16/orcus/css_document_tree.hpp
+include/liborcus-0.16/orcus/css_parser.hpp
+include/liborcus-0.16/orcus/css_parser_base.hpp
+include/liborcus-0.16/orcus/css_selector.hpp
+include/liborcus-0.16/orcus/css_types.hpp
+include/liborcus-0.16/orcus/csv_parser.hpp
+include/liborcus-0.16/orcus/csv_parser_base.hpp
+include/liborcus-0.16/orcus/detail/parser_token_buffer.hpp
+include/liborcus-0.16/orcus/detail/thread.hpp
+include/liborcus-0.16/orcus/dom_tree.hpp
+include/liborcus-0.16/orcus/env.hpp
+include/liborcus-0.16/orcus/exception.hpp
+include/liborcus-0.16/orcus/format_detection.hpp
+include/liborcus-0.16/orcus/global.hpp
+include/liborcus-0.16/orcus/info.hpp
+include/liborcus-0.16/orcus/interface.hpp
+include/liborcus-0.16/orcus/json_document_tree.hpp
+include/liborcus-0.16/orcus/json_global.hpp
+include/liborcus-0.16/orcus/json_parser.hpp
+include/liborcus-0.16/orcus/json_parser_base.hpp
+include/liborcus-0.16/orcus/json_parser_thread.hpp
+include/liborcus-0.16/orcus/json_structure_tree.hpp
+include/liborcus-0.16/orcus/measurement.hpp
+include/liborcus-0.16/orcus/mso/encryption_info.hpp
+include/liborcus-0.16/orcus/orcus_csv.hpp
+include/liborcus-0.16/orcus/orcus_gnumeric.hpp
+include/liborcus-0.16/orcus/orcus_import_ods.hpp
+include/liborcus-0.16/orcus/orcus_import_xlsx.hpp
+include/liborcus-0.16/orcus/orcus_json.hpp
+include/liborcus-0.16/orcus/orcus_ods.hpp
+include/liborcus-0.16/orcus/orcus_xls_xml.hpp
+include/liborcus-0.16/orcus/orcus_xlsx.hpp
+include/liborcus-0.16/orcus/orcus_xml.hpp
+include/liborcus-0.16/orcus/parser_base.hpp
+include/liborcus-0.16/orcus/parser_global.hpp
+include/liborcus-0.16/orcus/pstring.hpp
+include/liborcus-0.16/orcus/sax_ns_parser.hpp
+include/liborcus-0.16/orcus/sax_parser.hpp
+include/liborcus-0.16/orcus/sax_parser_base.hpp
+include/liborcus-0.16/orcus/sax_token_parser.hpp
+include/liborcus-0.16/orcus/sax_token_parser_thread.hpp
+include/liborcus-0.16/orcus/spreadsheet/auto_filter.hpp
+include/liborcus-0.16/orcus/spreadsheet/config.hpp
+include/liborcus-0.16/orcus/spreadsheet/document.hpp
+include/liborcus-0.16/orcus/spreadsheet/export_interface.hpp
+include/liborcus-0.16/orcus/spreadsheet/factory.hpp
+include/liborcus-0.16/orcus/spreadsheet/import_interface.hpp
+include/liborcus-0.16/orcus/spreadsheet/import_interface_pivot.hpp
+include/liborcus-0.16/orcus/spreadsheet/import_interface_view.hpp
+include/liborcus-0.16/orcus/spreadsheet/pivot.hpp
+include/liborcus-0.16/orcus/spreadsheet/shared_strings.hpp
+include/liborcus-0.16/orcus/spreadsheet/sheet.hpp
+include/liborcus-0.16/orcus/spreadsheet/sheet_range.hpp
+include/liborcus-0.16/orcus/spreadsheet/styles.hpp
+include/liborcus-0.16/orcus/spreadsheet/types.hpp
+include/liborcus-0.16/orcus/spreadsheet/view.hpp
+include/liborcus-0.16/orcus/spreadsheet/view_types.hpp
+include/liborcus-0.16/orcus/stream.hpp
+include/liborcus-0.16/orcus/string_pool.hpp
+include/liborcus-0.16/orcus/threaded_json_parser.hpp
+include/liborcus-0.16/orcus/threaded_sax_token_parser.hpp
+include/liborcus-0.16/orcus/tokens.hpp
+include/liborcus-0.16/orcus/types.hpp
+include/liborcus-0.16/orcus/xml_namespace.hpp
+include/liborcus-0.16/orcus/xml_structure_tree.hpp
+include/liborcus-0.16/orcus/xml_writer.hpp
+include/liborcus-0.16/orcus/yaml_document_tree.hpp
+include/liborcus-0.16/orcus/yaml_parser.hpp
+include/liborcus-0.16/orcus/yaml_parser_base.hpp
+include/liborcus-0.16/orcus/zip_archive.hpp
+include/liborcus-0.16/orcus/zip_archive_stream.hpp
+lib/liborcus-0.16.la
+lib/liborcus-mso-0.16.la
+lib/liborcus-parser-0.16.la
+lib/liborcus-spreadsheet-model-0.16.la
+lib/pkgconfig/liborcus-0.16.pc
+lib/pkgconfig/liborcus-spreadsheet-model-0.16.pc
diff --git a/converters/orcus/buildlink3.mk b/converters/orcus/buildlink3.mk
index b8df40dc25b..b3b1b3df460 100644
--- a/converters/orcus/buildlink3.mk
+++ b/converters/orcus/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2020/02/05 13:54:29 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2021/02/06 06:29:04 ryoon Exp $
BUILDLINK_TREE+= orcus
.if !defined(ORCUS_BUILDLINK3_MK)
ORCUS_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.orcus+= orcus>=0.15.3
+BUILDLINK_API_DEPENDS.orcus+= orcus>=0.16.1
BUILDLINK_PKGSRCDIR.orcus?= ../../converters/orcus
.endif # ORCUS_BUILDLINK3_MK
diff --git a/converters/orcus/distinfo b/converters/orcus/distinfo
index 4db03b42c47..cfd389029c9 100644
--- a/converters/orcus/distinfo
+++ b/converters/orcus/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.16 2020/04/05 13:10:27 nia Exp $
+$NetBSD: distinfo,v 1.17 2021/02/06 06:29:04 ryoon Exp $
-SHA1 (liborcus-0.15.4.tar.xz) = a428ce282806e8e66d439d4cc8827ef91066fbb5
-RMD160 (liborcus-0.15.4.tar.xz) = db2eb883ee2162acce7575d3e429cdc379bb4bdb
-SHA512 (liborcus-0.15.4.tar.xz) = edbe1d6f86a249e43915e7fb960e6b269fa8703e3f571a023e811dd3f9b5d9c9a36edff491faa7ed7ea3490bf5afe1999e26d05c658a0a393b3ffd08b311b76f
-Size (liborcus-0.15.4.tar.xz) = 1590048 bytes
-SHA1 (patch-configure) = c27504754bfd738f38ee021530087587f9d6cfd0
+SHA1 (liborcus-0.16.1.tar.xz) = 8c84dcd87039f15ee8c9cf7c175d5091d3f56c90
+RMD160 (liborcus-0.16.1.tar.xz) = a263aa1d7713380406f587d756b7a2cd8ff248b2
+SHA512 (liborcus-0.16.1.tar.xz) = 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739
+Size (liborcus-0.16.1.tar.xz) = 1805436 bytes
diff --git a/converters/orcus/patches/patch-configure b/converters/orcus/patches/patch-configure
deleted file mode 100644
index e798e70bb6f..00000000000
--- a/converters/orcus/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.9 2020/01/14 14:09:33 ryoon Exp $
-
-https://gitlab.com/orcus/orcus/merge_requests/67
-
---- configure.orig 2018-01-27 02:07:29.000000000 +0000
-+++ configure
-@@ -18821,7 +18821,7 @@ else
-
- fi
-
--if test x"$enable_werror" == "xyes"; then :
-+if test x"$enable_werror" = "xyes"; then :
-
- CXXFLAGS="$CXXFLAGS -Werror"
-