The patch is attached. Thanks,
Anton
From c13429b0918fa098c50aad8d6b8a2c77779e95e9 Mon Sep 17 00:00:00 2001 From: Anton Gladky <gladky.an...@gmail.com> Date: Sun, 13 Oct 2013 00:54:03 +0200 Subject: [PATCH] Replace libeigen2-dev by libeigen3-dev. --- debian/control | 2 +- debian/patches/01_replace_eigen2_by_eigen3.patch | 104 +++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 debian/patches/01_replace_eigen2_by_eigen3.patch create mode 100644 debian/patches/series diff --git a/debian/control b/debian/control index ababbf7..f1dc0d0 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Eshat Cakar <i...@eshat.de>, Build-Depends: kde-sc-dev-latest (>= 4:4.10), cmake, debhelper (>= 9), pkg-kde-tools (>= 0.12), kdelibs5-dev (>= 4:4.10), - libeigen2-dev (>= 2.0.3), + libeigen3-dev (>= 2.0.3), libglib2.0-dev, libgsl0-dev, libqalculate-dev, diff --git a/debian/patches/01_replace_eigen2_by_eigen3.patch b/debian/patches/01_replace_eigen2_by_eigen3.patch new file mode 100644 index 0000000..22ee315 --- /dev/null +++ b/debian/patches/01_replace_eigen2_by_eigen3.patch @@ -0,0 +1,104 @@ +Description: replace libeigen2-dev by libeigen3-dev +Author: Anton Gladky <gl...@debian.org> +Bug-Debian: http://bugs.debian.org/726162 +Last-Update: 2013-10-13 + +--- 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" "") + +--- /dev/null ++++ b/cmake/modules/FindEigen3.cmake +@@ -0,0 +1,80 @@ ++# - Try to find Eigen3 lib ++# ++# This module supports requiring a minimum version, e.g. you can do ++# find_package(Eigen3 3.1.2) ++# to require version 3.1.2 or newer of Eigen3. ++# ++# Once done this will define ++# ++# EIGEN3_FOUND - system has eigen lib with correct version ++# EIGEN3_INCLUDE_DIR - the eigen include directory ++# EIGEN3_VERSION - eigen version ++ ++# Copyright (c) 2006, 2007 Montel Laurent, <mon...@kde.org> ++# Copyright (c) 2008, 2009 Gael Guennebaud, <g.g...@free.fr> ++# Copyright (c) 2009 Benoit Jacob <jacob.benoi...@gmail.com> ++# Redistribution and use is allowed according to the terms of the 2-clause BSD license. ++ ++if(NOT Eigen3_FIND_VERSION) ++ if(NOT Eigen3_FIND_VERSION_MAJOR) ++ set(Eigen3_FIND_VERSION_MAJOR 2) ++ endif(NOT Eigen3_FIND_VERSION_MAJOR) ++ if(NOT Eigen3_FIND_VERSION_MINOR) ++ set(Eigen3_FIND_VERSION_MINOR 91) ++ endif(NOT Eigen3_FIND_VERSION_MINOR) ++ if(NOT Eigen3_FIND_VERSION_PATCH) ++ set(Eigen3_FIND_VERSION_PATCH 0) ++ endif(NOT Eigen3_FIND_VERSION_PATCH) ++ ++ set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}") ++endif(NOT Eigen3_FIND_VERSION) ++ ++macro(_eigen3_check_version) ++ file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header) ++ ++ string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}") ++ set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}") ++ string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}") ++ set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}") ++ string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}") ++ set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}") ++ ++ set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION}) ++ if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) ++ set(EIGEN3_VERSION_OK FALSE) ++ else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) ++ set(EIGEN3_VERSION_OK TRUE) ++ endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) ++ ++ if(NOT EIGEN3_VERSION_OK) ++ ++ message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, " ++ "but at least version ${Eigen3_FIND_VERSION} is required") ++ endif(NOT EIGEN3_VERSION_OK) ++endmacro(_eigen3_check_version) ++ ++if (EIGEN3_INCLUDE_DIR) ++ ++ # in cache already ++ _eigen3_check_version() ++ set(EIGEN3_FOUND ${EIGEN3_VERSION_OK}) ++ ++else (EIGEN3_INCLUDE_DIR) ++ ++ find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library ++ PATHS ++ ${CMAKE_INSTALL_PREFIX}/include ++ ${KDE4_INCLUDE_DIR} ++ PATH_SUFFIXES eigen3 eigen ++ ) ++ ++ if(EIGEN3_INCLUDE_DIR) ++ _eigen3_check_version() ++ endif(EIGEN3_INCLUDE_DIR) ++ ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK) ++ ++ mark_as_advanced(EIGEN3_INCLUDE_DIR) ++ ++endif(EIGEN3_INCLUDE_DIR) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..bfcf193 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01_replace_eigen2_by_eigen3.patch -- 1.8.4.rc3
signature.asc
Description: OpenPGP digital signature
