Received: by mail.netbsd.org (Postfix, from userid 605) id 519E484E03; Wed, 17 Jan 2018 20:23:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E698884D92 for ; Wed, 17 Jan 2018 20:19:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id z6q1xA1Yz2fk for ; Wed, 17 Jan 2018 20:19:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 727F884CE1 for ; Wed, 17 Jan 2018 20:19:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6DEA3FBDE; Wed, 17 Jan 2018 20:19:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1516220398220740" MIME-Version: 1.0 Date: Wed, 17 Jan 2018 20:19:58 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/editors/kate To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20180117201958.6DEA3FBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1516220398220740 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Wed Jan 17 20:19:58 UTC 2018 Modified Files: pkgsrc/editors/kate: distinfo Added Files: pkgsrc/editors/kate/patches: patch-part_view_kateviewhelpers.cpp Log Message: gcc7 fix To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/editors/kate/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/editors/kate/patches/patch-part_view_kateviewhelpers.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1516220398220740 Content-Disposition: inline Content-Length: 2309 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/kate/distinfo diff -u pkgsrc/editors/kate/distinfo:1.10 pkgsrc/editors/kate/distinfo:1.11 --- pkgsrc/editors/kate/distinfo:1.10 Tue Nov 3 03:32:17 2015 +++ pkgsrc/editors/kate/distinfo Wed Jan 17 20:19:58 2018 @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 03:32:17 agc Exp $ +$NetBSD: distinfo,v 1.11 2018/01/17 20:19:58 markd Exp $ SHA1 (kate-4.14.3.tar.xz) = da37195e86b5449fcdfe69a3f7df6373a5da900c RMD160 (kate-4.14.3.tar.xz) = 195cfac39111a1434b6b5c60543b219a70c0c74e SHA512 (kate-4.14.3.tar.xz) = 0d197bb00fb9a56572e140dd3c50338c90a0cb3bb8ebc78cc0e6d6ab04d6c129537a2ab8076ff9b844e159687c0a73cbacbe678e006b2d86b57285068158e38e Size (kate-4.14.3.tar.xz) = 2766880 bytes SHA1 (patch-addons_kate_pate_src_version_checker.h) = f22a9131bcbcdffc0330d258cf471d8e3dcbf05e +SHA1 (patch-part_view_kateviewhelpers.cpp) = 55c93f9149ce5f5916f59d11e8992185c1f9be28 SHA1 (patch-tests_CMakeLists.txt) = ae9f410649101d6803fc6b14f487f8243fce0991 Added files: Index: pkgsrc/editors/kate/patches/patch-part_view_kateviewhelpers.cpp diff -u /dev/null pkgsrc/editors/kate/patches/patch-part_view_kateviewhelpers.cpp:1.1 --- /dev/null Wed Jan 17 20:19:58 2018 +++ pkgsrc/editors/kate/patches/patch-part_view_kateviewhelpers.cpp Wed Jan 17 20:19:58 2018 @@ -0,0 +1,19 @@ +$NetBSD: patch-part_view_kateviewhelpers.cpp,v 1.1 2018/01/17 20:19:58 markd Exp $ + +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.orig 2014-10-26 20:17:55.000000000 +0000 ++++ 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(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) ); --_----------=_1516220398220740--