summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2012-12-19 17:21:48 +0000
committerjperkin <jperkin@pkgsrc.org>2012-12-19 17:21:48 +0000
commit4e5861e052e8b5b8ce560aefb063b61ac3f79dc0 (patch)
tree59066523a5c9fb9cf3092e5fb4b8409df159732a /misc
parent8968c78eed2c1f8a2de63ec502746921eb31785c (diff)
downloadpkgsrc-4e5861e052e8b5b8ce560aefb063b61ac3f79dc0.tar.gz
Avoid "error: call of overloaded 'pow(int, int&)' is ambiguous".
Fixes build on Solaris.
Diffstat (limited to 'misc')
-rw-r--r--misc/kdepim3/distinfo3
-rw-r--r--misc/kdepim3/patches/patch-kmail_quotajobs.h15
2 files changed, 17 insertions, 1 deletions
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index 4188604e2ad..1eb0da959c0 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2012/05/04 16:27:59 joerg Exp $
+$NetBSD: distinfo,v 1.65 2012/12/19 17:21:48 jperkin Exp $
SHA1 (kdepim-3.5.10.tar.bz2) = 537da60fe3564ecc0ed2802e744fbf96386909a9
RMD160 (kdepim-3.5.10.tar.bz2) = 52a834dc8eb377d397404a16a09c8a59b568b305
@@ -20,6 +20,7 @@ SHA1 (patch-kmail_editorwatcher.cpp) = e66a40ea73810c59d23f52f6953c09b85d4e1deb
SHA1 (patch-kmail_imapaccountbase.h) = 362d8445597c869b9ee8366a4b9a698773579512
SHA1 (patch-kmail_kmsystemtray.cpp) = 1d658e1e1ee3d17d0f38955e5399505d61fdb402
SHA1 (patch-kmail_networkaccount.h) = bac18ee4994dff91f86b3a29b57cd35c21f96cca
+SHA1 (patch-kmail_quotajobs.h) = aade34199b86cf17c7968a9dd33c0e1a3693f5b4
SHA1 (patch-korganizer_korgac_alarmdialog.cpp) = 5b85966c115fad9bbc3068d4eb5e5b0723188cab
SHA1 (patch-kpilot_lib_pluginfactory.h) = 3496e8b57e50a4781afd542f829b19ae911e5b93
SHA1 (patch-libkcal_listbase.h) = c012336ca7de42c2f135b5d866ba05b543be4576
diff --git a/misc/kdepim3/patches/patch-kmail_quotajobs.h b/misc/kdepim3/patches/patch-kmail_quotajobs.h
new file mode 100644
index 00000000000..866fafed975
--- /dev/null
+++ b/misc/kdepim3/patches/patch-kmail_quotajobs.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-kmail_quotajobs.h,v 1.1 2012/12/19 17:21:49 jperkin Exp $
+
+Avoid "error: call of overloaded 'pow(int, int&)' is ambiguous".
+
+--- kmail/quotajobs.h.orig 2012-12-19 16:02:07.606082279 +0000
++++ kmail/quotajobs.h 2012-12-19 16:02:38.857687045 +0000
+@@ -72,7 +72,7 @@
+ QString toString() const {
+ if ( isValid() && !isEmpty() ) {
+ readConfig();
+- int factor = static_cast<int> ( pow( 1000, mFactor ) );
++ int factor = static_cast<int> ( pow( (double)1000, mFactor ) );
+ return i18n("%1 of %2 %3 used").arg( mCurrent.toInt() / factor )
+ .arg( mMax.toInt() / factor ).arg( mUnits );
+ }