pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/math



Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Feb  6 06:23:22 UTC 2021

Modified Files:
        pkgsrc/math/libixion: Makefile Makefile.common PLIST buildlink3.mk
            distinfo
        pkgsrc/math/libixion/patches: patch-configure.ac
        pkgsrc/math/py-libixion: Makefile
Added Files:
        pkgsrc/math/libixion/patches: patch-src_libixion_model__context.cpp
Removed Files:
        pkgsrc/math/libixion/patches: patch-configure
            patch-include_ixion_model__context.hpp

Log Message:
libixion, py-libixion: Update to 0.16.1

Changelog:
0.16.1
    fixed a build issue on 32-bit linux platforms, caused by slicing
    of integer string ID values.

    worked around floating point rounding errors which prevented
    two theoretically-equal numeric values from being evaluated as
    equal in test code.

0.16.0
    documentation
        added quickstart sections for using model_context and
        document classes.

        added code example for cell_access class.

    C++ API
        added new function to allow printing of single formula
        tokens.

        added method for setting cached results on formula cells
        in model_context.

        changed the model_context design to ensure that all sheets
        are of the same size.

        added an accessor method to formula_model_access interface
        (and implicitly in model_context) that directly returns a
        string value from cell.

        added cell_access class for querying of cell states without
        knowing its type ahead of time.

        added document class which provides a layer on top of
        model_context, to abstract away the handling of formula
        calculations.

        deprecated model_context::erase_cell() in favor of
        empty_cell().

    formula parser / interpreter
        added support for 3D references - references that contain
        multiple sheets.

        added support for the exponent (^) and concatenation (&)
        operators.

        fixed incorrect handling of range references containing
        whole columns such as A:A.

        added support for unordered range references - range
        references whose start row or column is greater than their
        end position counterparts, such as A3:A1.

        fixed a bug that prevented nested formula functions from
        working properly.

        implemented Calc A1 style reference resolver.

    misc
        formula results now directly store the string values when
        the results are of string type. They previously stored
        string ID values after interning the original strings.

        removed build-time dependency on spdlog.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/math/libixion/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/libixion/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/libixion/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/libixion/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/libixion/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/math/libixion/patches/patch-configure \
    pkgsrc/math/libixion/patches/patch-include_ixion_model__context.hpp
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/libixion/patches/patch-configure.ac
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/libixion/patches/patch-src_libixion_model__context.cpp
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/py-libixion/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/libixion/Makefile
diff -u pkgsrc/math/libixion/Makefile:1.19 pkgsrc/math/libixion/Makefile:1.20
--- pkgsrc/math/libixion/Makefile:1.19  Fri Jan  1 08:24:49 2021
+++ pkgsrc/math/libixion/Makefile       Sat Feb  6 06:23:22 2021
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.19 2021/01/01 08:24:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2021/02/06 06:23:22 ryoon Exp $
 
-PKGREVISION= 2
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=       --disable-python

Index: pkgsrc/math/libixion/Makefile.common
diff -u pkgsrc/math/libixion/Makefile.common:1.3 pkgsrc/math/libixion/Makefile.common:1.4
--- pkgsrc/math/libixion/Makefile.common:1.3    Mon May 18 19:21:12 2020
+++ pkgsrc/math/libixion/Makefile.common        Sat Feb  6 06:23:22 2021
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2020/05/18 19:21:12 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2021/02/06 06:23:22 ryoon Exp $
 #
 # used by math/libixion/Makefile
 # used by math/py-libixion/Makefile
 
-DISTNAME=      libixion-0.15.0
+DISTNAME=      libixion-0.16.1
 CATEGORIES=    math devel
 MASTER_SITES=  http://kohei.us/files/ixion/src/
 EXTRACT_SUFX=  .tar.xz
@@ -19,7 +19,7 @@ DISTINFO_FILE=        ${.CURDIR}/../../math/lib
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++17
 
 BUILDLINK_TRANSFORM.NetBSD+=   rm:-ldl
 

Index: pkgsrc/math/libixion/PLIST
diff -u pkgsrc/math/libixion/PLIST:1.4 pkgsrc/math/libixion/PLIST:1.5
--- pkgsrc/math/libixion/PLIST:1.4      Wed Feb  5 13:46:13 2020
+++ pkgsrc/math/libixion/PLIST  Sat Feb  6 06:23:22 2021
@@ -1,35 +1,38 @@
-@comment $NetBSD: PLIST,v 1.4 2020/02/05 13:46:13 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/02/06 06:23:22 ryoon Exp $
 bin/ixion-formula-tokenizer
 bin/ixion-parser
 bin/ixion-sorter
