[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=9ea1bcc

The following commit has been merged in the master branch:
commit 9ea1bcc1c3f1d1a703b9bf78dbd0c5f36fd4ba15
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jul 9 11:33:55 2014 +0200

    New patch: kisjpegtest_call_kisexiv2_initialize
---
 debian/changelog                                    |  1 +
 debian/patches/kisjpegtest_call_kisexiv2_initialize | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2577a41..b319ffe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ 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.5.
+  * New patch: kisjpegtest_call_kisexiv2_initialize
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 04 Jul 2014 10:46:34 +0200
 
diff --git a/debian/patches/kisjpegtest_call_kisexiv2_initialize b/debian/patches/kisjpegtest_call_kisexiv2_initialize
new file mode 100644
index 0000000..d50cb2d
--- /dev/null
+++ b/debian/patches/kisjpegtest_call_kisexiv2_initialize
@@ -0,0 +1,21 @@
+Index: calligra/krita/plugins/formats/jpeg/tests/kis_jpeg_test.cpp
+===================================================================
+--- calligra.orig/krita/plugins/formats/jpeg/tests/kis_jpeg_test.cpp	2014-07-09 11:09:39.538991380 +0200
++++ calligra/krita/plugins/formats/jpeg/tests/kis_jpeg_test.cpp	2014-07-09 11:33:12.712150352 +0200
+@@ -27,6 +27,8 @@
+ #include "filestest.h"
+ #include "jpeglib.h"
+ 
++#include "kisexiv2/kis_exiv2.h"
++
+ #ifndef FILES_DATA_DIR
+ #error "FILES_DATA_DIR not set. A directory with the data used for testing the importing of files in krita"
+ #endif
+@@ -37,6 +39,7 @@
+ 
+ void KisJpegTest::testFiles()
+ {
++    KisExiv2::initialize();
+     if (JPEG_LIB_VERSION == 80){
+         TestUtil::testFiles(QString(FILES_DATA_DIR) + "/sources", QStringList(), "_80");
+     }else {
diff --git a/debian/patches/series b/debian/patches/series
index 9d4f941..530aa78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ eigen3_in_tests
 disable_convolution_failling_tests
 temporarily_disable_failing_tests
 calligra_imports_search_path
+kisjpegtest_call_kisexiv2_initialize

-- 
Calligra suite packaging