| 1 |
On Sun, 2008-08-03 at 22:48 +0200, Marius Konitzer wrote: |
| 2 |
> My patch (http://launchpadlibrarian.net/15785118/inkscape-sol10.diff) is |
| 3 |
> part of Inkscape upstream as of svn r19126, but it would be neat to have |
| 4 |
> a working version of it in prefix until the 0.47 release. |
| 5 |
Sorry, I forgot to post the patch I had to apply to the existing |
| 6 |
inkscape-0.46-solaris.patch in Gentoo Prefix to make Inkscape compile: |
| 7 |
|
| 8 |
=================================================================== |
| 9 |
--- inkscape-0.46-solaris.patch (revision 29100) |
| 10 |
+++ inkscape-0.46-solaris.patch (working copy) |
| 11 |
@@ -40,12 +40,13 @@ |
| 12 |
#else |
| 13 |
# define is_nan(_a) (std::isnan(_a)) |
| 14 |
#endif |
| 15 |
-@@ -49,6 +51,8 @@ |
| 16 |
+@@ -49,6 +51,9 @@ |
| 17 |
# define is_finite(_a) (__isfinite(_a)) /* MacOSX/Darwin definition < |
| 18 |
10.4 */ |
| 19 |
#elif defined(isfinite) |
| 20 |
# define is_finite(_a) (isfinite(_a)) |
| 21 |
+#elif defined(__sun__) && defined(__GNUC__) |
| 22 |
-+# define is_finite(_a) (__builtin_isfinite(_a)) |
| 23 |
++#include <ieeefp.h> |
| 24 |
++#define is_finite(_a) (finite(_a) && !is_nan(_a)) |
| 25 |
#else |
| 26 |
# define is_finite(_a) (std::isfinite(_a)) |
| 27 |
#endif |
| 28 |
|
| 29 |
Just look at how src/isnan.h is patched by inkscape-0.46-solaris.patch |
| 30 |
and you will see that this is the canonical way to patch |
| 31 |
src/2geom/isnan.h, too. |
Archives