[rkward] fix build on arm

Tom Callaway spot at fedoraproject.org
Tue Mar 10 23:44:05 UTC 2015


commit fe0533c065b83ccbe4a482c43d286d69b4e73998
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue Mar 10 19:44:02 2015 -0400

    fix build on arm

 rkward-0.6.3-arm-fix.patch | 12 ++++++++++++
 rkward.spec                |  2 ++
 2 files changed, 14 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..1835d27
--- /dev/null
+++ b/rkward-0.6.3-arm-fix.patch
@@ -0,0 +1,12 @@
+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-03-10 19:37:12.501771989 -0400
++++ rkward-0.6.3/rkward/plugin/rkpluginspinbox.cpp	2015-03-10 19:37:45.131562327 -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 --git a/rkward.spec b/rkward.spec
index da72f72..7f7f7fa 100644
--- a/rkward.spec
+++ b/rkward.spec
@@ -10,6 +10,7 @@ Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://rkward.sourceforge.net/ 
 Source0:        http://downloads.sourceforge.net/rkward/%{name}-%{version}.tar.gz
+Patch0:		rkward-0.6.3-arm-fix.patch
 
 BuildRequires:  R-devel >= %{Rversion} desktop-file-utils gettext 
 BuildRequires:  kdelibs4-devel cmake pcre-devel
@@ -35,6 +36,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