Hello community, here is the log from the commit of package kate4-parts for openSUSE:Factory checked in at 2017-05-31 12:19:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate4-parts (Old) and /work/SRC/openSUSE:Factory/.kate4-parts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kate4-parts" Wed May 31 12:19:05 2017 rev:5 rq:498911 version:4.14.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kate4-parts/kate4-parts.changes 2017-02-06 15:22:15.359356852 +0100 +++ /work/SRC/openSUSE:Factory/.kate4-parts.new/kate4-parts.changes 2017-05-31 12:19:58.998358214 +0200 @@ -1,0 +2,5 @@ +Sun May 28 12:40:55 UTC 2017 - [email protected] + +- Add gcc7-fix.patch to fix build with GCC7 + +------------------------------------------------------------------- New: ---- gcc7-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate4-parts.spec ++++++ --- /var/tmp/diff_new_pack.2muGz5/_old 2017-05-31 12:20:00.346167951 +0200 +++ /var/tmp/diff_new_pack.2muGz5/_new 2017-05-31 12:20:00.350167386 +0200 @@ -1,7 +1,7 @@ # # spec file for package kate4-parts # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ Group: Productivity/Editors/Other Url: http://www.kde.org/ Source0: kate-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gcc7-fix.patch -- fix build with GCC7 +Patch: gcc7-fix.patch BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= %version BuildRequires: libqjson-devel @@ -46,6 +48,7 @@ %prep %setup -q -n kate-%{version} +%patch -p1 %build %ifarch ppc64 ++++++ gcc7-fix.patch ++++++ >From 4d1a7c60f6126faaea0e4efb86471f9df45d1e2e Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <[email protected]> Date: Sun, 28 May 2017 14:35:41 +0200 Subject: [PATCH] Make compile with MSVC2013 (and GCC7) Fixes an error when compiling with GCC7: error: call of overloaded 'abs(uint)' is ambiguous Backport of https://cgit.kde.org/ktexteditor.git/commit/?id=8b2820b4c95284337b5713ce7f548a456c25279e from the KF5 ktexteditor. --- part/view/kateviewhelpers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/part/view/kateviewhelpers.cpp b/part/view/kateviewhelpers.cpp index 8ad87710e..fa5ff03e5 100644 --- a/part/view/kateviewhelpers.cpp +++ b/part/view/kateviewhelpers.cpp @@ -1703,7 +1703,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height) 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) ); -- 2.12.3
