[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-14-g819816b

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 819816b530f9adf12bbb7772a7e931addf2bb24b
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Oct 17 09:19:52 2014 +0200

    New patch: upstream_review_120609_pixmapcachesheetview_crash, thanks to Philip Van Hoof.
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 +
 ...stream_review_120609_pixmapcachesheetview_crash | 22 ++++++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 40cc925..602630f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ calligra (1:2.8.6+dfsg-1) UNRELEASED; urgency=medium
 
   [ Maximiliano Curia ]
   * Update homepage links. (Closes: #762305) Thanks to Julian Gilbey
+  * New patch: upstream_review_120609_pixmapcachesheetview_crash, thanks
+    to Philip Van Hoof.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 14 Sep 2014 19:03:51 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 86d9466..5d4c998 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ switch-to-librevenge-based-import-libs.patch
 filter_registry_not_a_singleton
 channelFlags_logic_change
 do_not_install_removed_files
+upstream_review_120609_pixmapcachesheetview_crash
diff --git a/debian/patches/upstream_review_120609_pixmapcachesheetview_crash b/debian/patches/upstream_review_120609_pixmapcachesheetview_crash
new file mode 100644
index 0000000..5f6acc8
--- /dev/null
+++ b/debian/patches/upstream_review_120609_pixmapcachesheetview_crash
@@ -0,0 +1,22 @@
+Index: calligra/sheets/part/CanvasItem.cpp
+===================================================================
+--- calligra.orig/sheets/part/CanvasItem.cpp	2014-10-14 21:19:10.304165749 +0200
++++ calligra/sheets/part/CanvasItem.cpp	2014-10-17 09:17:45.982989230 +0200
+@@ -121,7 +121,7 @@
+ // ui
+ #include "ui/CellView.h"
+ #include "ui/Selection.h"
+-#include "ui/PixmapCachingSheetView.h"
++#include "ui/SheetView.h"
+ #include "ui/RightToLeftPaintingStrategy.h"
+ 
+ #define MIN_SIZE 10
+@@ -269,7 +269,7 @@
+ {
+     if (!d->sheetViews.contains(sheet)) {
+         kDebug(36004) << "Creating SheetView for" << sheet->sheetName();
+-        d->sheetViews.insert(sheet, new PixmapCachingSheetView(sheet));
++        d->sheetViews.insert(sheet, new SheetView(sheet));
+         d->sheetViews[ sheet ]->setViewConverter(zoomHandler());
+         connect(d->sheetViews[ sheet ], SIGNAL(visibleSizeChanged(QSizeF)),
+                 this, SLOT(setDocumentSize(QSizeF)));

-- 
Calligra suite packaging