Sun Oct 15 07:08:09 2023 UTC ()
libixion, py-libixion: Update to 0.18.1

Changelog:
0.81.1
* fixed a 32-bit Linux build issue as discovered on Debian, due to
  a clash on two 32-bit unsigned integer types being used with std::variant.

0.18.0
C++ API
* removed the formula_model_access interface from model_context, and
  switched to using model_context directly everywhere.
* revised formula_tokens_t type to remove use of std::unique_ptr for each
  formula_token instance. This should improve memory locality when iterating
  through an array of formula token values. A similar change has also been
  made to lexer_tokens_t and lexer_token types.

formula interpreter
* added the following 41 built-in functions:
    ABS
    AND
    COLUMN
    COLUMNS
    COUNT
    COUNTBLANK
    EXACT
    FALSE
    FIND
    ISBLANK
    ISERROR
    ISEVEN
    ISFORMULA
    ISLOGICAL
    ISNA
    ISNONTEXT
    ISNUMBER
    ISODD
    ISREF
    ISTEXT
    LEFT
    MEDIAN
    MID
    MODE
    N
    NA
    NOT
    OR
    REPLACE
    REPT
    RIGHT
    ROW
    ROWS
    SHEET
    SHEETS
    SUBSTITUTE
    T
    TEXTJOIN
    TRIM
    TRUE
    TYPE

* added support for multi-sheet references in Excel A1 and Excel R1C1
  grammers.


(ryoon)
diff -r1.29 -r1.30 pkgsrc/math/libixion/Makefile
diff -r1.6 -r1.7 pkgsrc/math/libixion/Makefile.common
diff -r1.6 -r1.7 pkgsrc/math/libixion/PLIST
diff -r1.9 -r1.10 pkgsrc/math/libixion/buildlink3.mk
diff -r1.11 -r1.12 pkgsrc/math/libixion/distinfo
diff -r1.14 -r1.15 pkgsrc/math/py-libixion/Makefile
cvs diff -r1.29 -r1.30 pkgsrc/math/libixion/Makefile (expand / switch to unified diff)

--- pkgsrc/math/libixion/Makefile 2023/08/14 05:24:49 1.29
+++ pkgsrc/math/libixion/Makefile 2023/10/15 07:08:09 1.30
@@ -1,13 +1,12 @@ @@ -1,13 +1,12 @@
1# $NetBSD: Makefile,v 1.29 2023/08/14 05:24:49 wiz Exp $ 1# $NetBSD: Makefile,v 1.30 2023/10/15 07:08:09 ryoon Exp $
2 2
3PKGREVISION= 4 
4.include "Makefile.common" 3.include "Makefile.common"
5 4
6CONFIGURE_ARGS+= --disable-python 5CONFIGURE_ARGS+= --disable-python
7 6
8PKGCONFIG_OVERRIDE+= libixion.pc.in 7PKGCONFIG_OVERRIDE+= libixion.pc.in
9 8
10.include "../../devel/zlib/buildlink3.mk" 9.include "../../devel/zlib/buildlink3.mk"
11.include "../../devel/boost-libs/buildlink3.mk" 10.include "../../devel/boost-libs/buildlink3.mk"
12.include "../../devel/mdds/buildlink3.mk" 11.include "../../devel/mdds/buildlink3.mk"
13.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/math/libixion/Makefile.common (expand / switch to unified diff)

--- pkgsrc/math/libixion/Makefile.common 2022/11/21 18:20:43 1.6
+++ pkgsrc/math/libixion/Makefile.common 2023/10/15 07:08:09 1.7
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.6 2022/11/21 18:20:43 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.7 2023/10/15 07:08:09 ryoon Exp $
2# 2#
3# used by math/libixion/Makefile 3# used by math/libixion/Makefile
4# used by math/py-libixion/Makefile 4# used by math/py-libixion/Makefile
5 5
6DISTNAME= libixion-0.17.0 6DISTNAME= libixion-0.18.1
7CATEGORIES= math devel 7CATEGORIES= math devel
8MASTER_SITES= http://kohei.us/files/ixion/src/ 8MASTER_SITES= http://kohei.us/files/ixion/src/
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://gitlab.com/ixion/ixion 12HOMEPAGE= https://gitlab.com/ixion/ixion
13COMMENT= General purpose formula parser & interpreter 13COMMENT= General purpose formula parser & interpreter
14LICENSE= mpl-2.0 14LICENSE= mpl-2.0
15 15
16PATCHDIR= ${.CURDIR}/../../math/libixion/patches 16PATCHDIR= ${.CURDIR}/../../math/libixion/patches
17DISTINFO_FILE= ${.CURDIR}/../../math/libixion/distinfo 17DISTINFO_FILE= ${.CURDIR}/../../math/libixion/distinfo
18 18
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
cvs diff -r1.6 -r1.7 pkgsrc/math/libixion/PLIST (expand / switch to unified diff)

