From 06320acbe4ba5d446a4b60a442f4624e60bd2d56 Mon Sep 17 00:00:00 2001 From: Gleb Popov Date: Mon, 29 Jun 2020 14:44:36 +0000 Subject: math/givaro: Remove my patch now that correct upstream fix is added to math/linalg. PR: 247537 --- math/givaro/Makefile | 2 +- math/givaro/files/patch-src_kernel_gmp++_gmp++__int.h | 10 ---------- .../files/patch-src_kernel_gmp++_gmp++__int__cstor.C | 14 -------------- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 math/givaro/files/patch-src_kernel_gmp++_gmp++__int.h delete mode 100644 math/givaro/files/patch-src_kernel_gmp++_gmp++__int__cstor.C (limited to 'math/givaro') diff --git a/math/givaro/Makefile b/math/givaro/Makefile index 194b4758e936..e056644f5bb2 100644 --- a/math/givaro/Makefile +++ b/math/givaro/Makefile @@ -3,7 +3,7 @@ PORTNAME= givaro PORTVERSION= 4.1.1 DISTVERSIONPREFIX=v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= pi@FreeBSD.org diff --git a/math/givaro/files/patch-src_kernel_gmp++_gmp++__int.h b/math/givaro/files/patch-src_kernel_gmp++_gmp++__int.h deleted file mode 100644 index b7c1c925e0c1..000000000000 --- a/math/givaro/files/patch-src_kernel_gmp++_gmp++__int.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/kernel/gmp++/gmp++_int.h.orig 2019-06-07 13:23:45 UTC -+++ src/kernel/gmp++/gmp++_int.h -@@ -234,6 +234,7 @@ namespace Givaro { - */ - ///@{ - giv_all_inlined Integer& operator = (const Integer& n); -+ giv_all_inlined Integer& operator = (const Integer& n) const; - giv_all_inlined Integer& logcpy(const Integer& n); - giv_all_inlined Integer& copy(const Integer& n); - ///@} diff --git a/math/givaro/files/patch-src_kernel_gmp++_gmp++__int__cstor.C b/math/givaro/files/patch-src_kernel_gmp++_gmp++__int__cstor.C deleted file mode 100644 index a1fffcec7e93..000000000000 --- a/math/givaro/files/patch-src_kernel_gmp++_gmp++__int__cstor.C +++ /dev/null @@ -1,14 +0,0 @@ ---- src/kernel/gmp++/gmp++_int_cstor.C.orig 2019-06-07 13:23:45 UTC -+++ src/kernel/gmp++/gmp++_int_cstor.C -@@ -105,6 +105,11 @@ namespace Givaro { - return logcpy(n) ; - } - -+ Integer& Integer::operator = (const Integer &n) const -+ { -+ return const_cast(this)->logcpy(n) ; -+ } -+ - - Integer& Integer::copy(const Integer &n) - { -- cgit v1.2.3