From 9602be9c3913fc5a732850c41f7cf3dc6782108a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Nov 05 2015 16:27:01 +0000 Subject: Update to 3.2.7 --- diff --git a/.gitignore b/.gitignore index ba310ac..b6fce6b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /eigen-3.2.4.tar.bz2 /eigen-3.2.5.tar.bz2 /eigen-3.2.6.tar.bz2 +/eigen-3.2.7.tar.bz2 diff --git a/eigen-3.2.3_suitesparse.patch b/eigen-3.2.3_suitesparse.patch deleted file mode 100644 index d36c854..0000000 --- a/eigen-3.2.3_suitesparse.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -rupN eigen-eigen-36fd1ba04c12/Eigen/src/CholmodSupport/CholmodSupport.h eigen-eigen-36fd1ba04c12-new/Eigen/src/CholmodSupport/CholmodSupport.h ---- eigen-eigen-36fd1ba04c12/Eigen/src/CholmodSupport/CholmodSupport.h 2014-12-16 18:30:52.000000000 +0100 -+++ eigen-eigen-36fd1ba04c12-new/Eigen/src/CholmodSupport/CholmodSupport.h 2014-12-17 23:35:28.080925651 +0100 -@@ -78,7 +78,7 @@ cholmod_sparse viewAsCholmod(SparseMatri - { - res.itype = CHOLMOD_INT; - } -- else if (internal::is_same<_Index,UF_long>::value) -+ else if (internal::is_same<_Index,SuiteSparse_long>::value) - { - res.itype = CHOLMOD_LONG; - } -diff -rupN eigen-eigen-36fd1ba04c12/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h eigen-eigen-36fd1ba04c12-new/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h ---- eigen-eigen-36fd1ba04c12/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h 2014-12-16 18:30:52.000000000 +0100 -+++ eigen-eigen-36fd1ba04c12-new/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h 2014-12-17 23:35:28.063925342 +0100 -@@ -47,7 +47,7 @@ namespace Eigen { - * You can then apply it to a vector. - * - * R is the sparse triangular factor. Use matrixQR() to get it as SparseMatrix. -- * NOTE : The Index type of R is always UF_long. You can get it with SPQR::Index -+ * NOTE : The Index type of R is always SuiteSparse_long. You can get it with SPQR::Index - * - * \tparam _MatrixType The type of the sparse matrix A, must be a column-major SparseMatrix<> - * NOTE -@@ -59,7 +59,7 @@ class SPQR - public: - typedef typename _MatrixType::Scalar Scalar; - typedef typename _MatrixType::RealScalar RealScalar; -- typedef UF_long Index ; -+ typedef SuiteSparse_long Index ; - typedef SparseMatrix MatrixType; - typedef PermutationMatrix PermutationType; - public: diff --git a/mingw-eigen3.spec b/mingw-eigen3.spec index a9b5ba5..d590930 100644 --- a/mingw-eigen3.spec +++ b/mingw-eigen3.spec @@ -1,10 +1,10 @@ %{?mingw_package_header} %global mingw_pkg_name eigen3 -%global commit c58038c56923 +%global commit b30b87236a1b Name: mingw-%{mingw_pkg_name} -Version: 3.2.6 +Version: 3.2.7 Release: 1%{?dist} Summary: MinGW lightweight C++ template library for vector and matrix math BuildArch: noarch @@ -21,8 +21,6 @@ Source1: TryRunResults.cmake Patch0: eigen3_mingw.patch # Workaround for gcc bug 58087 Patch1: eigen-3.2_gcc58087.patch -# Don't use deprecated UF_long -Patch2: eigen-3.2.3_suitesparse.patch BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc-c++ @@ -62,7 +60,6 @@ Summary: %{summary} %setup -q -n eigen-eigen-%{commit} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build @@ -87,6 +84,9 @@ Summary: %{summary} %changelog +* Thu Nov 05 2015 Sandro Mani - 3.2.7-1 +- Update to release 3.2.7 + * Thu Oct 01 2015 Sandro Mani - 3.2.6-1 - Update to release 3.2.6 diff --git a/sources b/sources index 1cdc1c1..65d2681 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87274966745d2d3e7964fcc654d0a24b eigen-3.2.6.tar.bz2 +cc1bacbad97558b97da6b77c9644f184 eigen-3.2.7.tar.bz2