--- pkgsrc/math/libixion/PLIST 2022/02/05 04:28:11 1.6
+++ pkgsrc/math/libixion/PLIST 2023/10/15 07:08:09 1.7
@@ -1,36 +1,35 @@ @@ -1,36 +1,35 @@
1@comment $NetBSD: PLIST,v 1.6 2022/02/05 04:28:11 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.7 2023/10/15 07:08:09 ryoon Exp $
2bin/ixion-formula-tokenizer 2bin/ixion-formula-tokenizer
3bin/ixion-parser 3bin/ixion-parser
4bin/ixion-sorter 4bin/ixion-sorter
5include/libixion-0.17/ixion/address.hpp 5include/libixion-0.18/ixion/address.hpp
6include/libixion-0.17/ixion/address_iterator.hpp 6include/libixion-0.18/ixion/address_iterator.hpp
7include/libixion-0.17/ixion/cell.hpp 7include/libixion-0.18/ixion/cell.hpp
8include/libixion-0.17/ixion/cell_access.hpp 8include/libixion-0.18/ixion/cell_access.hpp
9include/libixion-0.17/ixion/compute_engine.hpp 9include/libixion-0.18/ixion/compute_engine.hpp
10include/libixion-0.17/ixion/config.hpp 10include/libixion-0.18/ixion/config.hpp
11include/libixion-0.17/ixion/dirty_cell_tracker.hpp 11include/libixion-0.18/ixion/dirty_cell_tracker.hpp
12include/libixion-0.17/ixion/document.hpp 12include/libixion-0.18/ixion/document.hpp
13include/libixion-0.17/ixion/env.hpp 13include/libixion-0.18/ixion/env.hpp
14include/libixion-0.17/ixion/exceptions.hpp 14include/libixion-0.18/ixion/exceptions.hpp
15include/libixion-0.17/ixion/formula.hpp 15include/libixion-0.18/ixion/formula.hpp
16include/libixion-0.17/ixion/formula_function_opcode.hpp 16include/libixion-0.18/ixion/formula_function_opcode.hpp
17include/libixion-0.17/ixion/formula_name_resolver.hpp 17include/libixion-0.18/ixion/formula_name_resolver.hpp
18include/libixion-0.17/ixion/formula_opcode.hpp 18include/libixion-0.18/ixion/formula_opcode.hpp
19include/libixion-0.17/ixion/formula_result.hpp 19include/libixion-0.18/ixion/formula_result.hpp
20include/libixion-0.17/ixion/formula_tokens.hpp 20include/libixion-0.18/ixion/formula_tokens.hpp
21include/libixion-0.17/ixion/formula_tokens_fwd.hpp 21include/libixion-0.18/ixion/formula_tokens_fwd.hpp
22include/libixion-0.17/ixion/global.hpp 22include/libixion-0.18/ixion/global.hpp
23include/libixion-0.17/ixion/info.hpp 23include/libixion-0.18/ixion/info.hpp
24include/libixion-0.17/ixion/interface/formula_model_access.hpp 24include/libixion-0.18/ixion/interface/session_handler.hpp
25include/libixion-0.17/ixion/interface/session_handler.hpp 25include/libixion-0.18/ixion/interface/table_handler.hpp
26include/libixion-0.17/ixion/interface/table_handler.hpp 26include/libixion-0.18/ixion/macros.hpp
27include/libixion-0.17/ixion/macros.hpp 27include/libixion-0.18/ixion/matrix.hpp
28include/libixion-0.17/ixion/matrix.hpp 28include/libixion-0.18/ixion/model_context.hpp
29include/libixion-0.17/ixion/model_context.hpp 29include/libixion-0.18/ixion/model_iterator.hpp
30include/libixion-0.17/ixion/model_iterator.hpp 30include/libixion-0.18/ixion/module.hpp
31include/libixion-0.17/ixion/module.hpp 31include/libixion-0.18/ixion/named_expressions_iterator.hpp
32include/libixion-0.17/ixion/named_expressions_iterator.hpp 32include/libixion-0.18/ixion/table.hpp
33include/libixion-0.17/ixion/table.hpp 33include/libixion-0.18/ixion/types.hpp
34include/libixion-0.17/ixion/types.hpp 34lib/libixion-0.18.la
35lib/libixion-0.17.la 35lib/pkgconfig/libixion-0.18.pc
36lib/pkgconfig/libixion-0.17.pc 
cvs diff -r1.9 -r1.10 pkgsrc/math/libixion/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/math/libixion/buildlink3.mk 2023/08/14 05:24:49 1.9
+++ pkgsrc/math/libixion/buildlink3.mk 2023/10/15 07:08:09 1.10
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.9 2023/08/14 05:24:49 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.10 2023/10/15 07:08:09 ryoon Exp $
2 2
3BUILDLINK_TREE+= libixion 3BUILDLINK_TREE+= libixion
4 4
5.if !defined(LIBIXION_BUILDLINK3_MK) 5.if !defined(LIBIXION_BUILDLINK3_MK)
6LIBIXION_BUILDLINK3_MK:= 6LIBIXION_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libixion+= libixion>=0.17.0 8BUILDLINK_API_DEPENDS.libixion+= libixion>=0.18.1
9BUILDLINK_ABI_DEPENDS.libixion?= libixion>=0.17.0nb4 
10BUILDLINK_PKGSRCDIR.libixion?= ../../math/libixion 9BUILDLINK_PKGSRCDIR.libixion?= ../../math/libixion
11 10
12.include "../../devel/mdds/buildlink3.mk" 11.include "../../devel/mdds/buildlink3.mk"
13.endif # LIBIXION_BUILDLINK3_MK 12.endif # LIBIXION_BUILDLINK3_MK
14 13
15BUILDLINK_TREE+= -libixion 14BUILDLINK_TREE+= -libixion
cvs diff -r1.11 -r1.12 pkgsrc/math/libixion/distinfo (expand / switch to unified diff)

