diff options
author | kristerw <kristerw@pkgsrc.org> | 2004-07-11 16:53:47 +0000 |
---|---|---|
committer | kristerw <kristerw@pkgsrc.org> | 2004-07-11 16:53:47 +0000 |
commit | 04d21f41905c168f0ee19338cad971d0fba54069 (patch) | |
tree | 69954daf68933bf152d80e5c351a7d2ca6f3b9be /misc/koffice11 | |
parent | f9b6bcd7ebbac010cff2c083a418edc38d6684fd (diff) | |
download | pkgsrc-04d21f41905c168f0ee19338cad971d0fba54069.tar.gz |
Include cmath to get std::floor, and resolve some ambiguous
calls to pow().
Diffstat (limited to 'misc/koffice11')
-rw-r--r-- | misc/koffice11/distinfo | 4 | ||||
-rw-r--r-- | misc/koffice11/patches/patch-ah | 13 | ||||
-rw-r--r-- | misc/koffice11/patches/patch-ai | 26 |
3 files changed, 42 insertions, 1 deletions
diff --git a/misc/koffice11/distinfo b/misc/koffice11/distinfo index 4ee2e700b3c..400e8161dd1 100644 --- a/misc/koffice11/distinfo +++ b/misc/koffice11/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/10/08 14:06:59 martti Exp $ +$NetBSD: distinfo,v 1.2 2004/07/11 16:53:47 kristerw Exp $ SHA1 (koffice-1.1.1.tar.bz2) = d455db081ec1dd4392e2246ec721a1f516a16780 Size (koffice-1.1.1.tar.bz2) = 8492580 bytes @@ -9,3 +9,5 @@ SHA1 (patch-ad) = 80299e8438ae050e415b6a1897f5efc8d2b6d37d SHA1 (patch-ae) = a048cbbbf51dc51dc0a7c47f783adb4e44d0e66d SHA1 (patch-af) = 95abb2d03f8607787a0f1069d7721d47b1f111ca SHA1 (patch-ag) = b3707ef85e564921f41a76c9c1f3c29dcd877d86 +SHA1 (patch-ah) = 7e1029d531ab16f263fdd8d1f67ef17ac76d1a72 +SHA1 (patch-ai) = 0ed96a19357af49d89039316994bad0b1f4807fa diff --git a/misc/koffice11/patches/patch-ah b/misc/koffice11/patches/patch-ah new file mode 100644 index 00000000000..592e7ca5c48 --- /dev/null +++ b/misc/koffice11/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2004/07/11 16:53:47 kristerw Exp $ + +--- kchart/kdchart/KDChartPainter.cpp.orig 2004-07-11 13:21:21.000000000 +0200 ++++ kchart/kdchart/KDChartPainter.cpp 2004-07-11 13:21:57.000000000 +0200 +@@ -8,6 +8,8 @@ + Copyright (C) 2001 by Klarälvdalens Datakonsult AB + */ + ++#include <cmath> ++ + #include <KDDrawText.h> + #include <KDChartPainter.h> + #include <KDChartEnums.h> diff --git a/misc/koffice11/patches/patch-ai b/misc/koffice11/patches/patch-ai new file mode 100644 index 00000000000..3e639d66a63 --- /dev/null +++ b/misc/koffice11/patches/patch-ai @@ -0,0 +1,26 @@ +$NetBSD: patch-ai,v 1.1 2004/07/11 16:53:47 kristerw Exp $ + +--- kspread/kspread_interpreter.cc.orig 2004-07-11 17:39:24.000000000 +0200 ++++ kspread/kspread_interpreter.cc 2004-07-11 17:51:55.000000000 +0200 +@@ -2547,10 +2547,10 @@ + } + // This is not correct solution for problem with floating point numbers and probably + // will fail in platforms where float and double lenghts are same. +- if (approx_equal(floor(args[0]->doubleValue()*pow(10,digits)), args[0]->doubleValue()*pow(10,digits))) ++ if (approx_equal(floor(args[0]->doubleValue()*pow(10.0,digits)), args[0]->doubleValue()*pow(10.0,digits))) + result = args[0]->doubleValue(); + else +- result=floor(args[0]->doubleValue()*pow(10,digits)+1)/pow(10,digits); ++ result=floor(args[0]->doubleValue()*pow(10.0,digits)+1)/pow(10.0,digits); + context.setValue( new KSValue( result) ); + + return true; +@@ -3404,7 +3404,7 @@ + return false; + } + +- double arg=pow(sqrt(pow(imag,2)+pow(real,2)),args[1]->intValue()); ++ double arg=pow(sqrt(pow(imag,2)+pow(real,2)),(int)args[1]->intValue()); + double angle=atan(imag/real); + + double real_res=arg*cos(angle*args[1]->intValue()); |