summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/koffice/distinfo4
-rw-r--r--misc/koffice/patches/patch-aa12
2 files changed, 11 insertions, 5 deletions
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index f10b0cbc9d6..035ef5f6692 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.35 2006/12/08 11:00:48 joerg Exp $
+$NetBSD: distinfo,v 1.36 2006/12/10 10:11:01 markd Exp $
SHA1 (koffice-1.6.1.tar.bz2) = 891fb0a28ec3c4b070c4d6c2eae7fee1d2e37761
RMD160 (koffice-1.6.1.tar.bz2) = ee4fa84a53f92035c0ab9427e0acb18feca701db
Size (koffice-1.6.1.tar.bz2) = 56999028 bytes
-SHA1 (patch-aa) = 254d15db2ac7e0fb45e5ccb07da3ac7fabf9c360
+SHA1 (patch-aa) = b2067b1feaade8850440e49443791c365f37d91a
SHA1 (patch-ab) = f2e9067f24d1de2e3c9f139727c33ecaf6dc8503
SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083
diff --git a/misc/koffice/patches/patch-aa b/misc/koffice/patches/patch-aa
index 4c1c3500c79..ae7f35a5d99 100644
--- a/misc/koffice/patches/patch-aa
+++ b/misc/koffice/patches/patch-aa
@@ -1,13 +1,19 @@
-$NetBSD: patch-aa,v 1.10 2006/12/08 11:00:48 joerg Exp $
+$NetBSD: patch-aa,v 1.11 2006/12/10 10:11:01 markd Exp $
---- kchart/kdchart/KDChartAxesPainter.cpp.orig 2006-12-07 17:19:53.000000000 +0000
+--- kchart/kdchart/KDChartAxesPainter.cpp.orig 2006-11-18 04:11:38.000000000 +1300
+++ kchart/kdchart/KDChartAxesPainter.cpp
-@@ -3701,7 +3701,7 @@ QString KDChartAxesPainter::truncateBehi
+@@ -3701,8 +3701,13 @@ QString KDChartAxesPainter::truncateBehi
return sVal;
}
-#if defined ( Q_WS_WIN)
+#if defined ( Q_WS_WIN) || defined(__DragonFly__)
#define trunc(x) ((int)(x))
++#elif defined(__NetBSD__)
++#include <sys/param.h>
++#if __NetBSD_Version__ < 399001800
++#define trunc(x) ((int)(x))
++#endif
#endif
+ QString KDChartAxesPainter::applyLabelsFormat( const double nVal_,