--- pkgsrc/math/libixion/distinfo 2022/02/05 04:28:11 1.11
+++ pkgsrc/math/libixion/distinfo 2023/10/15 07:08:09 1.12
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.11 2022/02/05 04:28:11 ryoon Exp $ 1$NetBSD: distinfo,v 1.12 2023/10/15 07:08:09 ryoon Exp $
2 2
3BLAKE2s (libixion-0.17.0.tar.xz) = 8bff695be541ee7114691ff0acab7951e1d5b95476cab9ab24676f953527ec65 3BLAKE2s (libixion-0.18.1.tar.xz) = 09d0a0efb645eb14175876f29d5842aee48d0c2074ea3762ce9232ef7c43d927
4SHA512 (libixion-0.17.0.tar.xz) = 0acdb2eae5250236a94b1a3344ca990058ea8db7b1e741545bcb7160f9e28d21a3c2ec336621fd590df10188a4d5feadfbb3a63f57e9bfd2cc1bffc04009ffad 4SHA512 (libixion-0.18.1.tar.xz) = 9b490fe854daa41f29663f071eb53f9e1d2796076bd3a2f11217a9fbd8ba061700511eb064d9b038f36a638ef1e4f9d691cf7cec8445dd8852b60411992665b7
5Size (libixion-0.17.0.tar.xz) = 499836 bytes 5Size (libixion-0.18.1.tar.xz) = 521024 bytes
6SHA1 (patch-configure.ac) = f5a27ed314e69ecf1ed94d400abd2262a0fce7be 6SHA1 (patch-configure.ac) = f5a27ed314e69ecf1ed94d400abd2262a0fce7be
7SHA1 (patch-src_python_Makefile.am) = c4811646fbe288f85070994234502f20d4cafc56 7SHA1 (patch-src_python_Makefile.am) = c4811646fbe288f85070994234502f20d4cafc56
cvs diff -r1.14 -r1.15 pkgsrc/math/py-libixion/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-libixion/Makefile 2023/05/16 21:20:53 1.14
+++ pkgsrc/math/py-libixion/Makefile 2023/10/15 07:08:09 1.15
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.14 2023/05/16 21:20:53 wiz Exp $ 1# $NetBSD: Makefile,v 1.15 2023/10/15 07:08:09 ryoon Exp $
2 2
3PKGREVISION= 3 
4.include "../../math/libixion/Makefile.common" 3.include "../../math/libixion/Makefile.common"
5 4
6PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
7 6
8USE_TOOLS+= aclocal autoconf automake 7USE_TOOLS+= aclocal autoconf automake
9BUILD_DIRS= src/python 8BUILD_DIRS= src/python
10PY_PATCHPLIST= yes 9PY_PATCHPLIST= yes
11 10
12PYTHON_VERSIONS_INCOMPATIBLE= 27 11PYTHON_VERSIONS_INCOMPATIBLE= 27
13 12
14pre-configure: 13pre-configure:
15 set -e; cd ${WRKSRC}; \ 14 set -e; cd ${WRKSRC}; \
16 aclocal; automake -a --foreign -i; autoconf 15 aclocal; automake -a --foreign -i; autoconf