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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 43fa4409a16ff15cdd85d207fea5c72e2a528196
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Jul 12 18:48:31 2014 +0200

    New patch: channelFlags_logic_change
---
 debian/changelog                         |  1 +
 debian/patches/channelFlags_logic_change | 26 ++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f746e74..488c6c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,7 @@ calligra (1:2.8.5-1) UNRELEASED; urgency=medium
   * Refresh patches for 2.8.5.
   * New patch: kisjpegtest_call_kisexiv2_initialize
   * New patch: filter_registry_not_a_singleton
+  * New patch: channelFlags_logic_change
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 04 Jul 2014 10:46:34 +0200
 
diff --git a/debian/patches/channelFlags_logic_change b/debian/patches/channelFlags_logic_change
new file mode 100644
index 0000000..5fa4e4d
--- /dev/null
+++ b/debian/patches/channelFlags_logic_change
@@ -0,0 +1,26 @@
+Index: calligra/krita/image/tests/kis_layer_test.cpp
+===================================================================
+--- calligra.orig/krita/image/tests/kis_layer_test.cpp	2014-07-12 18:40:22.912145877 +0200
++++ calligra/krita/image/tests/kis_layer_test.cpp	2014-07-12 18:47:50.727436635 +0200
+@@ -63,11 +63,16 @@
+     QBitArray channels(4);
+     channels.fill(true);
+     layer->setChannelFlags(channels);
+-    QVERIFY(layer->channelFlags().count() == 4);
+-    QCOMPARE(layer->channelFlags().at(0), true);
+-    QCOMPARE(layer->channelFlags().at(1), true);
+-    QCOMPARE(layer->channelFlags().at(2), true);
+-    QCOMPARE(layer->channelFlags().at(3), true);
++    QBitArray layerChannelFlags = layer->channelFlags();
++    if (layerChannelFlags.isEmpty()) {
++        layerChannelFlags =
++            QBitArray(layer->colorSpace()->channelCount(), true);
++    }
++    QVERIFY(layerChannelFlags.count() == 4);
++    QCOMPARE(layerChannelFlags.at(0), true);
++    QCOMPARE(layerChannelFlags.at(1), true);
++    QCOMPARE(layerChannelFlags.at(2), true);
++    QCOMPARE(layerChannelFlags.at(3), true);
+ 
+ 
+     layer->setOpacity(OPACITY_TRANSPARENT_U8);
diff --git a/debian/patches/series b/debian/patches/series
index 587e3c2..2880923 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ temporarily_disable_failing_tests
 calligra_imports_search_path
 kisjpegtest_call_kisexiv2_initialize
 filter_registry_not_a_singleton
+channelFlags_logic_change

-- 
Calligra suite packaging