Date: Sat, 18 Jan 2025 19:48:34 GMT From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d7c306d3ff38 - main - math/eclib: upgrade to v20241112 Message-ID: <202501181948.50IJmYm0006455@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=d7c306d3ff38d7f08df38dd9fd8d03cdf48f5e30 commit d7c306d3ff38d7f08df38dd9fd8d03cdf48f5e30 Author: Thierry Thomas <thierry@FreeBSD.org> AuthorDate: 2025-01-18 19:44:18 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2025-01-18 19:47:18 +0000 math/eclib: upgrade to v20241112 Releases notes at https://github.com/JohnCremona/eclib/releases --- math/eclib/Makefile | 9 ++++----- math/eclib/distinfo | 6 +++--- math/eclib/files/patch-libsrc_mwprocs.cc | 34 ++++++++++++++++++++++++++++++++ math/eclib/files/patch-tests_Makefile.am | 4 ++-- math/eclib/pkg-plist | 8 +++----- 5 files changed, 46 insertions(+), 15 deletions(-) diff --git a/math/eclib/Makefile b/math/eclib/Makefile index 16f0468f88d6..49b68cab2375 100644 --- a/math/eclib/Makefile +++ b/math/eclib/Makefile @@ -1,12 +1,11 @@ PORTNAME= eclib -PORTVERSION= 20230424 -PORTREVISION= 6 +PORTVERSION= 20241112 DISTVERSIONPREFIX= v CATEGORIES= math MAINTAINER= thierry@FreeBSD.org COMMENT= C++ library for arithmetic on elliptic curves -WWW= https://homepages.warwick.ac.uk/staff/J.E.Cremona/mwrank/ +WWW= https://johncremona.github.io/mwrank/index.html LICENSE= GPLv2 @@ -18,14 +17,14 @@ LIB_DEPENDS= libntl.so:math/ntl \ USE_GITHUB= yes GH_ACCOUNT= JohnCremona -USES= autoreconf compiler:c++11-lang libtool localbase +USES= autoreconf compiler:c++14-lang libtool localbase OPTIONS_DEFINE= DOCS -CXXFLAGS+= -std=c++11 LIBS+= "-lm" GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +USE_CXXSTD= c++14 CONFIGURE_ARGS= --with-flint=${LOCALBASE} --with-boost=${LOCALBASE} INSTALL_TARGET= install-strip USE_LDCONFIG= yes diff --git a/math/eclib/distinfo b/math/eclib/distinfo index 158e7a1a7159..b66503207051 100644 --- a/math/eclib/distinfo +++ b/math/eclib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684597242 -SHA256 (JohnCremona-eclib-v20230424_GH0.tar.gz) = 67d59d4086c9c46b7ca6c5a34e0879aed00836f812a1cba29756d618af08e32f -SIZE (JohnCremona-eclib-v20230424_GH0.tar.gz) = 1039476 +TIMESTAMP = 1737217199 +SHA256 (JohnCremona-eclib-v20241112_GH0.tar.gz) = 0c5cd1310210bb740ba774ba5b504b882ffa6fb0bcfd7e41da99d9ea296673ae +SIZE (JohnCremona-eclib-v20241112_GH0.tar.gz) = 1047295 diff --git a/math/eclib/files/patch-libsrc_mwprocs.cc b/math/eclib/files/patch-libsrc_mwprocs.cc new file mode 100644 index 000000000000..13ad5db7c812 --- /dev/null +++ b/math/eclib/files/patch-libsrc_mwprocs.cc @@ -0,0 +1,34 @@ +--- libsrc/mwprocs.cc.orig 2024-11-12 14:33:12 UTC ++++ libsrc/mwprocs.cc +@@ -94,25 +94,23 @@ vector<vector<bigfloat>> get_minor(const vector<vector + + vector<vector<bigfloat>> get_minor(const vector<vector<bigfloat>>& m, long m_size, long i0, long j0) + { +- vector<vector<bigfloat>> minor(MAXRANK, vector<bigfloat>(MAXRANK)); ++ vector<vector<bigfloat>> the_minor(MAXRANK, vector<bigfloat>(MAXRANK)); + for (long i=0; i<m_size-1; i++) + { +- long ii=i; +- if(i>=i0) ii++; ++ long ii = (i>=i0? i+1 : i); + for (long j=0; j<m_size-1; j++) + { +- long jj=j; ++ long jj = (j>=j0? j+1 : j); + if(j>=j0) jj++; +- minor[i][j] = m[ii][jj]; ++ the_minor[i][j] = m[ii][jj]; + } + } +- return minor; ++ return the_minor; + } + + bigfloat det_minor(const vector<vector<bigfloat>>& m, long m_size, long i0, long j0) + { +- const vector<vector<bigfloat>>& minor = get_minor(m,m_size,i0,j0); +- return det(minor, m_size-1); ++ return det(get_minor(m,m_size,i0,j0), m_size-1); + } + + bigfloat det(const vector<vector<bigfloat>>& m, long m_size) diff --git a/math/eclib/files/patch-tests_Makefile.am b/math/eclib/files/patch-tests_Makefile.am index 88a7b785b717..c9ee847c8acc 100644 --- a/math/eclib/files/patch-tests_Makefile.am +++ b/math/eclib/files/patch-tests_Makefile.am @@ -1,6 +1,6 @@ ---- tests/Makefile.am.orig 2021-03-08 17:51:22 UTC +--- tests/Makefile.am.orig 2024-11-12 14:33:12 UTC +++ tests/Makefile.am -@@ -129,9 +129,9 @@ tnfd_SOURCES=tnfd.cc +@@ -145,9 +145,9 @@ tnfd_SOURCES=tnfd.cc # This is the name of a directory which will be used for newform # input/output in the "make check" tests and removed afterwards. diff --git a/math/eclib/pkg-plist b/math/eclib/pkg-plist index d08c073a13e2..a1f10f0e5532 100644 --- a/math/eclib/pkg-plist +++ b/math/eclib/pkg-plist @@ -42,6 +42,7 @@ include/eclib/egr.h include/eclib/elog.h include/eclib/ffmod.h include/eclib/fixc6.h +include/eclib/flinterface.h include/eclib/getcurve.h include/eclib/gf.h include/eclib/hilbert.h @@ -62,14 +63,11 @@ include/eclib/method.h include/eclib/mglobsol.h include/eclib/minim.h include/eclib/mlocsol.h -include/eclib/mmatrix.h include/eclib/moddata.h include/eclib/mquartic.h include/eclib/mrank1.h include/eclib/mrank2.h include/eclib/msoluble.h -include/eclib/msubspace.h -include/eclib/mvector.h include/eclib/mwprocs.h include/eclib/newforms.h include/eclib/nfd.h @@ -118,8 +116,8 @@ include/eclib/xsplit.h include/eclib/xsplit_data.h lib/libec.a lib/libec.so -lib/libec.so.10 -lib/libec.so.10.2.0 +lib/libec.so.14 +lib/libec.so.14.0.0 libdata/pkgconfig/eclib.pc %%PORTDOCS%%%%DOCSDIR%%/g0n.txt %%PORTDOCS%%%%DOCSDIR%%/howto.txt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501181948.50IJmYm0006455>