git: 18987275345e - main - math/givaro: update 4.2.0 -> 4.2.1, fix build with libc++ 21

The branch main has been updated by pi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=18987275345e86158b0cd97a7e640d13f45e65f2

commit 18987275345e86158b0cd97a7e640d13f45e65f2
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2026-02-24 19:32:12 +0000
Commit:     Kurt Jaeger <pi@FreeBSD.org>
CommitDate: 2026-02-24 19:32:12 +0000

    math/givaro: update 4.2.0 -> 4.2.1, fix build with libc++ 21
    
    - libc++ 21 no longer allows std::make_signed to be overridden.
      Upstream fixed this as part of
      https://github.com/linbox-team/givaro/commit/ed91ee0
    
    PR:             293269
    Changes:        https://github.com/linbox-team/givaro/releases/tag/v4.2.1
---
 math/givaro/Makefile                               | 13 ++++++++----
 math/givaro/distinfo                               |  8 +++++---
 .../patch-src_kernel_integer_random-integer.h      | 23 ----------------------
 .../files/patch-src_kernel_recint_rfiddling.h      | 11 -----------
 math/givaro/pkg-plist                              |  3 ++-
 5 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/math/givaro/Makefile b/math/givaro/Makefile
index ba924c8758a8..7c8d4cb3d095 100644
--- a/math/givaro/Makefile
+++ b/math/givaro/Makefile
@@ -1,8 +1,11 @@
 PORTNAME=	givaro
-PORTVERSION=	4.2.0
-DISTVERSIONPREFIX=v
+PORTVERSION=	4.2.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	ed91ee0dc2d41f3ceb72abc375ad5c0fec62ed56.patch:-p1 # Add libc++ support for macOS and Linux
+
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	C++ library for computer algebra
 WWW=		https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro
@@ -14,7 +17,8 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
-USES=		autoreconf compiler:c++11-lang gmake libtool localbase pathfix pkgconfig
+USES=		autoreconf compiler:c++11-lang gmake libtool localbase \
+		pathfix pkgconfig
 USE_CXXSTD=	c++11
 USE_GITHUB=	yes
 GH_ACCOUNT=	linbox-team
@@ -32,7 +36,8 @@ OPTIONS_SUB=	yes
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			dot:graphics/graphviz
 DOCS_USE=		TEX=base:build,dvipsk:build,latex:build,pdftex:build
-DOCS_CONFIGURE_ON=	--enable-doc --with-docdir=${DOCSDIR}
+DOCS_CONFIGURE_ON=	--enable-doc \
+			--with-docdir=${DOCSDIR}
 
 post-install-DOCS-on:
 	${RMDIR} ${STAGEDIR}${DOCSDIR}/givaro-dev-html
diff --git a/math/givaro/distinfo b/math/givaro/distinfo
index 6a5502692cc6..20a6c5ce89d4 100644
--- a/math/givaro/distinfo
+++ b/math/givaro/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1690897251
-SHA256 (linbox-team-givaro-v4.2.0_GH0.tar.gz) = dca23a928e4704f045848fce884fe49ce09a8de7ebf750b87c807ca4e0facedd
-SIZE (linbox-team-givaro-v4.2.0_GH0.tar.gz) = 637479
+TIMESTAMP = 1771446897
+SHA256 (linbox-team-givaro-v4.2.1_GH0.tar.gz) = 6aae4b74c2772b6f4aa4e55d1d90f79214635aa664e3b121dde2e0b5192f310b
+SIZE (linbox-team-givaro-v4.2.1_GH0.tar.gz) = 643640
+SHA256 (ed91ee0dc2d41f3ceb72abc375ad5c0fec62ed56.patch) = 9bbe7074e3452c197801ac92c14be1050db72c587deeaa51873fb8c9fb71a992
+SIZE (ed91ee0dc2d41f3ceb72abc375ad5c0fec62ed56.patch) = 7113
diff --git a/math/givaro/files/patch-src_kernel_integer_random-integer.h b/math/givaro/files/patch-src_kernel_integer_random-integer.h
deleted file mode 100644
index f8c7c62f7c21..000000000000
--- a/math/givaro/files/patch-src_kernel_integer_random-integer.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/kernel/integer/random-integer.h.orig	2021-12-14 10:00:03 UTC
-+++ src/kernel/integer/random-integer.h
-@@ -11,10 +11,12 @@
- 
- #include "gmp++/gmp++.h"
- 
-+#if __cpp_lib_bool_constant < 201505L
- namespace std {
-     template <bool B>
-     using bool_constant = integral_constant<bool, B>;
- }
-+#endif
- 
- namespace Givaro
- {
-@@ -91,7 +93,6 @@ namespace Givaro
-             if (this != &R) {
-                 _bits = R._bits;
-                 _integer = R._integer;
--                const_cast<Integer_Domain&>(_ring)=R._ring;
-             }
-             return *this;
-         }
diff --git a/math/givaro/files/patch-src_kernel_recint_rfiddling.h b/math/givaro/files/patch-src_kernel_recint_rfiddling.h
deleted file mode 100644
index 5591e9e210bf..000000000000
--- a/math/givaro/files/patch-src_kernel_recint_rfiddling.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/kernel/recint/rfiddling.h.orig	2021-12-14 10:00:03 UTC
-+++ src/kernel/recint/rfiddling.h
-@@ -167,7 +167,7 @@ namespace RecInt
-     template <size_t K>
-     inline rint<K> rint<K>::maxFFLAS() {
-         rint<K> max;
--        set_highest_bit(max.Low.Value);
-+        set_highest_bit(max.Value.Low);
-         return max;
-     }
- 
diff --git a/math/givaro/pkg-plist b/math/givaro/pkg-plist
index 9439e4d032ea..7488604d26c9 100644
--- a/math/givaro/pkg-plist
+++ b/math/givaro/pkg-plist
@@ -82,6 +82,7 @@ include/givaro/givpoly1factor.inl
 include/givaro/givpoly1gcd.inl
 include/givaro/givpoly1io.inl
 include/givaro/givpoly1kara.inl
+include/givaro/givpoly1midmul.inl
 include/givaro/givpoly1misc.inl
 include/givaro/givpoly1muldiv.inl
 include/givaro/givpoly1padic.h
@@ -226,6 +227,6 @@ include/recint/rutools.h
 lib/libgivaro.a
 lib/libgivaro.so
 lib/libgivaro.so.9
-lib/libgivaro.so.9.2.0
+lib/libgivaro.so.9.2.1
 libdata/pkgconfig/givaro.pc
 %%DATADIR%%/givaro-makefile