[packages/kde4-kate] - fix c++ type errors - rel 4
baggins
baggins at pld-linux.org
Sat Oct 5 22:58:03 CEST 2019
commit 0ef29e8aec7ee66ff94cd9d2a1f15cfc7634fcef
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Oct 5 22:56:48 2019 +0200
- fix c++ type errors
- rel 4
cxx.patch | 23 +++++++++++++++++++++++
kde4-kate.spec | 5 ++++-
2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/kde4-kate.spec b/kde4-kate.spec
index 212d755..891c335 100644
--- a/kde4-kate.spec
+++ b/kde4-kate.spec
@@ -11,14 +11,16 @@ Summary: K Desktop Environment - Advanced Text Editor
Summary(pl.UTF-8): K Desktop Environment - Zaawansowany edytor tekstu
Name: kde4-kate
Version: 4.14.3
-Release: 3
+Release: 4
License: GPL
Group: X11/Applications/Editors
Source0: http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
# Source0-md5: 14da162cc650075cfb364fd39e64924d
+Patch0: cxx.patch
URL: http://www.kde.org/
BuildRequires: kde4-kdelibs-devel >= %{version}
BuildRequires: python-PyKDE4-devel >= %{version}
+BuildRequires: sip-PyQt4
BuildRequires: shared-mime-info
Obsoletes: kate <= 4.8.0
Obsoletes: kde4-kdebase-kwrite < 4.6.99
@@ -86,6 +88,7 @@ Pliki dla programistów kate.
%prep
%setup -q -n %{orgname}-%{version}
+%patch0 -p1
%build
install -d build
diff --git a/cxx.patch b/cxx.patch
new file mode 100644
index 0000000..f13954f
--- /dev/null
+++ b/cxx.patch
@@ -0,0 +1,23 @@
+--- kate-4.14.3/part/view/kateviewhelpers.cpp~ 2014-10-26 21:17:55.000000000 +0100
++++ kate-4.14.3/part/view/kateviewhelpers.cpp 2019-10-05 19:21:16.866710926 +0200
+@@ -77,7 +77,8 @@
+ #include <QtGui/QWhatsThis>
+ #include <QtGui/QLinearGradient>
+
+-#include <math.h>
++#include <cmath>
++#include <cstdint>
+
+ //BEGIN KateScrollBar
+ static const int s_lineWidth = 100;
+--- kate-4.14.3/part/view/kateviewhelpers.cpp~ 2019-10-05 19:22:43.000000000 +0200
++++ kate-4.14.3/part/view/kateviewhelpers.cpp 2019-10-05 19:24:56.926703402 +0200
+@@ -1704,7 +1704,7 @@
+ 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 - (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) );
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-kate.git/commitdiff/0ef29e8aec7ee66ff94cd9d2a1f15cfc7634fcef
More information about the pld-cvs-commit
mailing list