-include/libixion-0.15/ixion/address.hpp
-include/libixion-0.15/ixion/address_iterator.hpp
-include/libixion-0.15/ixion/cell.hpp
-include/libixion-0.15/ixion/column_store_type.hpp
-include/libixion-0.15/ixion/compute_engine.hpp
-include/libixion-0.15/ixion/config.hpp
-include/libixion-0.15/ixion/dirty_cell_tracker.hpp
-include/libixion-0.15/ixion/env.hpp
-include/libixion-0.15/ixion/exceptions.hpp
-include/libixion-0.15/ixion/formula.hpp
-include/libixion-0.15/ixion/formula_function_opcode.hpp
-include/libixion-0.15/ixion/formula_name_resolver.hpp
-include/libixion-0.15/ixion/formula_opcode.hpp
-include/libixion-0.15/ixion/formula_result.hpp
-include/libixion-0.15/ixion/formula_tokens.hpp
-include/libixion-0.15/ixion/formula_tokens_fwd.hpp
-include/libixion-0.15/ixion/global.hpp
-include/libixion-0.15/ixion/info.hpp
-include/libixion-0.15/ixion/interface/formula_model_access.hpp
-include/libixion-0.15/ixion/interface/session_handler.hpp
-include/libixion-0.15/ixion/interface/table_handler.hpp
-include/libixion-0.15/ixion/macros.hpp
-include/libixion-0.15/ixion/matrix.hpp
-include/libixion-0.15/ixion/mem_str_buf.hpp
-include/libixion-0.15/ixion/model_context.hpp
-include/libixion-0.15/ixion/model_iterator.hpp
-include/libixion-0.15/ixion/module.hpp
-include/libixion-0.15/ixion/table.hpp
-include/libixion-0.15/ixion/types.hpp
-lib/libixion-0.15.la
-lib/pkgconfig/libixion-0.15.pc
+include/libixion-0.16/ixion/address.hpp
+include/libixion-0.16/ixion/address_iterator.hpp
+include/libixion-0.16/ixion/cell.hpp
+include/libixion-0.16/ixion/cell_access.hpp
+include/libixion-0.16/ixion/column_store_type.hpp
+include/libixion-0.16/ixion/compute_engine.hpp
+include/libixion-0.16/ixion/config.hpp
+include/libixion-0.16/ixion/dirty_cell_tracker.hpp
+include/libixion-0.16/ixion/document.hpp
+include/libixion-0.16/ixion/env.hpp
+include/libixion-0.16/ixion/exceptions.hpp
+include/libixion-0.16/ixion/formula.hpp
+include/libixion-0.16/ixion/formula_function_opcode.hpp
+include/libixion-0.16/ixion/formula_name_resolver.hpp
+include/libixion-0.16/ixion/formula_opcode.hpp
+include/libixion-0.16/ixion/formula_result.hpp
+include/libixion-0.16/ixion/formula_tokens.hpp
+include/libixion-0.16/ixion/formula_tokens_fwd.hpp
+include/libixion-0.16/ixion/global.hpp
+include/libixion-0.16/ixion/info.hpp
+include/libixion-0.16/ixion/interface/formula_model_access.hpp
+include/libixion-0.16/ixion/interface/session_handler.hpp
+include/libixion-0.16/ixion/interface/table_handler.hpp
+include/libixion-0.16/ixion/macros.hpp
+include/libixion-0.16/ixion/matrix.hpp
+include/libixion-0.16/ixion/mem_str_buf.hpp
+include/libixion-0.16/ixion/model_context.hpp
+include/libixion-0.16/ixion/model_iterator.hpp
+include/libixion-0.16/ixion/module.hpp
+include/libixion-0.16/ixion/named_expressions_iterator.hpp
+include/libixion-0.16/ixion/table.hpp
+include/libixion-0.16/ixion/types.hpp
+lib/libixion-0.16.la
+lib/pkgconfig/libixion-0.16.pc

Index: pkgsrc/math/libixion/buildlink3.mk
diff -u pkgsrc/math/libixion/buildlink3.mk:1.6 pkgsrc/math/libixion/buildlink3.mk:1.7
--- pkgsrc/math/libixion/buildlink3.mk:1.6      Wed Feb  5 13:46:13 2020
+++ pkgsrc/math/libixion/buildlink3.mk  Sat Feb  6 06:23:22 2021
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.6 2020/02/05 13:46:13 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2021/02/06 06:23:22 ryoon Exp $
 
 BUILDLINK_TREE+=       libixion
 
 .if !defined(LIBIXION_BUILDLINK3_MK)
 LIBIXION_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libixion+=       libixion>=0.15.0
+BUILDLINK_API_DEPENDS.libixion+=       libixion>=0.16.1
 BUILDLINK_PKGSRCDIR.libixion?=         ../../math/libixion
 
 .include "../../devel/mdds/buildlink3.mk"

Index: pkgsrc/math/libixion/distinfo
diff -u pkgsrc/math/libixion/distinfo:1.7 pkgsrc/math/libixion/distinfo:1.8
--- pkgsrc/math/libixion/distinfo:1.7   Mon May 18 19:21:19 2020
+++ pkgsrc/math/libixion/distinfo       Sat Feb  6 06:23:22 2021
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.7 2020/05/18 19:21:19 wiz Exp $
+$NetBSD: distinfo,v 1.8 2021/02/06 06:23:22 ryoon Exp $
 
