diff options
Diffstat (limited to 'math/cado-nfs')
| -rw-r--r-- | math/cado-nfs/Makefile | 1 | ||||
| -rw-r--r-- | math/cado-nfs/files/patch-linalg_bwc_lingen__call__companion.hpp | 11 | ||||
| -rw-r--r-- | math/cado-nfs/files/patch-tests_sieve_test__fb__root.cpp | 26 | ||||
| -rw-r--r-- | math/cado-nfs/files/patch-utils_cxx__mpz.hpp | 14 |
4 files changed, 52 insertions, 0 deletions
diff --git a/math/cado-nfs/Makefile b/math/cado-nfs/Makefile index 34094d61e26a..db0fd87099f8 100644 --- a/math/cado-nfs/Makefile +++ b/math/cado-nfs/Makefile @@ -1,6 +1,7 @@ PORTNAME= cado-nfs DISTVERSIONPREFIX= v DISTVERSION= 2.3.0-20240408 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/cado-nfs/files/patch-linalg_bwc_lingen__call__companion.hpp b/math/cado-nfs/files/patch-linalg_bwc_lingen__call__companion.hpp new file mode 100644 index 000000000000..7522f8d3b07e --- /dev/null +++ b/math/cado-nfs/files/patch-linalg_bwc_lingen__call__companion.hpp @@ -0,0 +1,11 @@ +--- linalg/bwc/lingen_call_companion.hpp.orig 2024-04-08 11:23:28 UTC ++++ linalg/bwc/lingen_call_companion.hpp +@@ -177,7 +177,7 @@ namespace fmt { + // c++-14 or later + auto parse(format_parse_context& ctx) -> decltype(ctx.begin()) { return ctx.begin(); } + template <typename FormatContext> +-auto format(lingen_call_companion::key const & c, FormatContext& ctx) -> decltype(ctx.out()) { ++ auto format(lingen_call_companion::key const & c, FormatContext& ctx) const -> decltype(ctx.out()) { + std::ostringstream os; + os << c; + return formatter<string_view>::format( string_view(os.str()), ctx); diff --git a/math/cado-nfs/files/patch-tests_sieve_test__fb__root.cpp b/math/cado-nfs/files/patch-tests_sieve_test__fb__root.cpp new file mode 100644 index 000000000000..dfb184a7704f --- /dev/null +++ b/math/cado-nfs/files/patch-tests_sieve_test__fb__root.cpp @@ -0,0 +1,26 @@ +--- tests/sieve/test_fb_root.cpp.orig 2024-04-08 11:23:28 UTC ++++ tests/sieve/test_fb_root.cpp +@@ -57,9 +57,9 @@ template <typename T> struct /* fmt:: */ formatter<fb_ + // only allow {} for formatting. No :, no :x, etc. It could be nice + // to allow them, though. Note that this should be constexpr with + // c++-14 or later +- auto parse(format_parse_context& ctx) -> decltype(ctx.begin()) { return ctx.begin(); } ++ constexpr auto parse(format_parse_context& ctx) const -> decltype(ctx.begin()) { return ctx.begin(); } + template <typename FormatContext> +- auto format(fb_root_p1_t<T> const & c, FormatContext& ctx) -> decltype(ctx.out()) { ++ auto format(fb_root_p1_t<T> const & c, FormatContext& ctx) const -> decltype(ctx.out()) { + std::ostringstream os; + os << c; + return formatter<string_view>::format( string_view(os.str()), ctx); +@@ -70,9 +70,9 @@ template <> struct /* fmt:: */ formatter<qlattice_basi + // only allow {} for formatting. No :, no :x, etc. It could be nice + // to allow them, though. Note that this should be constexpr with + // c++-14 or later +- auto parse(format_parse_context& ctx) -> decltype(ctx.begin()) { return ctx.begin(); } ++ constexpr auto parse(format_parse_context& ctx) -> decltype(ctx.begin()) { return ctx.begin(); } + template <typename FormatContext> +- auto format(qlattice_basis const & c, FormatContext& ctx) -> decltype(ctx.out()) { ++ auto format(qlattice_basis const & c, FormatContext& ctx) const -> decltype(ctx.out()) { + std::ostringstream os; + os << c; + return formatter<string_view>::format( string_view(os.str()), ctx); diff --git a/math/cado-nfs/files/patch-utils_cxx__mpz.hpp b/math/cado-nfs/files/patch-utils_cxx__mpz.hpp new file mode 100644 index 000000000000..028f18381353 --- /dev/null +++ b/math/cado-nfs/files/patch-utils_cxx__mpz.hpp @@ -0,0 +1,14 @@ +--- utils/cxx_mpz.hpp.orig 2024-04-08 11:23:28 UTC ++++ utils/cxx_mpz.hpp +@@ -234,9 +234,9 @@ namespace fmt { + // only allow {} for formatting. No :, no :x, etc. It could be nice + // to allow them, though. Note that this should be constexpr with + // c++-14 or later +- auto parse(format_parse_context& ctx) -> decltype(ctx.begin()) { return ctx.begin(); } ++ auto parse(format_parse_context& ctx) const -> decltype(ctx.begin()) { return ctx.begin(); } + template <typename FormatContext> +-auto format(cxx_mpz const & c, FormatContext& ctx) -> decltype(ctx.out()) { ++ auto format(cxx_mpz const & c, FormatContext& ctx) const -> decltype(ctx.out()) { + std::ostringstream os; + os << c; + return formatter<string_view>::format( string_view(os.str()), ctx); |