[smb4k] remove some assumptions about qreal = double
Rex Dieter
rdieter at fedoraproject.org
Thu Apr 19 15:00:09 UTC 2012
commit b87604c140479f675ca1e5e177734d4bcf488291
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Apr 19 09:59:56 2012 -0500
remove some assumptions about qreal = double
smb4k-1.0.1-modf_double.patch | 30 ++++++++++++++++++++++++++++++
smb4k.spec | 12 +++++++++++-
2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/smb4k-1.0.1-modf_double.patch b/smb4k-1.0.1-modf_double.patch
new file mode 100644
index 0000000..a28312e
--- /dev/null
+++ b/smb4k-1.0.1-modf_double.patch
@@ -0,0 +1,30 @@
+diff -up smb4k-1.0.1/core/smb4kshare.cpp.qreal_v_double smb4k-1.0.1/core/smb4kshare.cpp
+--- smb4k-1.0.1/core/smb4kshare.cpp.qreal_v_double 2012-03-11 10:33:45.000000000 -0500
++++ smb4k-1.0.1/core/smb4kshare.cpp 2012-04-19 09:03:09.145076330 -0500
+@@ -475,7 +475,7 @@ QString Smb4KShare::totalDiskSpaceString
+ QString total, total_dim = QString();
+
+ int exponent = 0;
+- qreal tmp_factor = 0;
++ double tmp_factor = 0;
+ qulonglong factor = 0;
+
+ (void) frexp( m_total * 1024, &exponent );
+@@ -532,7 +532,7 @@ QString Smb4KShare::freeDiskSpaceString(
+ QString free, free_dim = QString();
+
+ int exponent = 0;
+- qreal tmp_factor = 0;
++ double tmp_factor = 0;
+ qulonglong factor = 0;
+
+ (void) frexp( m_free * 1024, &exponent );
+@@ -589,7 +589,7 @@ QString Smb4KShare::usedDiskSpaceString(
+ QString used, used_dim = QString();
+
+ int exponent = 0;
+- qreal tmp_factor = 0;
++ double tmp_factor = 0;
+ qulonglong factor = 0;
+
+ (void) frexp( m_used * 1024, &exponent );
diff --git a/smb4k.spec b/smb4k.spec
index b388056..1899b4e 100644
--- a/smb4k.spec
+++ b/smb4k.spec
@@ -1,6 +1,6 @@
Name: smb4k
Version: 1.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: The SMB/CIFS Share Browser for KDE
Group: Applications/Internet
@@ -9,6 +9,11 @@ URL: http://smb4k.sourceforge.net/
Source0: http://downloads.sourceforge.net/smb4k/%{name}-%{version}.tar.bz2
+## upstreamable patches
+# modf requires double, remove assumption that qreal = double
+# (which is false on some arch's, like arm)
+Patch50: smb4k-1.0.1-modf_double.patch
+
BuildRequires: cmake >= 2.6.0
BuildRequires: kdelibs4-devel >= 4.4.0
BuildRequires: gettext
@@ -25,6 +30,8 @@ provide a program that's easy to use and has as many features as possible.
%prep
%setup -q
+%patch50 -p1 -b .modf_double
+
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
@@ -89,6 +96,9 @@ fi
%{_datadir}/polkit-1/actions/de.berlios.smb4k.mounthelper.policy
%changelog
+* Thu Apr 19 2012 Rex Dieter <rdieter at fedoraproject.org> 1.0.1-6
+- remove some assumptions about qreal = double
+
* Tue Apr 10 2012 Sérgio Basto <sergio at serjux.com> - 1.0.1-5
- Obsoletes: smb4k-devel for F15
More information about the scm-commits
mailing list