[SCM] Calligra suite packaging branch, experimental, updated. debian/2.7.5-1-16-g0d05992
Adrien Grellier
adrien-guest at moszumanska.debian.org
Sat Dec 28 17:40:11 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=e4a3d3a
The following commit has been merged in the experimental branch:
commit e4a3d3a36f32180f05733c2f9d68ae1fcf6af326
Author: Maximiliano Curia <maxy at debian.org>
Date: Mon Dec 2 15:11:51 2013 +0100
Migrate from eigen2 to eigen3, thanks to Anton Gladky. (Closes: #726643)
---
debian/changelog | 3 +
debian/control | 2 +-
debian/patches/eigen3.patch | 268 ++++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 273 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index becb59a..b6c4f09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ calligra (1:2.7.5-1) UNRELEASED; urgency=low
* Specify the required version for libkactivities-dev.
* Update watch file to look for .xz extension too.
+ [ Maximiliano Curia ]
+ * Migrate from eigen2 to eigen3, thanks to Anton Gladky. (Closes: #726643)
+
-- Maximiliano Curia <maxy at debian.org> Wed, 27 Nov 2013 10:20:58 +0100
calligra (1:2.6.4-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 8277e2b..35eddfa 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9), cmake (>= 2.6.2), pkg-kde-tools (>= 0.9),
kdepimlibs5-dev (>= 4:4.4.3),
libattica-dev,
libboost-dev,
- libeigen2-dev (>= 2.0~beta6),
+ libeigen3-dev (>= 2.0~beta6),
libexiv2-dev,
libfftw3-dev,
libglew-dev,
diff --git a/debian/patches/eigen3.patch b/debian/patches/eigen3.patch
new file mode 100644
index 0000000..70ad10d
--- /dev/null
+++ b/debian/patches/eigen3.patch
@@ -0,0 +1,268 @@
+Description: mirgate from eigen2 to eigen3
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: http://bugs.debian.org/726643
+Last-Update: 2013-10-17
+
+Index: calligra-2.7.5/CMakeLists.txt
+===================================================================
+--- calligra-2.7.5.orig/CMakeLists.txt 2013-12-02 15:00:26.989520734 +0100
++++ calligra-2.7.5/CMakeLists.txt 2013-12-02 15:02:12.476765727 +0100
+@@ -391,10 +391,10 @@
+
+
+ ##
+-## Test for eigen2
++## Test for eigen3
+ ##
+-macro_optional_find_package(Eigen2)
+-macro_log_feature(EIGEN2_FOUND "Eigen" "C++ template library for linear algebra" "http://eigen.tuxfamily.org" FALSE "2.0" "Required by Calligra Sheets and Krita")
++macro_optional_find_package(Eigen3)
++macro_log_feature(EIGEN3_FOUND "Eigen" "C++ template library for linear algebra" "http://eigen.tuxfamily.org" FALSE "3.0" "Required by Calligra Sheets and Krita")
+
+ ##
+ ## Test for QCA2
+@@ -816,13 +816,13 @@
+ calligra_disable_product(LIB_MSOOXML "SharedMimeInfo not found (needed to install mimetypes)")
+ endif(NOT SHARED_MIME_INFO_FOUND)
+
+-if(NOT EIGEN2_FOUND)
++if(NOT EIGEN3_FOUND)
+ calligra_disable_product(SHEETS_PART "Eigen devel not found")
+-endif(NOT EIGEN2_FOUND)
++endif(NOT EIGEN3_FOUND)
+
+-if(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
+- calligra_disable_product(KRITA "SharedMimeInfo|libeigen2|libexiv2|lcms devel not found ")
+-endif(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
++if(NOT EIGEN3_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
++ calligra_disable_product(KRITA "SharedMimeInfo|libeigen3|libexiv2|lcms devel not found ")
++endif(NOT EIGEN3_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
+
+ if (NOT ${QTVERSION} VERSION_GREATER 4.7.0)
+ calligra_disable_product(ACTIVE "Qt version <= 4.7.0")
+Index: calligra-2.7.5/cmake/modules/FindEigen3.cmake
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ calligra-2.7.5/cmake/modules/FindEigen3.cmake 2013-12-02 15:00:26.973521458 +0100
+@@ -0,0 +1,81 @@
++# - 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, <montel at kde.org>
++# Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael at free.fr>
++# Copyright (c) 2009 Benoit Jacob <jacob.benoit.1 at 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[ ]+EIGEN_WORLD_VERSION[ ]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
++ set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
++ string(REGEX MATCH "define[ ]+EIGEN_MAJOR_VERSION[ ]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}")
++ set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}")
++ string(REGEX MATCH "define[ ]+EIGEN_MINOR_VERSION[ ]+([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)
++
+Index: calligra-2.7.5/krita/CMakeLists.txt
+===================================================================
+--- calligra-2.7.5.orig/krita/CMakeLists.txt 2013-12-02 15:00:26.989520734 +0100
++++ calligra-2.7.5/krita/CMakeLists.txt 2013-12-02 15:03:28.341369494 +0100
+@@ -89,7 +89,7 @@
+ ${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets
+ ${CMAKE_SOURCE_DIR}/libs/widgetutils
+
+- ${EIGEN2_INCLUDE_DIR}
++ ${EIGEN3_INCLUDE_DIR}
+
+ # 'Export' this for use by filters
+ CACHE INTERNAL ""
+Index: calligra-2.7.5/krita/image/kis_perspective_math.cpp
+===================================================================
+--- calligra-2.7.5.orig/krita/image/kis_perspective_math.cpp 2013-12-02 15:00:26.989520734 +0100
++++ calligra-2.7.5/krita/image/kis_perspective_math.cpp 2013-12-02 15:00:26.973521458 +0100
+@@ -86,7 +86,7 @@
+ b.coeffRef(8) = 1;
+ // dbgImage <<" a := { {" << a(0,0) <<" ," << a(0,1) <<" ," << a(0,2) <<" ," << a(0,3) <<" ," << a(0,4) <<" ," << a(0,5) <<" ," << a(0,6) <<" ," << a(0,7) <<" ," << a(0,8) <<" } , {" << a(1,0) <<" ," << a(1,1) <<" ," << a(1,2) <<" ," << a(1,3) <<" ," << a(1,4) <<" ," << a(1,5) <<" ," << a(1,6) <<" ," << a(1,7) <<" ," << a(1,8) <<" } , {" << a(2,0) <<" ," << a(2,1) <<" ," << a(2,2) <<" ," << a(2,3) <<" ," << a(2,4) <<" ," << a(2,5) <<" ," << a(2,6) <<" ," << a(2,7) <<" ," << a(2,8) <<" } , {" << a(3,0) <<" ," << a(3,1) <<" ," << a(3,2) <<" ," << a(3,3) <<" ," << a(3,4) <<" ," << a(3,5) <<" ," << a(3,6) <<" ," << a(3,7) <<" ," << a(3,8) <<" } , {" << a(4,0) <<" ," << a(4,1) <<" ," << a(4,2) <<" ," << a(4,3) <<" ," << a(4,4) <<" ," << a(4,5) <<" ," << a(4,6) <<" ," << a(4,7) <<" ," << a(4,8) <<" } , {" << a(5,0) <<" ," << a(5,1) <<" ," << a(5,2) <<" ," << a(5,3) <<" ," << a(5,4) <<" ," << a(5,5) <<" ," << a(5,6) <<" ," << a(5,7) <<" ," << a(5,8) <<" } , {" << a(6,0) <<" ," << a(6,1) <<" ," << a(6,2) <<" ," << a(6,3) <<" ," << a(6,4) <<" ," << a(6,5) <<" ," << a(6,6) <<" ," << a(6,7) <<" ," << a(6,8) <<" } , {"<< a(7,0) <<" ," << a(7,1) <<" ," << a(7,2) <<" ," << a(7,3) <<" ," << a(7,4) <<" ," << a(7,5) <<" ," << a(7,6) <<" ," << a(7,7) <<" ," << a(7,8) <<" } , {"<< a(8,0) <<" ," << a(8,1) <<" ," << a(8,2) <<" ," << a(8,3) <<" ," << a(8,4) <<" ," << a(8,5) <<" ," << a(8,6) <<" ," << a(8,7) <<" ," << a(8,8) <<" } };";
+ Vector9qreal v;
+- a.lu().solve(b, &v);
++ v = a.lu().solve(b);
+ Matrix3qreal matrix;
+ for (int r = 0; r < 3; r++) for (int c = 0; c < 3; c++) matrix.coeffRef(r, c) = v.coeff(3 * r + c);
+ return matrix;
+Index: calligra-2.7.5/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp
+===================================================================
+--- calligra-2.7.5.orig/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp 2013-12-02 15:00:26.989520734 +0100
++++ calligra-2.7.5/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp 2013-12-02 15:00:26.973521458 +0100
+@@ -21,7 +21,7 @@
+ #include <QMouseEvent>
+
+ #include <Eigen/Core>
+-USING_PART_OF_NAMESPACE_EIGEN
++using namespace Eigen;
+ #include <cmath>
+
+ #include "KoColor.h"
+Index: calligra-2.7.5/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp
+===================================================================
+--- calligra-2.7.5.orig/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp 2013-12-02 15:00:26.989520734 +0100
++++ calligra-2.7.5/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp 2013-12-02 15:00:26.973521458 +0100
+@@ -21,7 +21,7 @@
+ #include <QMouseEvent>
+
+ #include <Eigen/Core>
+-USING_PART_OF_NAMESPACE_EIGEN
++using namespace Eigen;
+ #include <cmath>
+
+ #include "KoColor.h"
+Index: calligra-2.7.5/krita/plugins/paintops/libbrush/CMakeLists.txt
+===================================================================
+--- calligra-2.7.5.orig/krita/plugins/paintops/libbrush/CMakeLists.txt 2013-12-02 15:00:26.989520734 +0100
++++ calligra-2.7.5/krita/plugins/paintops/libbrush/CMakeLists.txt 2013-12-02 15:09:37.728550266 +0100
+@@ -1,5 +1,6 @@
+ add_subdirectory( tests )
+
++add_definitions( -DEIGEN3_SUPPORT )
+ set(kritalibbrush_LIB_SRCS
+ kis_auto_brush.cpp
+ kis_boundary.cc
+Index: calligra-2.7.5/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc
+===================================================================
+--- calligra-2.7.5.orig/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc 2013-12-02 15:00:26.989520734 +0100
++++ calligra-2.7.5/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc 2013-12-02 15:00:26.973521458 +0100
+@@ -33,7 +33,7 @@
+ #include <KoCompositeOp.h>
+
+ #include <Eigen/Core>
+-USING_PART_OF_NAMESPACE_EIGEN
++using namespace Eigen;
+
+ #include "kis_cursor.h"
+ #include "kis_canvas2.h"
+Index: calligra-2.7.5/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h
+===================================================================
+--- calligra-2.7.5.orig/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h 2013-12-02 15:00:26.989520734 +0100
++++ calligra-2.7.5/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h 2013-12-02 15:00:26.973521458 +0100
+@@ -42,7 +42,7 @@
+ }
+
+ #include <Eigen/Core>
+-USING_PART_OF_NAMESPACE_EIGEN
++using namespace Eigen;
+
+ typedef Eigen::Matrix3d FilterMatrix;
+
+Index: calligra-2.7.5/sheets/CMakeLists.txt
+===================================================================
+--- calligra-2.7.5.orig/sheets/CMakeLists.txt 2013-12-02 15:00:26.989520734 +0100
++++ calligra-2.7.5/sheets/CMakeLists.txt 2013-12-02 15:00:26.973521458 +0100
+@@ -5,7 +5,7 @@
+ ${KOTEXT_INCLUDES}
+ ${TEXTLAYOUT_INCLUDES}
+ ${Boost_INCLUDE_DIR}
+- ${EIGEN2_INCLUDE_DIR} )
++ ${EIGEN3_INCLUDE_DIR} )
+
+ if (SHOULD_BUILD_SHEETS_PART)
+
+Index: calligra-2.7.5/sheets/functions/CMakeLists.txt
+===================================================================
+--- calligra-2.7.5.orig/sheets/functions/CMakeLists.txt 2013-12-02 15:00:26.989520734 +0100
++++ calligra-2.7.5/sheets/functions/CMakeLists.txt 2013-12-02 15:00:26.973521458 +0100
+@@ -1,4 +1,4 @@
+-include_directories(${CMAKE_SOURCE_DIR}/sheets ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${EIGEN2_INCLUDE_DIR})
++include_directories(${CMAKE_SOURCE_DIR}/sheets ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${EIGEN3_INCLUDE_DIR})
+
+
+ ########### next target ###############
+Index: calligra-2.7.5/sheets/functions/math.cpp
+===================================================================
+--- calligra-2.7.5.orig/sheets/functions/math.cpp 2013-12-02 15:00:26.989520734 +0100
++++ calligra-2.7.5/sheets/functions/math.cpp 2013-12-02 15:00:26.973521458 +0100
+@@ -1223,9 +1223,9 @@
+
+ Eigen::MatrixXd eMatrix = convert(matrix, calc),
+ eMatrixInverse(eMatrix.rows(), eMatrix.cols());
+- Eigen::LU<Eigen::MatrixXd> lu(eMatrix);
++ Eigen::FullPivLU<Eigen::MatrixXd> lu(eMatrix);
+ if (lu.isInvertible()) {
+- lu.computeInverse(&eMatrixInverse);
++ eMatrixInverse.inverse();
+ return convert(eMatrixInverse);
+ } else
+ return Value::errorDIV0();
+Index: calligra-2.7.5/sheets/tests/CMakeLists.txt
+===================================================================
+--- calligra-2.7.5.orig/sheets/tests/CMakeLists.txt 2013-11-24 14:09:40.000000000 +0100
++++ calligra-2.7.5/sheets/tests/CMakeLists.txt 2013-12-02 15:09:55.559682460 +0100
+@@ -1,6 +1,6 @@
+ include(MacroAddCompileFlags)
+ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+-include_directories( ${CMAKE_SOURCE_DIR}/sheets ${EIGEN2_INCLUDE_DIR} ${KOMAIN_INCLUDES} ${KDE4_INCLUDES} )
++include_directories( ${CMAKE_SOURCE_DIR}/sheets ${EIGEN3_INCLUDE_DIR} ${KOMAIN_INCLUDES} ${KDE4_INCLUDES} )
+
+ ########### Core Functionality ###############
+
diff --git a/debian/patches/series b/debian/patches/series
index 182fc8a..782512c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
add_keywords_to_desktop_files.patch
+eigen3.patch
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list