[rkward/f22] fix arm build
Tom Callaway
spot at fedoraproject.org
Wed Mar 11 00:41:13 UTC 2015
commit 7468db6732fb0c0cc016e85fe80738f743bbce2f
Author: Tom Callaway <spot at fedoraproject.org>
Date: Tue Mar 10 20:41:12 2015 -0400
fix arm build
rkward-0.6.3-arm-fix.patch | 24 ++++++++++++++++++++++++
rkward.spec | 3 +++
2 files changed, 27 insertions(+)
---
diff --git a/rkward-0.6.3-arm-fix.patch b/rkward-0.6.3-arm-fix.patch
new file mode 100644
index 0000000..d3b5a7a
--- /dev/null
+++ b/rkward-0.6.3-arm-fix.patch
@@ -0,0 +1,24 @@
+diff -up rkward-0.6.3/rkward/plugin/rkpluginspinbox.cpp.armfix rkward-0.6.3/rkward/plugin/rkpluginspinbox.cpp
+--- rkward-0.6.3/rkward/plugin/rkpluginspinbox.cpp.armfix 2015-01-15 08:37:20.000000000 -0500
++++ rkward-0.6.3/rkward/plugin/rkpluginspinbox.cpp 2015-03-10 19:42:05.885886853 -0400
+@@ -50,7 +50,7 @@ RKPluginSpinBox::RKPluginSpinBox (const
+ if (!intmode) {
+ double min = xml->getDoubleAttribute (element, "min", -FLT_MAX, DL_INFO);
+ double max = xml->getDoubleAttribute (element, "max", FLT_MAX, DL_INFO);
+- double initial = xml->getDoubleAttribute (element, "initial", qMin (max, qMax (min, qreal(0.0))), DL_INFO);
++ double initial = xml->getDoubleAttribute (element, "initial", qMin (max, qMax (min, double(qreal(0.0)))), DL_INFO);
+ int default_precision = xml->getIntAttribute (element, "default_precision", 2, DL_INFO);
+ int max_precision = xml->getIntAttribute (element, "max_precision", 8, DL_INFO);
+
+diff -up rkward-0.6.3/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp.armfix rkward-0.6.3/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
+--- rkward-0.6.3/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp.armfix 2015-03-10 20:11:02.363493214 -0400
++++ rkward-0.6.3/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp 2015-03-10 20:11:13.903466769 -0400
+@@ -105,7 +105,7 @@ static QPen readSimplePen (QDataStream &
+ instream >> lwd >> lty;
+ if (!col.isValid () || (lty == -1L)) return QPen (Qt::NoPen);
+
+- lwd = qMax (qreal(1.0), lwd); // minimum 1 px as in X11 device
++ lwd = qMax (double(qreal(1.0)), lwd); // minimum 1 px as in X11 device
+ QPen ret;
+ if (lty != 0) { // solid
+ QVector<qreal> dashes;
diff --git a/rkward.spec b/rkward.spec
index da72f72..a7094ea 100644
--- a/rkward.spec
+++ b/rkward.spec
@@ -10,6 +10,8 @@ Group: Applications/Productivity
License: GPLv2+
URL: http://rkward.sourceforge.net/
Source0: http://downloads.sourceforge.net/rkward/%{name}-%{version}.tar.gz
+# https://sourceforge.net/p/rkward/bugs/137/
+Patch0: rkward-0.6.3-arm-fix.patch
BuildRequires: R-devel >= %{Rversion} desktop-file-utils gettext
BuildRequires: kdelibs4-devel cmake pcre-devel
@@ -35,6 +37,7 @@ intégration dans les suites bureautiques.
%prep
%setup -q
#-n %{name}-%{version}-pre1
+%patch0 -p1 -b .armfix
%build
mkdir -p %{_target_platform}
More information about the scm-commits
mailing list