[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-77-g9ea1bcc

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 2f43e4e7a3d4957f88dcba9b5cf9c25c10ee3aeb
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Jul 4 12:15:46 2014 +0200

    Remove upstream patch: upstream_fix_using_a_transaction_in_the_filter_op.patch
---
 debian/changelog                                   |  1 -
 debian/patches/series                              |  1 -
 ..._fix_using_a_transaction_in_the_filter_op.patch | 34 ----------------------
 3 files changed, 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e48892..95a1090 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,7 +41,6 @@ calligra (1:2.8.5-1) UNRELEASED; urgency=medium
   * New patch: install_images_in_datadir
   * Bump libkdcraw and marble b-d, to help the kde4.12 transition.
   * Refresh patches for 2.8.3.
-  * New patch: upstream_fix_using_a_transaction_in_the_filter_op.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 04 Jul 2014 10:46:34 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index c367cdb..9d4f941 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ eigen3_in_tests
 disable_convolution_failling_tests
 temporarily_disable_failing_tests
 calligra_imports_search_path
-upstream_fix_using_a_transaction_in_the_filter_op.patch
diff --git a/debian/patches/upstream_fix_using_a_transaction_in_the_filter_op.patch b/debian/patches/upstream_fix_using_a_transaction_in_the_filter_op.patch
deleted file mode 100644
index 1f19ab0..0000000
--- a/debian/patches/upstream_fix_using_a_transaction_in_the_filter_op.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 13657911836f1996de6154b305386c3e72944c34
-Author: Dmitry Kazakov <dimula73 at gmail.com>
-Date:   Mon May 5 12:50:00 2014 +0400
-
-    Fix using a transaction in the Filter Op
-    
-    Otherwise the filters like Gaussian Blur and Unsharp Mask will not work
-    correctly.
-    
-    BUG:332130
-
-diff --git a/krita/plugins/paintops/filterop/kis_filterop.cpp b/krita/plugins/paintops/filterop/kis_filterop.cpp
-index c42757a..1c6e413 100644
---- a/krita/plugins/paintops/filterop/kis_filterop.cpp
-+++ b/krita/plugins/paintops/filterop/kis_filterop.cpp
-@@ -45,6 +45,7 @@
- #include <kis_filterop_settings.h>
- #include <kis_iterator_ng.h>
- #include <kis_fixed_paint_device.h>
-+#include <kis_transaction.h>
- 
- KisFilterOp::KisFilterOp(const KisFilterOpSettings *settings, KisPainter *painter, KisImageWSP image)
-     : KisBrushBasedPaintOp(settings, painter)
-@@ -123,7 +124,10 @@ KisSpacingInformation KisFilterOp::paintAt(const KisPaintInformation& info)
-         p.setCompositeOp(COMPOSITE_COPY);
-     }
-     p.bitBltOldData(neededRect.topLeft() - dstRect.topLeft(), source(), neededRect);
-+
-+    KisTransaction transaction("", m_tmpDevice);
-     m_filter->process(m_tmpDevice, dabRect, m_filterConfiguration, 0);
-+    transaction.end();
- 
- 
-     painter()->

-- 
Calligra suite packaging