[ktuberling/f21] fix arm build (qreal = double assumptions again)

Rex Dieter rdieter at fedoraproject.org
Fri Aug 15 11:45:13 UTC 2014


commit e4673c7f3346ec2ec051d0e1ec67f295fb740d7d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Aug 15 06:44:49 2014 -0500

    fix arm build (qreal = double assumptions again)

 ktuberling-4.14.0-qreal.patch |   14 ++++++++++++++
 ktuberling.spec               |    5 ++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/ktuberling-4.14.0-qreal.patch b/ktuberling-4.14.0-qreal.patch
new file mode 100644
index 0000000..4789a9c
--- /dev/null
+++ b/ktuberling-4.14.0-qreal.patch
@@ -0,0 +1,14 @@
+diff -up ktuberling-4.14.0/playground.cpp.qreal ktuberling-4.14.0/playground.cpp
+--- ktuberling-4.14.0/playground.cpp.qreal	2014-08-13 03:40:56.000000000 -0500
++++ ktuberling-4.14.0/playground.cpp	2014-08-15 06:42:31.066986050 -0500
+@@ -226,8 +226,8 @@ QPointF PlayGround::clipPos(const QPoint
+   const double objectScale = m_objectsNameRatio.value(item->elementId());
+ 
+   QPointF res = p;
+-  res.setX(qMax(0., res.x()));
+-  res.setY(qMax(0., res.y()));
++  res.setX(qMax(qreal(0), res.x()));
++  res.setY(qMax(qreal(0), res.y()));
+   res.setX(qMin(m_SvgRenderer.defaultSize().width() - item->boundingRect().width() * objectScale, res.x()));
+   res.setY(qMin(m_SvgRenderer.defaultSize().height()- item->boundingRect().height() * objectScale, res.y()));
+   return res;
diff --git a/ktuberling.spec b/ktuberling.spec
index 93a89b8..5984c9a 100644
--- a/ktuberling.spec
+++ b/ktuberling.spec
@@ -14,6 +14,9 @@ URL:     https://projects.kde.org/projects/kde/kdegames/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
+## upstreamable patches
+Patch1:  ktuberling-4.14.0-qreal.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: libkdegames-devel >= %{version}
 
@@ -28,7 +31,7 @@ terms of content and adds a surprising variety of different themes.
 
 
 %prep
-%setup -q
+%autosetup -p1
 
 
 %build


More information about the scm-commits mailing list