summaryrefslogtreecommitdiff
path: root/math/kcalc
diff options
context:
space:
mode:
authormarkd <markd>2014-02-01 02:20:43 +0000
committermarkd <markd>2014-02-01 02:20:43 +0000
commitd47a84fef91c56330090f36c6c7cde8e5889059b (patch)
tree778d6c50bc442227bee045474db2ead88604e13c /math/kcalc
parenta545c4b49ea48bddb558e5db916bbceb0ce544e7 (diff)
downloadpkgsrc-d47a84fef91c56330090f36c6c7cde8e5889059b.tar.gz
Update to KDE SC 4.11.5
bug fixes
Diffstat (limited to 'math/kcalc')
-rw-r--r--math/kcalc/Makefile3
-rw-r--r--math/kcalc/distinfo10
-rw-r--r--math/kcalc/patches/patch-knumber_knumber_float.cpp10
3 files changed, 11 insertions, 12 deletions
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 1ea58b44f83..cb47ee0fbab 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2014/01/01 11:52:23 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2014/02/01 02:20:49 markd Exp $
DISTNAME= kcalc-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= math
COMMENT= KDE scientific calculator
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index a1118ace3b3..968d86861b5 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2013/11/07 11:59:59 markd Exp $
+$NetBSD: distinfo,v 1.7 2014/02/01 02:20:49 markd Exp $
-SHA1 (kcalc-4.11.3.tar.xz) = a62a37a16a699fdba715cda33b9f75755d81cb76
-RMD160 (kcalc-4.11.3.tar.xz) = 211c77b1e54374313bff7909cd47c3b0282805cc
-Size (kcalc-4.11.3.tar.xz) = 82916 bytes
+SHA1 (kcalc-4.11.5.tar.xz) = ca45141768e9101ad3659ff623fb1d2230d7a116
+RMD160 (kcalc-4.11.5.tar.xz) = ef17c1d39c783464322cc9085c2be25103c23e62
+Size (kcalc-4.11.5.tar.xz) = 81212 bytes
SHA1 (patch-CMakeLists.txt) = 41012666b695fbaad04261cbf566d875d9f83ed8
-SHA1 (patch-knumber_knumber_float.cpp) = dc5e8434cc1e206b7ed11a68639bf3076f67d774
+SHA1 (patch-knumber_knumber_float.cpp) = 678e8d62df1a615f1117c58737da23a95d0e15a9
SHA1 (patch-knumber_tests_CMakeLists.txt) = 7d159f617903b778e65615cb73a81f40f1d262df
diff --git a/math/kcalc/patches/patch-knumber_knumber_float.cpp b/math/kcalc/patches/patch-knumber_knumber_float.cpp
index ad4a2cb7fbd..cd5ced3723b 100644
--- a/math/kcalc/patches/patch-knumber_knumber_float.cpp
+++ b/math/kcalc/patches/patch-knumber_knumber_float.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-knumber_knumber_float.cpp,v 1.2 2013/11/07 11:59:59 markd Exp $
+$NetBSD: patch-knumber_knumber_float.cpp,v 1.3 2014/02/01 02:20:49 markd Exp $
use namespace std for isinf() and isnan()
---- knumber/knumber_float.cpp.orig 2013-03-01 07:05:02.000000000 +0000
+--- knumber/knumber_float.cpp.orig 2014-01-02 19:33:27.000000000 +0000
+++ knumber/knumber_float.cpp
@@ -25,6 +25,8 @@ along with this program. If not, see <h
#include <QDebug>
@@ -10,6 +10,6 @@ use namespace std for isinf() and isnan()
+using namespace std;
+
- // NOTE: these assume IEEE floats..
- #ifndef isinf
- #define isinf(x) ((x) != 0.0 && (x) + (x) == (x))
+ #ifdef _MSC_VER
+ double log2(double x) { return log(x) / log(2); }
+ double exp2(double x) { return exp(x * log(2)); }