<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/374ad7a041b407c0eb50789b1dee4bceda289516">https://github.com/macports/macports-ports/commit/374ad7a041b407c0eb50789b1dee4bceda289516</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 374ad7a kate: fix ambiguous 'abs' (fix: https://trac.macports.org/ticket/55067)
</span>374ad7a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 374ad7a041b407c0eb50789b1dee4bceda289516
</span>Author: Nicolas Pavillon <nicos@macports.org>
AuthorDate: Fri Oct 13 20:45:01 2017 +0900
<span style='display:block; white-space:pre;color:#404040;'> kate: fix ambiguous 'abs' (fix: https://trac.macports.org/ticket/55067)
</span>---
kde/kate/Portfile | 5 +++--
kde/kate/files/patch-kateviewhelpers.diff | 11 +++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kate/Portfile b/kde/kate/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4c3c18e..6b8772f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kate/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kate/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup kde4 1.1
</span>
name kate
version 4.14.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories kde kde4
license LGPL-2+
maintainers nicos openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,8 @@ depends_lib-append port:kdelibs4 \
</span> port:oxygen-icons
#Avoids weird behaviour with Zoom on OS X (https://git.reviewboard.kde.org/r/120319/)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Zoom.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Zoom.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-kateviewhelpers.diff
</span>
#Blacklist gcc42 and llvm-gcc-42 (does not build with gcc, ticket #37596)
compiler.blacklist gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kate/files/patch-kateviewhelpers.diff b/kde/kate/files/patch-kateviewhelpers.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ff8fae6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kate/files/patch-kateviewhelpers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- part/view/kateviewhelpers.cpp.orig 2014-10-27 05:17:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ part/view/kateviewhelpers.cpp 2017-10-12 15:17:24.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1703,7 +1703,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (realLine > -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m_viewInternal->cache()->viewLine(z).startCol() == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m_viRelLineNumbersOn && m_view->viInputMode()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int diff = abs(realLine - currentLine);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int diff = abs(realLine - (int)currentLine);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (diff > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p.drawText( lnX + m_maxCharWidth / 2, y, lnWidth - m_maxCharWidth, h,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Qt::TextDontClip|Qt::AlignRight|Qt::AlignVCenter, QString("%1").arg(diff) );
</span></pre><pre style='margin:0'>
</pre>