[SCM] kate packaging branch, master, updated. debian/4.14.3-4-3-g1f279f7

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kate.git;a=commitdiff;h=296e547

The following commit has been merged in the master branch:
commit 296e5475142b547242a9d638d71f8f627253bb2f
Author: Pino Toscano <pino at debian.org>
Date:   Mon Dec 25 15:54:18 2017 +0100

    fix build with gcc 7 (#853471)
    
    backport upstream commits 8b2820b4c95284337b5713ce7f548a456c25279e and
    3411777a09481e26a595eddf43333571963fe69b (from ktexteditor)
---
 debian/changelog          |  4 ++++
 debian/patches/gcc-7.diff | 18 ++++++++++++++++++
 debian/patches/series     |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 085ace6..48877b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kate4 (4:4.14.3-5) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commits 8b2820b4c95284337b5713ce7f548a456c25279e and
+    3411777a09481e26a595eddf43333571963fe69b (from ktexteditor) to fix build
+    with GCC 7; patch gcc-7.diff. (Closes: #853471)
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 25 Dec 2017 15:42:32 +0100
 
diff --git a/debian/patches/gcc-7.diff b/debian/patches/gcc-7.diff
new file mode 100644
index 0000000..b83735d
--- /dev/null
+++ b/debian/patches/gcc-7.diff
@@ -0,0 +1,18 @@
+Author: Kevin Funk <kfunk at kde.org>
+Author: Christoph Cullmann <cullmann at kde.org>
+Description: Make compile with MSVC2013
+Origin: https://commits.kde.org/ktexteditor/8b2820b4c95284337b5713ce7f548a456c25279e
+Origin: https://commits.kde.org/ktexteditor/3411777a09481e26a595eddf43333571963fe69b
+Bug-Debian: https://bugs.debian.org/853471
+
+--- a/part/view/kateviewhelpers.cpp
++++ b/part/view/kateviewhelpers.cpp
+@@ -1703,7 +1703,7 @@ void KateIconBorder::paintBorder (int /*
+       if (realLine > -1) {
+         if (m_viewInternal->cache()->viewLine(z).startCol() == 0) {
+           if (m_viRelLineNumbersOn && m_view->viInputMode()) {
+-            int diff = abs(realLine - currentLine);
++            int diff = abs(realLine - static_cast<int>(currentLine));
+             if (diff > 0) {
+               p.drawText( lnX + m_maxCharWidth / 2, y, lnWidth - m_maxCharWidth, h,
+                           Qt::TextDontClip|Qt::AlignRight|Qt::AlignVCenter, QString("%1").arg(diff) );
diff --git a/debian/patches/series b/debian/patches/series
index aa64e39..8c5ef70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ sideeffects_in_asserts_are_evil.patch
 do_not_enforce_tests
 cmake-policy.diff
 cmake-optional.diff
+gcc-7.diff

-- 
kate packaging