CVS commit: pkgsrc/security/py-olm

["Thomas Merkel" <tm%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tm
Date:           Sat Jun  1 17:34:01 UTC 2024

Modified Files:
        pkgsrc/security/py-olm: distinfo
Added Files:
        pkgsrc/security/py-olm/patches: patch-libolm_tests_include_doctest.h

Log Message:
py-olm: fix illumos / smartos build


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/py-olm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/py-olm/patches/patch-libolm_tests_include_doctest.h

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

Modified files:

Index: pkgsrc/security/py-olm/distinfo
diff -u pkgsrc/security/py-olm/distinfo:1.3 pkgsrc/security/py-olm/distinfo:1.4
--- pkgsrc/security/py-olm/distinfo:1.3 Thu Nov 30 06:16:15 2023
+++ pkgsrc/security/py-olm/distinfo     Sat Jun  1 17:34:00 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2023/11/30 06:16:15 adam Exp $
+$NetBSD: distinfo,v 1.4 2024/06/01 17:34:00 tm Exp $
 
 BLAKE2s (python-olm-3.2.16.tar.gz) = 58792cb971a7c886bc267e9349cad60c8352210a4c38b22f17a241f411a1b8b9
 SHA512 (python-olm-3.2.16.tar.gz) = e8c763577fe87387e1c3559b35db17766fe3c20acd8ff59ec118c33f040f980f7a6afde40a9adf4d9626782c904644a577c60d16f31cf05f0fb698e4b6cbffcf
 Size (python-olm-3.2.16.tar.gz) = 2705522 bytes
+SHA1 (patch-libolm_tests_include_doctest.h) = c2855771dcf9139ad3923257f75129508ad95ae9

Added files:

Index: pkgsrc/security/py-olm/patches/patch-libolm_tests_include_doctest.h
diff -u /dev/null pkgsrc/security/py-olm/patches/patch-libolm_tests_include_doctest.h:1.1
--- /dev/null   Sat Jun  1 17:34:01 2024
+++ pkgsrc/security/py-olm/patches/patch-libolm_tests_include_doctest.h Sat Jun  1 17:34:01 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-libolm_tests_include_doctest.h,v 1.1 2024/06/01 17:34:01 tm Exp $
+
+avoid ambigous call to std::log10.
+
+--- libolm/tests/include/doctest.h.orig        2022-01-10 10:00:49.000000000 +0000
++++ libolm/tests/include/doctest.h
+@@ -5914,9 +5914,9 @@ namespace {
+             separator_to_stream();
+             s << std::dec;
+ 
+-            auto totwidth = int(std::ceil(log10((std::max(p.numTestCasesPassingFilters, static_cast<unsigned>(p.numAsserts))) + 1)));
+-            auto passwidth = int(std::ceil(log10((std::max(p.numTestCasesPassingFilters - p.numTestCasesFailed, static_cast<unsigned>(p.numAsserts - p.numAssertsFailed))) + 1)));
+-            auto failwidth = int(std::ceil(log10((std::max(p.numTestCasesFailed, static_cast<unsigned>(p.numAssertsFailed))) + 1)));
++            auto totwidth = int(std::ceil(std::log10((std::max(p.numTestCasesPassingFilters, static_cast<unsigned>(p.numAsserts))) + 1)));
++            auto passwidth = int(std::ceil(std::log10((std::max(p.numTestCasesPassingFilters - p.numTestCasesFailed, static_cast<unsigned>(p.numAsserts - p.numAssertsFailed))) + 1)));
++            auto failwidth = int(std::ceil(std::log10((std::max(p.numTestCasesFailed, static_cast<unsigned>(p.numAssertsFailed))) + 1)));
+             const bool anythingFailed = p.numTestCasesFailed > 0 || p.numAssertsFailed > 0;
+             s << Color::Cyan << "[doctest] " << Color::None << "test cases: " << std::setw(totwidth)
+               << p.numTestCasesPassingFilters << " | "