[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=50c6e6b

The following commit has been merged in the master branch:
commit 50c6e6be19a4b7f7ff954db3e47e953e595939c8
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Jul 11 18:01:19 2014 +0200

    New patch: filter_registry_not_a_singleton
---
 debian/changelog                               |  1 +
 debian/patches/filter_registry_not_a_singleton | 13 +++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b319ffe..f746e74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ calligra (1:2.8.5-1) UNRELEASED; urgency=medium
   * Bump libkdcraw and marble b-d, to help the kde4.12 transition.
   * Refresh patches for 2.8.5.
   * New patch: kisjpegtest_call_kisexiv2_initialize
+  * New patch: filter_registry_not_a_singleton
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 04 Jul 2014 10:46:34 +0200
 
diff --git a/debian/patches/filter_registry_not_a_singleton b/debian/patches/filter_registry_not_a_singleton
new file mode 100644
index 0000000..cd00dbe
--- /dev/null
+++ b/debian/patches/filter_registry_not_a_singleton
@@ -0,0 +1,13 @@
+Index: calligra/krita/image/filter/kis_filter_registry.cc
+===================================================================
+--- calligra.orig/krita/image/filter/kis_filter_registry.cc	2014-07-11 17:55:57.105757838 +0200
++++ calligra/krita/image/filter/kis_filter_registry.cc	2014-07-11 18:00:21.635344917 +0200
+@@ -53,7 +53,7 @@
+ 
+ KisFilterRegistry* KisFilterRegistry::instance()
+ {
+-    KisFilterRegistry *reg = qApp->findChild<KisFilterRegistry *>("");
++    static KisFilterRegistry *reg = qApp->findChild<KisFilterRegistry *>("");
+     if (!reg) {
+         reg = new KisFilterRegistry(qApp);
+         KoPluginLoader::instance()->load("Krita/Filter", "Type == 'Service' and ([X-Krita-Version] == 28)");
diff --git a/debian/patches/series b/debian/patches/series
index 530aa78..587e3c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ disable_convolution_failling_tests
 temporarily_disable_failing_tests
 calligra_imports_search_path
 kisjpegtest_call_kisexiv2_initialize
+filter_registry_not_a_singleton

-- 
Calligra suite packaging