Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde-sunset:master commit in: kde-apps/katepart/files/, kde-apps/katepart/
Date: Sun, 16 Aug 2020 16:45:20
Message-Id: 1597595050.ef046fe8816403b63d3da9cb8c04f6bd3260803b.asturm@gentoo
1 commit: ef046fe8816403b63d3da9cb8c04f6bd3260803b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 16 16:11:52 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 16 16:24:10 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=ef046fe8
7
8 kde-apps/katepart: gcc7 compat
9
10 Thanks-to: Tommy Yu <y <AT> metatoaster.com>
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 kde-apps/katepart/files/katepart-4.14.3-gcc7.patch | 13 +++++++++++++
14 kde-apps/katepart/katepart-4.14.3.ebuild | 2 ++
15 2 files changed, 15 insertions(+)
16
17 diff --git a/kde-apps/katepart/files/katepart-4.14.3-gcc7.patch b/kde-apps/katepart/files/katepart-4.14.3-gcc7.patch
18 new file mode 100644
19 index 00000000..b6a87a90
20 --- /dev/null
21 +++ b/kde-apps/katepart/files/katepart-4.14.3-gcc7.patch
22 @@ -0,0 +1,13 @@
23 +diff --git a/part/view/kateviewhelpers.cpp b/part/view/kateviewhelpers.cpp
24 +index 8ad8771..cdeced3 100644
25 +--- a/part/view/kateviewhelpers.cpp
26 ++++ b/part/view/kateviewhelpers.cpp
27 +@@ -1703,7 +1703,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height)
28 + if (realLine > -1) {
29 + if (m_viewInternal->cache()->viewLine(z).startCol() == 0) {
30 + if (m_viRelLineNumbersOn && m_view->viInputMode()) {
31 +- int diff = abs(realLine - currentLine);
32 ++ int diff = abs(realLine - (int)currentLine);
33 + if (diff > 0) {
34 + p.drawText( lnX + m_maxCharWidth / 2, y, lnWidth - m_maxCharWidth, h,
35 + Qt::TextDontClip|Qt::AlignRight|Qt::AlignVCenter, QString("%1").arg(diff) );
36
37 diff --git a/kde-apps/katepart/katepart-4.14.3.ebuild b/kde-apps/katepart/katepart-4.14.3.ebuild
38 index 5ad58a89..050dec04 100644
39 --- a/kde-apps/katepart/katepart-4.14.3.ebuild
40 +++ b/kde-apps/katepart/katepart-4.14.3.ebuild
41 @@ -19,3 +19,5 @@ RESTRICT="test"
42 KMEXTRA="
43 addons/ktexteditor
44 "
45 +
46 +PATCHES=( "${FILESDIR}/${PN}-4.14.3-gcc7.patch" )