[pkgsrc/trunk]: pkgsrc/math/eigen2 eigen2: fix headers to avoid introducing e...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/46221fca6d37
branches:  trunk
changeset: 339258:46221fca6d37
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon Sep 09 12:05:01 2019 +0000

description:
eigen2: fix headers to avoid introducing errors in dependent packages.

Fixes PR pkg/54108: misc/step fails build under -current 8.99.37
bump PKGREVISION.

diffstat:

 math/eigen2/Makefile                                    |   9 +++--
 math/eigen2/distinfo                                    |   3 +-
 math/eigen2/patches/patch-Eigen_src_Sparse_AmbiVector.h |  24 +++++++++++++++++
 3 files changed, 31 insertions(+), 5 deletions(-)

diffs (67 lines):

diff -r 957af8d7cd21 -r 46221fca6d37 math/eigen2/Makefile
--- a/math/eigen2/Makefile      Mon Sep 09 11:42:33 2019 +0000
+++ b/math/eigen2/Makefile      Mon Sep 09 12:05:01 2019 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2014/01/27 18:41:13 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/09/09 12:05:01 maya Exp $
 
 DISTNAME=      2.0.17
 PKGNAME=       eigen-2.0.17
+PKGREVISION=   1
 CATEGORIES=    math
-MASTER_SITES=   http://bitbucket.org/eigen/eigen/get/
+MASTER_SITES=  http://bitbucket.org/eigen/eigen/get/
 DIST_SUBDIR=   eigen2
 EXTRACT_SUFX=  .tar.bz2
 
@@ -12,8 +13,8 @@
 COMMENT=       C++ template library for linear algebra
 LICENSE=       gnu-lgpl-v3 OR gnu-gpl-v2
 
-USE_LANGUAGES+= c c++
-USE_CMAKE= yes
+USE_LANGUAGES+=        c c++
+USE_CMAKE=     yes
 WRKSRC=                ${WRKDIR}/eigen-eigen-b23437e61a07
 
 .include "../../mk/bsd.pkg.mk"
diff -r 957af8d7cd21 -r 46221fca6d37 math/eigen2/distinfo
--- a/math/eigen2/distinfo      Mon Sep 09 11:42:33 2019 +0000
+++ b/math/eigen2/distinfo      Mon Sep 09 12:05:01 2019 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 23:33:32 agc Exp $
+$NetBSD: distinfo,v 1.10 2019/09/09 12:05:01 maya Exp $
 
 SHA1 (eigen2/2.0.17.tar.bz2) = 461546be98b964d8d5d2adb0f1c31ba0e42efc38
 RMD160 (eigen2/2.0.17.tar.bz2) = 183c8f7ee3c85ccb447fdcefa3a366f06cca351b
 SHA512 (eigen2/2.0.17.tar.bz2) = 8fa0e4507864f61c30de14e3b29d963eb8b777d1a6bb04192d53e1f4c9db323b9fab2ddcedb63bf2af243fe0e26dcd717e97eb72216b6a1d444e455520192c72
 Size (eigen2/2.0.17.tar.bz2) = 367890 bytes
+SHA1 (patch-Eigen_src_Sparse_AmbiVector.h) = 0f98d635b975c67c92a02078fa563759566513df
diff -r 957af8d7cd21 -r 46221fca6d37 math/eigen2/patches/patch-Eigen_src_Sparse_AmbiVector.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/eigen2/patches/patch-Eigen_src_Sparse_AmbiVector.h   Mon Sep 09 12:05:01 2019 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-Eigen_src_Sparse_AmbiVector.h,v 1.1 2019/09/09 12:05:01 maya Exp $
+
+We're returning an int, so match prototype.
+
+--- Eigen/src/Sparse/AmbiVector.h.orig 2019-09-09 11:56:26.894097747 +0000
++++ Eigen/src/Sparse/AmbiVector.h
+@@ -44,7 +44,7 @@ template<typename _Scalar> class AmbiVec
+     void init(RealScalar estimatedDensity);
+     void init(int mode);
+ 
+-    void nonZeros() const;
++    int nonZeros() const;
+ 
+     /** Specifies a sub-vector to work on */
+     void setBounds(int start, int end) { m_start = start; m_end = end; }
+@@ -133,7 +133,7 @@ template<typename _Scalar> class AmbiVec
+ 
+ /** \returns the number of non zeros in the current sub vector */
+ template<typename Scalar>
+-void AmbiVector<Scalar>::nonZeros() const
++int AmbiVector<Scalar>::nonZeros() const
+ {
+   if (m_mode==IsSparse)
+     return m_llSize;