[SCM] step packaging branch, master, updated. debian/4.11.3-1-5-g0a63e32

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/step.git;a=commitdiff;h=0a63e32

The following commit has been merged in the master branch:
commit 0a63e325363e0fa3dab6df3e034b2063321385d7
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Jan 18 21:35:01 2014 -0300

    Apply Anton Gladky's patch to use Eigen3.
---
 debian/changelog                              |  1 +
 debian/patches/replace_eigen2_by_eigen3.patch | 75 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 77 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 32f7470..b10bb76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ step (4:4.11.5-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Switch eigen build dependency to libeigen3-dev (Closes: #726162).
+    - Apply Anton Gladky's patch to use Eigen3.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jan 2014 20:51:31 -0300
 
diff --git a/debian/patches/replace_eigen2_by_eigen3.patch b/debian/patches/replace_eigen2_by_eigen3.patch
new file mode 100644
index 0000000..53c2b49
--- /dev/null
+++ b/debian/patches/replace_eigen2_by_eigen3.patch
@@ -0,0 +1,75 @@
+Description: replace libeigen2-dev by libeigen3-dev
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: http://bugs.debian.org/726162
+Last-Update: 2013-12-01
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,11 +9,11 @@
+ 
+ set(CMAKE_MODULE_PATH ${step_SOURCE_DIR}/cmake/modules )
+ 
+-find_package(Eigen2 2.0.3)
++find_package(Eigen3)
+ macro_optional_find_package(GSL)
+ macro_optional_find_package(Qalculate)
+ 
+-macro_log_feature(EIGEN2_FOUND "Eigen2" "Required to build step." "http://eigen.tuxfamily.org" TRUE "2.0.3" "")
++macro_log_feature(EIGEN3_FOUND "Eigen3" "Required to build step." "http://eigen.tuxfamily.org" TRUE "2.0.3" "")
+ macro_log_feature(QALCULATE_FOUND "Qalculate" "Unit conversion support in Step" "http://qalculate.sourceforge.net/" FALSE "0.9.5" "")
+ macro_log_feature(GSL_FOUND "GSL" "Provides a GSL-powered solver for Step" "http://www.gnu.org/software/gsl/" FALSE "1.8" "")
+ 
+@@ -22,8 +22,9 @@
+ set(STEPCORE_WITH_QT ON) # CACHE BOOL "Enable QT-powered features for StepCore")
+ set(STEP_WITH_QALCULATE ${QALCULATE_FOUND} CACHE BOOL "Enable unit conversion support using libqalculate")
+ 
+-if (EIGEN2_FOUND)
+-   include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${EIGEN2_INCLUDE_DIR})
++if (EIGEN3_FOUND)
++   include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${EIGEN3_INCLUDE_DIR})
++   add_definitions( -DEIGEN2_SUPPORT)
+ 
+    add_subdirectory(doc) 
+    add_subdirectory(stepcore)
+@@ -32,7 +33,7 @@
+    if(STEPCORE_TESTS)
+      add_subdirectory(stepcore_tests)
+    endif(STEPCORE_TESTS)
+-endif (EIGEN2_FOUND)
++endif (EIGEN3_FOUND)
+ 
+ if (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
+    macro_display_feature_log()
+--- a/step/propertiesbrowser.cc
++++ b/step/propertiesbrowser.cc
+@@ -389,7 +389,7 @@
+                         if(p->userTypeId() == QMetaType::Double) {
+                             vv = 0;
+                         } else if(p->userTypeId() == qMetaTypeId<StepCore::Vector2d>()) {
+-                            StepCore::Vector2d svv(0);
++                            StepCore::Vector2d svv=StepCore::Vector2d::Zero();
+                             vv = QVariant::fromValue(svv);
+                         /* XXX
+                          * } else if(p->userTypeId() == qMetaTypeId<StepCore::Vector2dList >())
+--- a/stepcore/constraintsolver.cc
++++ b/stepcore/constraintsolver.cc
+@@ -96,7 +96,7 @@
+             ++fmaxIndex;
+         }
+     }    
+-    ei_constrained_cg(a, c, x, b, f, iter);
++    internal::constrained_cg(a, c, x, b, f, iter);
+ 
+     info->force = info->jacobian.transpose() * x;
+ 
+--- a/stepcore/types.h
++++ b/stepcore/types.h
+@@ -34,7 +34,7 @@
+ typedef Eigen::SparseMatrix<double> SparseColMatrix;
+ typedef Eigen::SparseMatrix<double,Eigen::RowMajor> SparseRowMatrix;
+ // a sparse matrix with efficient write facilities
+-typedef Eigen::DynamicSparseMatrix<double,Eigen::RowMajor> DynSparseRowMatrix;
++typedef Eigen::SparseMatrix<double,Eigen::RowMajor> DynSparseRowMatrix;
+ typedef Eigen::Map<Eigen::VectorXd> MappedVector;
+ 
+ ///////////////// Color
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7e0e7d0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+replace_eigen2_by_eigen3.patch

-- 
step packaging