[SCM] Calligra suite packaging branch, experimental, updated. debian/2.7.5-1-37-g7ec8135

Adrien Grellier adrien-guest at moszumanska.debian.org
Mon Mar 3 17:57:18 UTC 2014 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=5446ce0

The following commit has been merged in the experimental branch:
commit 5446ce0deeb19bcfe4d31f97eeafdd2d3f39d63e
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Sat Feb 22 23:38:44 2014 +0100

    Refreshed eigen3.patch
---
 debian/changelog            |   3 +-
 debian/patches/eigen3.patch | 102 +++++++++++++++++---------------------------
 2 files changed, 39 insertions(+), 66 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index acf6c4c..f49353e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,7 @@ calligra (1:2.7.92-0r1) UNRELEASED; urgency=low
   * New upstream release 2.8 beta
 
   [ Raúl Sánchez Siles ]
-  * Added kexidb-relax_pqxx_version.patch to make pqxx driver build with
-    libpqxx >= 0.4
+  * Refreshed eigen3.patch
 
   [ Maximiliano Curia ]
   * Remove obsolete patch: pqxx_4_support.diff
diff --git a/debian/patches/eigen3.patch b/debian/patches/eigen3.patch
index a4cf2e4..42c206b 100644
--- a/debian/patches/eigen3.patch
+++ b/debian/patches/eigen3.patch
@@ -3,11 +3,9 @@ Author: Anton Gladky <gladk at debian.org>
 Bug-Debian: http://bugs.debian.org/726643
 Last-Update: 2013-10-17
 
-Index: calligra/CMakeLists.txt
-===================================================================
---- 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 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -421,10 +421,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)")
  
  ##
@@ -21,7 +19,7 @@ Index: calligra/CMakeLists.txt
  
  ##
  ## Test for QCA2
-@@ -884,13 +884,13 @@
+@@ -931,13 +931,13 @@
      calligra_disable_product(RDF "Soprano not found")
  endif(NOT Soprano_FOUND)
  
@@ -31,19 +29,17 @@ 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 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-26 19:22:14.000000000 +0100
+-if(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
+-    calligra_disable_product(KRITA_APP "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_APP "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 APPLE AND NOT REQUIRED_Xinput_FOUND)
+     calligra_disable_product(KRITA_APP "Xinput devel not found ")
+--- /dev/null
++++ b/cmake/modules/FindEigen3.cmake
 @@ -0,0 +1,81 @@
 +# - Try to find Eigen3 lib
 +#
@@ -126,10 +122,8 @@ Index: calligra/cmake/modules/FindEigen3.cmake
 +
 +endif(EIGEN3_INCLUDE_DIR)
 +
-Index: calligra/krita/image/kis_perspective_math.cpp
-===================================================================
---- 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
+--- a/krita/image/kis_perspective_math.cpp
++++ b/krita/image/kis_perspective_math.cpp
 @@ -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) <<" } };";
@@ -139,10 +133,8 @@ Index: calligra/krita/image/kis_perspective_math.cpp
      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/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp
-===================================================================
---- 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
+--- a/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp
++++ b/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp
 @@ -21,7 +21,7 @@
  #include <QMouseEvent>
  
@@ -152,10 +144,8 @@ Index: calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color
  #include <cmath>
  
  #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-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
+--- a/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp
++++ b/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_triangle.cpp
 @@ -21,7 +21,7 @@
  #include <QMouseEvent>
  
@@ -165,10 +155,8 @@ Index: calligra/krita/plugins/extensions/dockers/advancedcolorselector/kis_color
  #include <cmath>
          
  #include "KoColor.h"
-Index: calligra/krita/plugins/paintops/libbrush/CMakeLists.txt
-===================================================================
---- 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
+--- a/krita/plugins/paintops/libbrush/CMakeLists.txt
++++ b/krita/plugins/paintops/libbrush/CMakeLists.txt
 @@ -1,5 +1,6 @@
  add_subdirectory( tests )
  
@@ -176,10 +164,8 @@ Index: calligra/krita/plugins/paintops/libbrush/CMakeLists.txt
  set(kritalibbrush_LIB_SRCS
      kis_predefined_brush_factory.cpp
      kis_auto_brush.cpp
-Index: calligra/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc
-===================================================================
---- 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
+--- a/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc
++++ b/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc
 @@ -35,7 +35,7 @@
  #include <KoCompositeOp.h>
  
@@ -189,10 +175,8 @@ Index: calligra/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc
  
  #include "kis_cursor.h"
  #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-26 19:22:10.000000000 +0100
-+++ calligra/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h	2013-12-26 19:22:14.000000000 +0100
+--- a/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h
++++ b/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h
 @@ -42,7 +42,7 @@
  }
  
@@ -202,10 +186,8 @@ Index: calligra/krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h
  
  typedef Eigen::Matrix3d FilterMatrix;
  
-Index: calligra/sheets/CMakeLists.txt
-===================================================================
---- 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
+--- a/sheets/CMakeLists.txt
++++ b/sheets/CMakeLists.txt
 @@ -5,7 +5,7 @@
                      ${KOTEXT_INCLUDES}
                      ${TEXTLAYOUT_INCLUDES}
@@ -215,20 +197,16 @@ Index: calligra/sheets/CMakeLists.txt
  
  if (SHOULD_BUILD_SHEETS_PART)
  
-Index: calligra/sheets/functions/CMakeLists.txt
-===================================================================
---- 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
+--- a/sheets/functions/CMakeLists.txt
++++ b/sheets/functions/CMakeLists.txt
 @@ -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/sheets/functions/math.cpp
-===================================================================
---- 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
+--- a/sheets/functions/math.cpp
++++ b/sheets/functions/math.cpp
 @@ -1228,9 +1228,9 @@
  
      Eigen::MatrixXd eMatrix = convert(matrix, calc),
@@ -241,10 +219,8 @@ Index: calligra/sheets/functions/math.cpp
          return convert(eMatrixInverse);
      } else
          return Value::errorDIV0();
-Index: calligra/sheets/tests/CMakeLists.txt
-===================================================================
---- 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
+--- a/sheets/tests/CMakeLists.txt
++++ b/sheets/tests/CMakeLists.txt
 @@ -1,6 +1,6 @@
  include(MacroAddCompileFlags)
  set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
@@ -253,11 +229,9 @@ Index: calligra/sheets/tests/CMakeLists.txt
  
  ########### Core Functionality ###############
  
-Index: calligra/krita/CMakeLists.txt
-===================================================================
---- 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 @@
+--- a/krita/CMakeLists.txt
++++ b/krita/CMakeLists.txt
+@@ -104,7 +104,7 @@
      ${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets
      ${CMAKE_SOURCE_DIR}/libs/widgetutils
  

-- 
Calligra suite packaging

More information about the pkg-kde-commits mailing list