[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-16-g0d05992
Adrien Grellier
adrien-guest at moszumanska.debian.org
Sat Dec 28 17:40:16 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=fe8d83e
The following commit has been merged in the master branch:
commit fe8d83eae63b74c10a049d93c28e3ec0e6a53e3e
Author: Adrien Grellier <perso at adrieng.fr>
Date: Sat Dec 28 18:37:24 2013 +0100
refresh eigen3.patch for calligra 2.8
---
debian/changelog | 1 +
debian/patches/eigen3.patch | 125 +++++++++++++++++---------------------------
2 files changed, 48 insertions(+), 78 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 64995c3..6da2552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ calligra (1:2.7.90-0r1) UNRELEASED; urgency=low
[ Adrien Grellier ]
* new dependency for krita: libxi-dev
* refresh add_keywords_to_desktop_files.patch to work with 2.8
+ * refresh eigen3.patch to work with 2.8
[ Pino Toscano ]
* Add the pkg-config build dependency.
diff --git a/debian/patches/eigen3.patch b/debian/patches/eigen3.patch
index 52fb814..a4cf2e4 100644
--- a/debian/patches/eigen3.patch
+++ b/debian/patches/eigen3.patch
@@ -5,10 +5,10 @@ Last-Update: 2013-10-17
Index: calligra/CMakeLists.txt
===================================================================
---- calligra.orig/CMakeLists.txt 2013-12-03 09:29:50.677176948 +0100
-+++ calligra/CMakeLists.txt 2013-12-03 09:29:50.673177105 +0100
-@@ -391,10 +391,10 @@
-
+--- calligra.orig/CMakeLists.txt 2013-12-26 19:22:10.000000000 +0100
++++ calligra/CMakeLists.txt 2013-12-27 13:51:15.161592013 +0100
+@@ -413,10 +413,10 @@
+ macro_log_feature(KDEPIMLIBS_FOUND "KDE PIMLibs" "KDE Personal Information Management Libraries" "http://www.kde.org/" FALSE "" "Required by Plan and the KDE address book integration (available as a module in KDE)")
##
-## Test for eigen2
@@ -21,9 +21,9 @@ Index: calligra/CMakeLists.txt
##
## 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)
+@@ -884,13 +884,13 @@
+ calligra_disable_product(RDF "Soprano not found")
+ endif(NOT Soprano_FOUND)
-if(NOT EIGEN2_FOUND)
+if(NOT EIGEN3_FOUND)
@@ -31,19 +31,19 @@ Index: calligra/CMakeLists.txt
-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 EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND OR NOT REQUIRED_Xinput_FOUND)
+- calligra_disable_product(KRITA_APP "SharedMimeInfo|libeigen2|libexiv2|lcms|Xinput devel not found ")
+-endif(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND OR NOT REQUIRED_Xinput_FOUND)
++if(NOT EIGEN3_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND OR NOT REQUIRED_Xinput_FOUND)
++ calligra_disable_product(KRITA_APP "SharedMimeInfo|libeigen3|libexiv2|lcms|Xinput devel not found ")
++endif(NOT EIGEN3_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND OR NOT REQUIRED_Xinput_FOUND)
if (NOT ${QTVERSION} VERSION_GREATER 4.7.0)
calligra_disable_product(ACTIVE "Qt version <= 4.7.0")
Index: calligra/cmake/modules/FindEigen3.cmake
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ calligra/cmake/modules/FindEigen3.cmake 2013-12-03 09:29:50.673177105 +0100
++++ calligra/cmake/modules/FindEigen3.cmake 2013-12-26 19:22:14.000000000 +0100
@@ -0,0 +1,81 @@
+# - Try to find Eigen3 lib
+#
@@ -126,23 +126,10 @@ Index: calligra/cmake/modules/FindEigen3.cmake
+
+endif(EIGEN3_INCLUDE_DIR)
+
-Index: calligra/krita/CMakeLists.txt
-===================================================================
---- calligra.orig/krita/CMakeLists.txt 2013-12-03 09:29:50.677176948 +0100
-+++ calligra/krita/CMakeLists.txt 2013-12-03 09:29:50.677176948 +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/krita/image/kis_perspective_math.cpp
===================================================================
---- calligra.orig/krita/image/kis_perspective_math.cpp 2013-12-03 09:29:50.677176948 +0100
-+++ calligra/krita/image/kis_perspective_math.cpp 2013-12-03 09:29:50.677176948 +0100
+--- calligra.orig/krita/image/kis_perspective_math.cpp 2013-12-26 19:22:10.000000000 +0100
++++ calligra/krita/image/kis_perspective_math.cpp 2013-12-26 19:22:14.000000000 +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) <<" } };";
@@ -154,8 +141,8 @@ Index: calligra/krita/image/kis_perspective_math.cpp
return matrix;
Index: calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp
===================================================================
---- calligra.orig/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp 2013-12-03 09:29:50.677176948 +0100
-+++ calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp 2013-12-03 09:29:50.677176948 +0100
+--- calligra.orig/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp 2013-12-26 19:22:10.000000000 +0100
++++ calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp 2013-12-26 19:22:14.000000000 +0100
@@ -21,7 +21,7 @@
#include <QMouseEvent>
@@ -167,8 +154,8 @@ Index: calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color
#include "KoColor.h"
Index: calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp
===================================================================
---- calligra.orig/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp 2013-12-03 09:29:50.677176948 +0100
-+++ calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp 2013-12-03 09:29:50.677176948 +0100
+--- calligra.orig/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp 2013-12-26 19:22:10.000000000 +0100
++++ calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp 2013-12-26 19:22:14.000000000 +0100
@@ -21,7 +21,7 @@
#include <QMouseEvent>
@@ -180,20 +167,20 @@ Index: calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color
#include "KoColor.h"
Index: calligra/krita/plugins/paintops/libbrush/CMakeLists.txt
===================================================================
---- calligra.orig/krita/plugins/paintops/libbrush/CMakeLists.txt 2013-12-03 09:29:50.677176948 +0100
-+++ calligra/krita/plugins/paintops/libbrush/CMakeLists.txt 2013-12-03 09:29:50.677176948 +0100
+--- calligra.orig/krita/plugins/paintops/libbrush/CMakeLists.txt 2013-12-26 19:22:10.000000000 +0100
++++ calligra/krita/plugins/paintops/libbrush/CMakeLists.txt 2013-12-26 19:22:14.000000000 +0100
@@ -1,5 +1,6 @@
add_subdirectory( tests )
+add_definitions( -DEIGEN3_SUPPORT )
set(kritalibbrush_LIB_SRCS
+ kis_predefined_brush_factory.cpp
kis_auto_brush.cpp
- kis_boundary.cc
Index: calligra/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc
===================================================================
---- calligra.orig/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc 2013-12-03 09:29:50.677176948 +0100
-+++ calligra/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc 2013-12-03 09:29:50.677176948 +0100
-@@ -33,7 +33,7 @@
+--- calligra.orig/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc 2013-12-26 19:22:10.000000000 +0100
++++ calligra/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc 2013-12-26 19:22:14.000000000 +0100
+@@ -35,7 +35,7 @@
#include <KoCompositeOp.h>
#include <Eigen/Core>
@@ -204,8 +191,8 @@ Index: calligra/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc
#include "kis_canvas2.h"
Index: calligra/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h
===================================================================
---- calligra.orig/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h 2013-12-03 09:29:50.677176948 +0100
-+++ calligra/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h 2013-12-03 09:29:50.677176948 +0100
+--- calligra.orig/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h 2013-12-26 19:22:10.000000000 +0100
++++ calligra/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h 2013-12-26 19:22:14.000000000 +0100
@@ -42,7 +42,7 @@
}
@@ -217,8 +204,8 @@ Index: calligra/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h
Index: calligra/sheets/CMakeLists.txt
===================================================================
---- calligra.orig/sheets/CMakeLists.txt 2013-12-03 09:29:50.677176948 +0100
-+++ calligra/sheets/CMakeLists.txt 2013-12-03 09:29:50.677176948 +0100
+--- calligra.orig/sheets/CMakeLists.txt 2013-12-26 19:22:10.000000000 +0100
++++ calligra/sheets/CMakeLists.txt 2013-12-26 19:22:14.000000000 +0100
@@ -5,7 +5,7 @@
${KOTEXT_INCLUDES}
${TEXTLAYOUT_INCLUDES}
@@ -230,8 +217,8 @@ Index: calligra/sheets/CMakeLists.txt
Index: calligra/sheets/functions/CMakeLists.txt
===================================================================
---- calligra.orig/sheets/functions/CMakeLists.txt 2013-12-03 09:29:50.677176948 +0100
-+++ calligra/sheets/functions/CMakeLists.txt 2013-12-03 09:29:50.677176948 +0100
+--- calligra.orig/sheets/functions/CMakeLists.txt 2013-12-26 19:22:10.000000000 +0100
++++ calligra/sheets/functions/CMakeLists.txt 2013-12-26 19:22:14.000000000 +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})
@@ -240,9 +227,9 @@ Index: calligra/sheets/functions/CMakeLists.txt
########### next target ###############
Index: calligra/sheets/functions/math.cpp
===================================================================
---- calligra.orig/sheets/functions/math.cpp 2013-12-03 09:29:50.677176948 +0100
-+++ calligra/sheets/functions/math.cpp 2013-12-03 09:29:50.677176948 +0100
-@@ -1223,9 +1223,9 @@
+--- calligra.orig/sheets/functions/math.cpp 2013-12-26 19:22:10.000000000 +0100
++++ calligra/sheets/functions/math.cpp 2013-12-26 19:22:14.000000000 +0100
+@@ -1228,9 +1228,9 @@
Eigen::MatrixXd eMatrix = convert(matrix, calc),
eMatrixInverse(eMatrix.rows(), eMatrix.cols());
@@ -256,8 +243,8 @@ Index: calligra/sheets/functions/math.cpp
return Value::errorDIV0();
Index: calligra/sheets/tests/CMakeLists.txt
===================================================================
---- calligra.orig/sheets/tests/CMakeLists.txt 2013-12-03 09:29:50.677176948 +0100
-+++ calligra/sheets/tests/CMakeLists.txt 2013-12-03 09:29:50.677176948 +0100
+--- calligra.orig/sheets/tests/CMakeLists.txt 2013-12-26 19:22:10.000000000 +0100
++++ calligra/sheets/tests/CMakeLists.txt 2013-12-26 19:22:14.000000000 +0100
@@ -1,6 +1,6 @@
include(MacroAddCompileFlags)
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
@@ -266,34 +253,16 @@ Index: calligra/sheets/tests/CMakeLists.txt
########### Core Functionality ###############
-Index: calligra/krita/plugins/paintops/libbrush/kis_brush.cpp
+Index: calligra/krita/CMakeLists.txt
===================================================================
---- calligra.orig/krita/plugins/paintops/libbrush/kis_brush.cpp 2013-12-03 09:29:06.514912783 +0100
-+++ calligra/krita/plugins/paintops/libbrush/kis_brush.cpp 2013-12-03 09:32:21.915239005 +0100
-@@ -524,7 +524,7 @@
- outputImage = interpolate(scaledBelowImage, scaledAboveImage, t);
-
- } else {
-- if (Eigen::ei_isApprox(scale, aboveBrush->scale())) {
-+ if (Eigen::internal::isApprox(scale, aboveBrush->scale())) {
- // Exact match.
- outputImage = scaleImage(aboveBrush, scale, subPixelX, subPixelY);
-
-@@ -667,7 +667,7 @@
+--- calligra.orig/krita/CMakeLists.txt 2013-12-26 19:22:10.000000000 +0100
++++ calligra/krita/CMakeLists.txt 2013-12-26 19:22:14.000000000 +0100
+@@ -95,7 +95,7 @@
+ ${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets
+ ${CMAKE_SOURCE_DIR}/libs/widgetutils
- outputMask = scaleMask( (t >= 0.5) ? aboveBrush : belowBrush, scale, subPixelX, subPixelY);
- } else {
-- if (Eigen::ei_isApprox(scale, aboveBrush->scale())) {
-+ if (Eigen::internal::isApprox(scale, aboveBrush->scale())) {
- // Exact match.
- outputMask = scaleMask(aboveBrush, scale, subPixelX, subPixelY);
- } else {
-@@ -1009,7 +1009,7 @@
- while (true) {
- *aboveBrush = &(d->scaledBrushes[current]);
+- ${EIGEN2_INCLUDE_DIR}
++ ${EIGEN3_INCLUDE_DIR}
+ ${Vc_INCLUDE_DIR}
-- if (Eigen::ei_isApprox(scale, (*aboveBrush)->scale())) {
-+ if (Eigen::internal::isApprox(scale, (*aboveBrush)->scale())) {
- // Scale matches exactly
- break;
- }
+ # 'Export' this for use by filters
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list