Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7270084ECD for ; Sun, 15 Oct 2023 07:09:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id QMMM88otLzh0 for ; Sun, 15 Oct 2023 07:09:51 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0430484D0C for ; Sun, 15 Oct 2023 07:09:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 00E7DFADC; Sun, 15 Oct 2023 07:09:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1697353790212580" MIME-Version: 1.0 Date: Sun, 15 Oct 2023 07:09:50 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/converters/orcus To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20231015070951.00E7DFADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1697353790212580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Sun Oct 15 07:09:50 UTC 2023 Modified Files: pkgsrc/converters/orcus: Makefile PLIST buildlink3.mk distinfo Removed Files: pkgsrc/converters/orcus/patches: patch-include_orcus_base64.hpp patch-include_orcus_types.hpp Log Message: orcus: Update to 0.18.1 Changelog: 0.18.1 sax parser * added support for optionally skipping multiple BOM's in the beginning of XML stream. This affects all XML-based file format filters such as xls-xml (aka Excel 2003 XML). xml-map * fixed a bug where XML documents consisting of simple single-column records were not properly converted to sheet data. xls-xml * fixed a bug where the filter would always pass border color even when it was not set. buildsystem * added new configure switches --without-benchmark and --without-doc-example to optinally skip building of these two directories. 0.18.0 general * fixed the flat output mode to properly calculate the lengths of UTF-8 encoded strings. * replaced all uses of std::strtol() to parse_integer() to properly parse strings that are not necessarily null-terminated. * added a new output format type 'debug-state' which dumps the internal state of the populated document model in detail. This can be useful during debugging. * separated the import_shared_string interface implementation from the backend shared strings store per separation of responsibility. * merged the foo_t and foo_active_t struct pair, such as font_t and font_active_t, in the styles store into a single type using std::optional. * revised the documentation and public API and cleaned things up where necessary. ods * re-implemented the number format styles import to correctly keep track of element stacks and correctly perform structure checks to detect malformed documents. * added new interface to import named styles applied to columns. * added new interface to import attributes for asian and complex scripts for the folloiwng font attributes: * font name * font size * font style * font weight * re-designed the styles import interface to make it multi-level. * re-worked the import of the style:text-underline-width attribute to make its handling more in line with the specifications. xls-xml * added support for importing wrap-text and shrink-to-fit cell format attributes. * added support for importing cell-hidden and locked attributes. * added support for importing direct and named cell formats applied to columns and rows. xlsx * added support for importing wrap-text and shrink-to-fit cell format attributes. * added support for importing direct and named cell formats applied to columns and rows. xml-map * added a new interface to pass the encoding information to the document model so that it can correctly decode non-UTF-8-encoded string values. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 pkgsrc/converters/orcus/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/converters/orcus/PLIST cvs rdiff -u -r1.11 -r1.12 pkgsrc/converters/orcus/buildlink3.mk cvs rdiff -u -r1.21 -r1.22 pkgsrc/converters/orcus/distinfo cvs rdiff -u -r1.1 -r0 \ pkgsrc/converters/orcus/patches/patch-include_orcus_base64.hpp \ pkgsrc/converters/orcus/patches/patch-include_orcus_types.hpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1697353790212580 Content-Disposition: inline Content-Length: 10440 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/converters/orcus/Makefile diff -u pkgsrc/converters/orcus/Makefile:1.43 pkgsrc/converters/orcus/Makefile:1.44 --- pkgsrc/converters/orcus/Makefile:1.43 Mon Aug 14 05:23:58 2023 +++ pkgsrc/converters/orcus/Makefile Sun Oct 15 07:09:50 2023 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.43 2023/08/14 05:23:58 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2023/10/15 07:09:50 ryoon Exp $ -DISTNAME= liborcus-0.17.2 +DISTNAME= liborcus-0.18.1 PKGNAME= ${DISTNAME:S/liborcus/orcus/} -PKGREVISION= 3 CATEGORIES= converters MASTER_SITES= https://kohei.us/files/orcus/src/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/converters/orcus/PLIST diff -u pkgsrc/converters/orcus/PLIST:1.10 pkgsrc/converters/orcus/PLIST:1.11 --- pkgsrc/converters/orcus/PLIST:1.10 Sat Feb 5 04:14:31 2022 +++ pkgsrc/converters/orcus/PLIST Sun Oct 15 07:09:50 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2022/02/05 04:14:31 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.11 2023/10/15 07:09:50 ryoon Exp $ bin/orcus-css-dump bin/orcus-csv bin/orcus-detect @@ -12,80 +12,81 @@ bin/orcus-xlsx bin/orcus-xml bin/orcus-yaml bin/orcus-zip-dump -include/liborcus-0.17/orcus/base64.hpp -include/liborcus-0.17/orcus/cell_buffer.hpp -include/liborcus-0.17/orcus/config.hpp -include/liborcus-0.17/orcus/css_document_tree.hpp -include/liborcus-0.17/orcus/css_parser.hpp -include/liborcus-0.17/orcus/css_parser_base.hpp -include/liborcus-0.17/orcus/css_selector.hpp -include/liborcus-0.17/orcus/css_types.hpp -include/liborcus-0.17/orcus/csv_parser.hpp -include/liborcus-0.17/orcus/csv_parser_base.hpp -include/liborcus-0.17/orcus/detail/parser_token_buffer.hpp -include/liborcus-0.17/orcus/detail/thread.hpp -include/liborcus-0.17/orcus/dom_tree.hpp -include/liborcus-0.17/orcus/env.hpp -include/liborcus-0.17/orcus/exception.hpp -include/liborcus-0.17/orcus/format_detection.hpp -include/liborcus-0.17/orcus/global.hpp -include/liborcus-0.17/orcus/info.hpp -include/liborcus-0.17/orcus/interface.hpp -include/liborcus-0.17/orcus/json_document_tree.hpp -include/liborcus-0.17/orcus/json_global.hpp -include/liborcus-0.17/orcus/json_parser.hpp -include/liborcus-0.17/orcus/json_parser_base.hpp -include/liborcus-0.17/orcus/json_parser_thread.hpp -include/liborcus-0.17/orcus/json_structure_tree.hpp -include/liborcus-0.17/orcus/measurement.hpp -include/liborcus-0.17/orcus/orcus_csv.hpp -include/liborcus-0.17/orcus/orcus_gnumeric.hpp -include/liborcus-0.17/orcus/orcus_import_ods.hpp -include/liborcus-0.17/orcus/orcus_import_xlsx.hpp -include/liborcus-0.17/orcus/orcus_json.hpp -include/liborcus-0.17/orcus/orcus_ods.hpp -include/liborcus-0.17/orcus/orcus_xls_xml.hpp -include/liborcus-0.17/orcus/orcus_xlsx.hpp -include/liborcus-0.17/orcus/orcus_xml.hpp -include/liborcus-0.17/orcus/parser_base.hpp -include/liborcus-0.17/orcus/parser_global.hpp -include/liborcus-0.17/orcus/sax_ns_parser.hpp -include/liborcus-0.17/orcus/sax_parser.hpp -include/liborcus-0.17/orcus/sax_parser_base.hpp -include/liborcus-0.17/orcus/sax_token_parser.hpp -include/liborcus-0.17/orcus/sax_token_parser_thread.hpp -include/liborcus-0.17/orcus/spreadsheet/auto_filter.hpp -include/liborcus-0.17/orcus/spreadsheet/config.hpp -include/liborcus-0.17/orcus/spreadsheet/document.hpp -include/liborcus-0.17/orcus/spreadsheet/export_interface.hpp -include/liborcus-0.17/orcus/spreadsheet/factory.hpp -include/liborcus-0.17/orcus/spreadsheet/import_interface.hpp -include/liborcus-0.17/orcus/spreadsheet/import_interface_pivot.hpp -include/liborcus-0.17/orcus/spreadsheet/import_interface_view.hpp -include/liborcus-0.17/orcus/spreadsheet/pivot.hpp -include/liborcus-0.17/orcus/spreadsheet/shared_strings.hpp -include/liborcus-0.17/orcus/spreadsheet/sheet.hpp -include/liborcus-0.17/orcus/spreadsheet/styles.hpp -include/liborcus-0.17/orcus/spreadsheet/types.hpp -include/liborcus-0.17/orcus/spreadsheet/view.hpp -include/liborcus-0.17/orcus/spreadsheet/view_types.hpp -include/liborcus-0.17/orcus/stream.hpp -include/liborcus-0.17/orcus/string_pool.hpp -include/liborcus-0.17/orcus/threaded_json_parser.hpp -include/liborcus-0.17/orcus/threaded_sax_token_parser.hpp -include/liborcus-0.17/orcus/tokens.hpp -include/liborcus-0.17/orcus/types.hpp -include/liborcus-0.17/orcus/xml_namespace.hpp -include/liborcus-0.17/orcus/xml_structure_tree.hpp -include/liborcus-0.17/orcus/xml_writer.hpp -include/liborcus-0.17/orcus/yaml_document_tree.hpp -include/liborcus-0.17/orcus/yaml_parser.hpp -include/liborcus-0.17/orcus/yaml_parser_base.hpp -include/liborcus-0.17/orcus/zip_archive.hpp -include/liborcus-0.17/orcus/zip_archive_stream.hpp -lib/liborcus-0.17.la -lib/liborcus-mso-0.17.la -lib/liborcus-parser-0.17.la -lib/liborcus-spreadsheet-model-0.17.la -lib/pkgconfig/liborcus-0.17.pc -lib/pkgconfig/liborcus-spreadsheet-model-0.17.pc +include/liborcus-0.18/orcus/base64.hpp +include/liborcus-0.18/orcus/cell_buffer.hpp +include/liborcus-0.18/orcus/config.hpp +include/liborcus-0.18/orcus/css_document_tree.hpp +include/liborcus-0.18/orcus/css_parser.hpp +include/liborcus-0.18/orcus/css_parser_base.hpp +include/liborcus-0.18/orcus/css_selector.hpp +include/liborcus-0.18/orcus/css_types.hpp +include/liborcus-0.18/orcus/csv_parser.hpp +include/liborcus-0.18/orcus/csv_parser_base.hpp +include/liborcus-0.18/orcus/detail/parser_token_buffer.hpp +include/liborcus-0.18/orcus/detail/thread.hpp +include/liborcus-0.18/orcus/dom_tree.hpp +include/liborcus-0.18/orcus/env.hpp +include/liborcus-0.18/orcus/exception.hpp +include/liborcus-0.18/orcus/format_detection.hpp +include/liborcus-0.18/orcus/info.hpp +include/liborcus-0.18/orcus/interface.hpp +include/liborcus-0.18/orcus/json_document_tree.hpp +include/liborcus-0.18/orcus/json_global.hpp +include/liborcus-0.18/orcus/json_parser.hpp +include/liborcus-0.18/orcus/json_parser_base.hpp +include/liborcus-0.18/orcus/json_parser_thread.hpp +include/liborcus-0.18/orcus/json_structure_tree.hpp +include/liborcus-0.18/orcus/measurement.hpp +include/liborcus-0.18/orcus/orcus_csv.hpp +include/liborcus-0.18/orcus/orcus_gnumeric.hpp +include/liborcus-0.18/orcus/orcus_import_ods.hpp +include/liborcus-0.18/orcus/orcus_import_xlsx.hpp +include/liborcus-0.18/orcus/orcus_json.hpp +include/liborcus-0.18/orcus/orcus_ods.hpp +include/liborcus-0.18/orcus/orcus_xls_xml.hpp +include/liborcus-0.18/orcus/orcus_xlsx.hpp +include/liborcus-0.18/orcus/orcus_xml.hpp +include/liborcus-0.18/orcus/parser_base.hpp +include/liborcus-0.18/orcus/parser_global.hpp +include/liborcus-0.18/orcus/sax_ns_parser.hpp +include/liborcus-0.18/orcus/sax_parser.hpp +include/liborcus-0.18/orcus/sax_parser_base.hpp +include/liborcus-0.18/orcus/sax_token_parser.hpp +include/liborcus-0.18/orcus/sax_token_parser_thread.hpp +include/liborcus-0.18/orcus/spreadsheet/auto_filter.hpp +include/liborcus-0.18/orcus/spreadsheet/config.hpp +include/liborcus-0.18/orcus/spreadsheet/document.hpp +include/liborcus-0.18/orcus/spreadsheet/document_types.hpp +include/liborcus-0.18/orcus/spreadsheet/export_interface.hpp +include/liborcus-0.18/orcus/spreadsheet/factory.hpp +include/liborcus-0.18/orcus/spreadsheet/import_interface.hpp +include/liborcus-0.18/orcus/spreadsheet/import_interface_pivot.hpp +include/liborcus-0.18/orcus/spreadsheet/import_interface_styles.hpp +include/liborcus-0.18/orcus/spreadsheet/import_interface_view.hpp +include/liborcus-0.18/orcus/spreadsheet/pivot.hpp +include/liborcus-0.18/orcus/spreadsheet/shared_strings.hpp +include/liborcus-0.18/orcus/spreadsheet/sheet.hpp +include/liborcus-0.18/orcus/spreadsheet/styles.hpp +include/liborcus-0.18/orcus/spreadsheet/types.hpp +include/liborcus-0.18/orcus/spreadsheet/view.hpp +include/liborcus-0.18/orcus/spreadsheet/view_types.hpp +include/liborcus-0.18/orcus/stream.hpp +include/liborcus-0.18/orcus/string_pool.hpp +include/liborcus-0.18/orcus/threaded_json_parser.hpp +include/liborcus-0.18/orcus/threaded_sax_token_parser.hpp +include/liborcus-0.18/orcus/tokens.hpp +include/liborcus-0.18/orcus/types.hpp +include/liborcus-0.18/orcus/xml_namespace.hpp +include/liborcus-0.18/orcus/xml_structure_tree.hpp +include/liborcus-0.18/orcus/xml_writer.hpp +include/liborcus-0.18/orcus/yaml_document_tree.hpp +include/liborcus-0.18/orcus/yaml_parser.hpp +include/liborcus-0.18/orcus/yaml_parser_base.hpp +include/liborcus-0.18/orcus/zip_archive.hpp +include/liborcus-0.18/orcus/zip_archive_stream.hpp +lib/liborcus-0.18.la +lib/liborcus-mso-0.18.la +lib/liborcus-parser-0.18.la +lib/liborcus-spreadsheet-model-0.18.la +lib/pkgconfig/liborcus-0.18.pc +lib/pkgconfig/liborcus-spreadsheet-model-0.18.pc Index: pkgsrc/converters/orcus/buildlink3.mk diff -u pkgsrc/converters/orcus/buildlink3.mk:1.11 pkgsrc/converters/orcus/buildlink3.mk:1.12 --- pkgsrc/converters/orcus/buildlink3.mk:1.11 Mon Aug 14 05:23:58 2023 +++ pkgsrc/converters/orcus/buildlink3.mk Sun Oct 15 07:09:50 2023 @@ -1,12 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.11 2023/08/14 05:23:58 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2023/10/15 07:09:50 ryoon Exp $ BUILDLINK_TREE+= orcus .if !defined(ORCUS_BUILDLINK3_MK) ORCUS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.orcus+= orcus>=0.17.0 -BUILDLINK_ABI_DEPENDS.orcus?= orcus>=0.17.2nb3 +BUILDLINK_API_DEPENDS.orcus+= orcus>=0.18.1 BUILDLINK_PKGSRCDIR.orcus?= ../../converters/orcus .endif # ORCUS_BUILDLINK3_MK Index: pkgsrc/converters/orcus/distinfo diff -u pkgsrc/converters/orcus/distinfo:1.21 pkgsrc/converters/orcus/distinfo:1.22 --- pkgsrc/converters/orcus/distinfo:1.21 Mon May 8 18:28:03 2023 +++ pkgsrc/converters/orcus/distinfo Sun Oct 15 07:09:50 2023 @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.21 2023/05/08 18:28:03 tnn Exp $ +$NetBSD: distinfo,v 1.22 2023/10/15 07:09:50 ryoon Exp $ -BLAKE2s (liborcus-0.17.2.tar.xz) = 1c83c1c7300f20c8fbc3d01df57cb93c7afd58a7a0a47bba679a99cf8b74f2bc -SHA512 (liborcus-0.17.2.tar.xz) = 8ad8db46c23673260057aff555286d95ebfeff0a027bdeae24f11f8aa12456284f7f4446edddb91936b3011eb1227cfe1618ab3c4d909f8356c8c151f5739d79 -Size (liborcus-0.17.2.tar.xz) = 1839188 bytes -SHA1 (patch-include_orcus_base64.hpp) = 9df6d5bd14d2629e24e2d579798d6e203d2626d7 -SHA1 (patch-include_orcus_types.hpp) = b2dba13543b500792e839a2604343ac7d56f2e11 +BLAKE2s (liborcus-0.18.1.tar.xz) = e12b791cb9ec4cf064ef731003da4a0332aea2d2b1148a5971794cf743fe285e +SHA512 (liborcus-0.18.1.tar.xz) = 73cbfe64e607165b9311f7330505dfcd0d16de42212e5ace55b588d6ef869221de51d22fc069553ac08e847fad1330cc3915f7e3769dc04c17b11914abb4acdd +Size (liborcus-0.18.1.tar.xz) = 2070352 bytes --_----------=_1697353790212580--