CVS commit: pkgsrc/math/z3

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May 25 10:53:24 UTC 2023

Modified Files:
        pkgsrc/math/z3: distinfo
Added Files:
        pkgsrc/math/z3/patches: patch-src_ast_rewriter_seq__eq__solver.cpp

Log Message:
z3: Avoid ambiguous function call.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/math/z3/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/z3/patches/patch-src_ast_rewriter_seq__eq__solver.cpp

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

Modified files:

Index: pkgsrc/math/z3/distinfo
diff -u pkgsrc/math/z3/distinfo:1.15 pkgsrc/math/z3/distinfo:1.16
--- pkgsrc/math/z3/distinfo:1.15        Wed May 17 07:55:32 2023
+++ pkgsrc/math/z3/distinfo     Thu May 25 10:53:24 2023
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.15 2023/05/17 07:55:32 adam Exp $
+$NetBSD: distinfo,v 1.16 2023/05/25 10:53:24 jperkin Exp $
 
 BLAKE2s (z3-4.12.2.tar.gz) = ded82a59e22b621a969c4e96a19343a156f73744ac4975199e519c0870c681e2
 SHA512 (z3-4.12.2.tar.gz) = 375477cbbc9837b44e752c89916409d07bf6a73830b52878aab4f376f08b37dd5ab485da225744d394ab15f2a7e1014edc3be5eb9962934c440a8d55259317e2
 Size (z3-4.12.2.tar.gz) = 5401038 bytes
 SHA1 (patch-scripts_mk__util.py) = f092c9aed3c81408a485e9c92d8dddf5db86d6fe
 SHA1 (patch-src_api_python_setup.py) = cfc4a0a388d2a096ce86cbe3ca76b32502ec380e
+SHA1 (patch-src_ast_rewriter_seq__eq__solver.cpp) = 31cf8fc41855a4b3b5b6a10de88f613054719bc0
 SHA1 (patch-src_sat_sat__lookahead.cpp) = c091d8b267b5476e438888e82c9161599873264c
 SHA1 (patch-src_sat_sat__solver.cpp) = 0e279f291801901eabb11b7cb0268c137a3b41fe

Added files:

Index: pkgsrc/math/z3/patches/patch-src_ast_rewriter_seq__eq__solver.cpp
diff -u /dev/null pkgsrc/math/z3/patches/patch-src_ast_rewriter_seq__eq__solver.cpp:1.1
--- /dev/null   Thu May 25 10:53:24 2023
+++ pkgsrc/math/z3/patches/patch-src_ast_rewriter_seq__eq__solver.cpp   Thu May 25 10:53:24 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_ast_rewriter_seq__eq__solver.cpp,v 1.1 2023/05/25 10:53:24 jperkin Exp $
+
+Avoid ambiguous function call.
+
+--- src/ast/rewriter/seq_eq_solver.cpp.orig    2023-05-12 19:59:04.000000000 +0000
++++ src/ast/rewriter/seq_eq_solver.cpp
+@@ -284,7 +284,7 @@ namespace seq {
+         bv_util bv(m);
+         sort* bv_sort = n->get_sort();
+         unsigned sz = bv.get_bv_size(n);
+-        if (es.size() > (sz + log2(10)-1)/log2(10)) {
++        if (es.size() > (sz + log2(10.0)-1)/log2(10.0)) {
+             set_conflict();
+             return true;
+         }