[SCM] kile packaging branch, master, updated. debian/4%2.9.91-3-6-gaf54c1e

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kile.git;a=commitdiff;h=80ea1b1

The following commit has been merged in the master branch:
commit 80ea1b122a78f68a233fd834a64c0c1db1bfe99e
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jan 20 15:29:08 2018 +0100

    avoid crash without okular (#887088, #887836)
    
    backport upstream commit 6790d4a47297ffe5e4cb7928d5d64f66a678c548
---
 debian/changelog                                   |  4 +++
 debian/patches/series                              |  1 +
 ...ash-when-the-viewer-part-is-not-available.patch | 33 ++++++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 54eb2c9..4a1b136 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ kile (4:2.9.91-4) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * Add the kinit dependency, needed to launch KIO slaves. (Closes: #886832)
+  * Backport upstream commit 6790d4a47297ffe5e4cb7928d5d64f66a678c548 to avoid
+    crashing when the Okular component is not installed; patch
+    upstream_Do-not-crash-when-the-viewer-part-is-not-available.patch.
+    (Closes: #887088, #887836)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 10 Jan 2018 15:17:14 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 51b8c0b..2a574ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 02_tex_doc_location.diff
+upstream_Do-not-crash-when-the-viewer-part-is-not-available.patch
diff --git a/debian/patches/upstream_Do-not-crash-when-the-viewer-part-is-not-available.patch b/debian/patches/upstream_Do-not-crash-when-the-viewer-part-is-not-available.patch
new file mode 100644
index 0000000..992efc0
--- /dev/null
+++ b/debian/patches/upstream_Do-not-crash-when-the-viewer-part-is-not-available.patch
@@ -0,0 +1,33 @@
+From 6790d4a47297ffe5e4cb7928d5d64f66a678c548 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 20 Jan 2018 15:21:53 +0100
+Subject: [PATCH] Do not crash when the viewer part is not available
+
+---
+ src/kile.cpp | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/src/kile.cpp
++++ b/src/kile.cpp
+@@ -2372,7 +2372,9 @@ void Kile::readConfig()
+ {
+ 	m_codeCompletionManager->readConfig(m_config.data());
+ 
+-	m_livePreviewManager->readConfig(m_config.data());
++	if(m_livePreviewManager) {
++		m_livePreviewManager->readConfig(m_config.data());
++	}
+ 
+ 	//m_edit->initDoubleQuotes();
+ 	m_edit->readConfig();
+@@ -2402,7 +2404,9 @@ void Kile::saveSettings()
+ {
+ 	m_fileBrowserWidget->writeConfig();
+ 
+-	m_livePreviewManager->writeConfig();
++	if(m_livePreviewManager) {
++		m_livePreviewManager->writeConfig();
++	}
+ 
+ 	m_symbolViewMFUS->writeConfig();
+ 	saveLastSelectedAction();

-- 
kile packaging