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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 3347f74cceafb650d76a27c451f22340bcb0e926
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Mar 11 10:02:03 2014 +0100

    New patch: calligra_imports_search_path
---
 debian/changelog                            |  1 +
 debian/patches/calligra_imports_search_path | 60 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 62 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index df1fe96..b6d3f0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ calligra (1:2.8.0-1) UNRELEASED; urgency=low
   * New patch: temporarily_disable_failing_tests
   * Update copyright file.
   * Reenable krita-sketch and krita-gemini.
+  * New patch: calligra_imports_search_path
 
  -- Adrien Grellier <perso at adrieng.fr>  Sun, 15 Dec 2013 20:15:29 +0100
 
diff --git a/debian/patches/calligra_imports_search_path b/debian/patches/calligra_imports_search_path
new file mode 100644
index 0000000..8a4c77b
--- /dev/null
+++ b/debian/patches/calligra_imports_search_path
@@ -0,0 +1,60 @@
+Index: calligra/krita/gemini/MainWindow.cpp
+===================================================================
+--- calligra.orig/krita/gemini/MainWindow.cpp	2014-03-11 16:39:05.601183949 +0100
++++ calligra/krita/gemini/MainWindow.cpp	2014-03-11 16:39:05.569183174 +0100
+@@ -158,6 +158,11 @@
+         sketchView->engine()->addImportPath(appdir.canonicalPath() + "/lib64/calligra/imports");
+         QString mainqml = appdir.canonicalPath() + "/share/apps/kritagemini/kritagemini.qml";
+ #else
++
++#ifdef LIBRARY_ARCHITECTURE
++        sketchView->engine()->addImportPath(KGlobal::dirs()->findDirs("lib", LIBRARY_ARCHITECTURE "/calligra/imports").value(0));
++#endif
++
+         sketchView->engine()->addImportPath(KGlobal::dirs()->findDirs("lib", "calligra/imports").value(0));
+         QString mainqml = KGlobal::dirs()->findResource("data", "kritagemini/kritagemini.qml");
+ #endif
+Index: calligra/krita/sketch/CMakeLists.txt
+===================================================================
+--- calligra.orig/krita/sketch/CMakeLists.txt	2014-03-11 16:39:05.601183949 +0100
++++ calligra/krita/sketch/CMakeLists.txt	2014-03-11 16:39:05.581183465 +0100
+@@ -126,6 +126,9 @@
+ 
+ kde4_add_executable(kritasketch ${kritasketch_SRCS})
+ 
++set_target_properties(kritasketch PROPERTIES COMPILE_DEFINITIONS
++    LIBRARY_ARCHITECTURE="${CMAKE_LIBRARY_ARCHITECTURE}")
++
+ target_link_libraries(kritasketch
+     ${QT_QTDECLARATIVE_LIBRARY}
+     ${QT_QTGUI_LIBRARIES}
+Index: calligra/krita/sketch/MainWindow.cpp
+===================================================================
+--- calligra.orig/krita/sketch/MainWindow.cpp	2014-03-11 16:39:05.601183949 +0100
++++ calligra/krita/sketch/MainWindow.cpp	2014-03-11 16:39:27.009702862 +0100
+@@ -114,6 +114,11 @@
+     view->engine()->addImportPath(appdir.canonicalPath() + "/lib64/calligra/imports");
+     QString mainqml = appdir.canonicalPath() + "/share/apps/kritasketch/kritasketch.qml";
+ #else
++
++#ifdef LIBRARY_ARCHITECTURE
++    view->engine()->addImportPath(KGlobal::dirs()->findDirs("lib", LIBRARY_ARCHITECTURE "/calligra/imports").value(0));
++#endif
++
+     view->engine()->addImportPath(KGlobal::dirs()->findDirs("lib", "calligra/imports").value(0));
+     QString mainqml = KGlobal::dirs()->findResource("appdata", "kritasketch.qml");
+ #endif
+Index: calligra/krita/gemini/CMakeLists.txt
+===================================================================
+--- calligra.orig/krita/gemini/CMakeLists.txt	2014-03-11 16:39:05.601183949 +0100
++++ calligra/krita/gemini/CMakeLists.txt	2014-03-11 16:39:05.601183949 +0100
+@@ -31,6 +31,9 @@
+ 
+ kde4_add_executable(kritagemini ${kritagemini_SRCS})
+ 
++set_target_properties(kritagemini PROPERTIES COMPILE_DEFINITIONS
++    LIBRARY_ARCHITECTURE="${CMAKE_LIBRARY_ARCHITECTURE}")
++
+ target_link_libraries(kritagemini
+     ${QT_QTDECLARATIVE_LIBRARY}
+     ${QT_QTGUI_LIBRARIES}
diff --git a/debian/patches/series b/debian/patches/series
index 3116ead..7966b52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ eigen3_in_tests
 convolution_tests_fix
 disable_convolution_failling_tests
 temporarily_disable_failing_tests
+calligra_imports_search_path

-- 
Calligra suite packaging