diff options
author | jperkin <jperkin@pkgsrc.org> | 2012-08-06 16:51:50 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2012-08-06 16:51:50 +0000 |
commit | 3aa1865e61301e74fe84c7465e7285081aea92b6 (patch) | |
tree | 7f27cdd6675af58b84b0ad11b95bc1966d3c7937 /textproc | |
parent | d0650f6168ddd0c0ddad93cb3128084703e470cc (diff) | |
download | pkgsrc-3aa1865e61301e74fe84c7465e7285081aea92b6.tar.gz |
Avoid "call of overloaded 'pow(double, long int&)' is ambiguous" error. A
similar patch was proposed on openjade-devel 10 years ago, and still hasn't
been integrated...
Fixes build on Solaris.
Diffstat (limited to 'textproc')
-rw-r--r-- | textproc/openjade/distinfo | 3 | ||||
-rw-r--r-- | textproc/openjade/patches/patch-style_primitive.cxx | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/textproc/openjade/distinfo b/textproc/openjade/distinfo index 0302f04214f..4003037f43d 100644 --- a/textproc/openjade/distinfo +++ b/textproc/openjade/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2011/04/22 07:27:45 adam Exp $ +$NetBSD: distinfo,v 1.12 2012/08/06 16:51:50 jperkin Exp $ SHA1 (openjade-1.3.2.tar.gz) = 54e1999f41450fbd62c5d466002d79d3efca2321 RMD160 (openjade-1.3.2.tar.gz) = 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2 @@ -11,3 +11,4 @@ SHA1 (patch-ae) = b67fde4062691b2d953cb4cb5b4ebd2428c3c285 SHA1 (patch-af) = 1e0db04b5b85ad3b71066e55f94bf3144d69efe5 SHA1 (patch-jade_TeXFOTBuilder.cxx) = 037953d73d896afae7531e313821224ccd1e30e4 SHA1 (patch-jade_TransformFOTBuilder.cxx) = cf4c51f05f95e31111a7e48d7984397ba4850e7d +SHA1 (patch-style_primitive.cxx) = a7f3328c436c9a73805cdd1abb4321f156b94c6e diff --git a/textproc/openjade/patches/patch-style_primitive.cxx b/textproc/openjade/patches/patch-style_primitive.cxx new file mode 100644 index 00000000000..0007fefe72b --- /dev/null +++ b/textproc/openjade/patches/patch-style_primitive.cxx @@ -0,0 +1,15 @@ +$NetBSD: patch-style_primitive.cxx,v 1.1 2012/08/06 16:51:50 jperkin Exp $ + +Avoid "call of overloaded 'pow(double, long int&)' is ambiguous" error. + +--- style/primitive.cxx.orig Mon Aug 6 14:50:09 2012 ++++ style/primitive.cxx Mon Aug 6 14:50:27 2012 +@@ -5047,7 +5047,7 @@ + if (!argv[1]->exactIntegerValue(n2)) + return argError(interp, loc, + InterpreterMessages::notAnExactInteger, 1, argv[1]); +- return new (interp) QuantityObj(pow(d1,n2), dim1*n2); ++ return new (interp) QuantityObj(pow(d1,(double)n2), dim1*n2); + } + else { + if ((q2 == ELObj::noQuantity) || (dim2 != 0)) |