-SHA1 (libixion-0.15.0.tar.xz) = cdf61f14b9587620573b3e6e7d8b11c686419dc0
-RMD160 (libixion-0.15.0.tar.xz) = 96f24812a77611c5554e213788bb0633ecd1d5aa
-SHA512 (libixion-0.15.0.tar.xz) = feecaa4a8e6191649a7ecbc6c0f4d7db6dba3a5e4a031c1f55236907bf94e2ece9ee05d18ed345e3503cffb4a380b04f6c4941ef4214ddf92687998a070b7543
-Size (libixion-0.15.0.tar.xz) = 447388 bytes
-SHA1 (patch-configure) = 7931b66d933b3ffd932ddfad3494eb40424e6b0e
-SHA1 (patch-configure.ac) = 46c9d080102842d5edba6844a51d6b38063af220
-SHA1 (patch-include_ixion_model__context.hpp) = 89456eacf54deb95bf48a5836d674f97ff64eb37
+SHA1 (libixion-0.16.1.tar.xz) = 967b8f3dbf7b37f723138a73767c6915bbd50409
+RMD160 (libixion-0.16.1.tar.xz) = 766dd3a4b822d43f9e2a7e47c5061616574fa105
+SHA512 (libixion-0.16.1.tar.xz) = 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de
+Size (libixion-0.16.1.tar.xz) = 482500 bytes
+SHA1 (patch-configure.ac) = f5a27ed314e69ecf1ed94d400abd2262a0fce7be
+SHA1 (patch-src_libixion_model__context.cpp) = 01cc8e673bc0e082d6f843a455879e18259329e8
 SHA1 (patch-src_python_Makefile.am) = c4811646fbe288f85070994234502f20d4cafc56

Index: pkgsrc/math/libixion/patches/patch-configure.ac
diff -u pkgsrc/math/libixion/patches/patch-configure.ac:1.2 pkgsrc/math/libixion/patches/patch-configure.ac:1.3
--- pkgsrc/math/libixion/patches/patch-configure.ac:1.2 Wed Feb  5 13:46:13 2020
+++ pkgsrc/math/libixion/patches/patch-configure.ac     Sat Feb  6 06:23:22 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.2 2020/02/05 13:46:13 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.3 2021/02/06 06:23:22 ryoon Exp $
 
 * check for pkgsrc libixion, used by math/py-libixion
 
@@ -14,12 +14,3 @@ $NetBSD: patch-configure.ac,v 1.2 2020/0
  ])
  
  AS_IF([test "x$enable_threads" != "xno"], [
-@@ -169,7 +170,7 @@ AC_ARG_ENABLE([werror],
-       [enable_werror="$enableval"],
-       [enable_werror=no]
- )
--AS_IF([test x"$enable_werror" == "xyes"], [
-+AS_IF([test x"$enable_werror" = "xyes"], [
-       CXXFLAGS="$CXXFLAGS -Werror"
- ])
- 

Index: pkgsrc/math/py-libixion/Makefile
diff -u pkgsrc/math/py-libixion/Makefile:1.6 pkgsrc/math/py-libixion/Makefile:1.7
--- pkgsrc/math/py-libixion/Makefile:1.6        Fri Jan  1 08:24:49 2021
+++ pkgsrc/math/py-libixion/Makefile    Sat Feb  6 06:23:22 2021
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.6 2021/01/01 08:24:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2021/02/06 06:23:22 ryoon Exp $
 
-PKGREVISION= 2
 .include "../../math/libixion/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}

Added files:

Index: pkgsrc/math/libixion/patches/patch-src_libixion_model__context.cpp
diff -u /dev/null pkgsrc/math/libixion/patches/patch-src_libixion_model__context.cpp:1.1
--- /dev/null   Sat Feb  6 06:23:22 2021
+++ pkgsrc/math/libixion/patches/patch-src_libixion_model__context.cpp  Sat Feb  6 06:23:22 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_libixion_model__context.cpp,v 1.1 2021/02/06 06:23:22 ryoon Exp $
+
+* Fix build.
+  model_context.cpp:20:38: error: expected constructor, destructor, or type conversion before '(' token
+
+--- src/libixion/model_context.cpp.orig        2020-08-28 21:23:48.000000000 +0000
++++ src/libixion/model_context.cpp
+@@ -17,7 +17,7 @@
+ 
+ namespace ixion {
+ 
+-model_context::input_cell::input_cell(nullptr_t) : type(celltype_t::empty) {}
++model_context::input_cell::input_cell(std::nullptr_t) : type(celltype_t::empty) {}
+ model_context::input_cell::input_cell(bool b) : type(celltype_t::boolean)
+ {
+     value.boolean = b;



Home | Main Index | Thread Index | Old Index