diff options
| author | John Marino <marino@FreeBSD.org> | 2013-10-07 09:04:10 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2013-10-07 09:04:10 +0000 |
| commit | 237fc7e2cf960ceabaea8d41456436486e3411b2 (patch) | |
| tree | b384c64aae37598f4389a2e0175c49e2d0e45e9c /graphics/ipe | |
| parent | 3504cd779a7e812b01f1e842e9aaaec456a48386 (diff) | |
| download | ports-237fc7e2cf960ceabaea8d41456436486e3411b2.tar.gz ports-237fc7e2cf960ceabaea8d41456436486e3411b2.zip | |
graphics/ipe: Update patch to support DragonFly
DragonFly 3.4 uses char* prototype for iconv while the upcoming
DragonFly 3.6 uses const char* iconv prototype like FreeBSD does.
Modify the iconv patch to allow graphics/ipe to build on both
DragonFly releases.
Notes
Notes:
svn path=/head/; revision=329666
Diffstat (limited to 'graphics/ipe')
| -rw-r--r-- | graphics/ipe/files/patch-ipelib__ipedoc.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/graphics/ipe/files/patch-ipelib__ipedoc.cpp b/graphics/ipe/files/patch-ipelib__ipedoc.cpp index f4d56b64aec5..a0317b4e924d 100644 --- a/graphics/ipe/files/patch-ipelib__ipedoc.cpp +++ b/graphics/ipe/files/patch-ipelib__ipedoc.cpp @@ -1,11 +1,23 @@ ---- ipelib/ipedoc.cpp.orig +--- ipelib/ipedoc.cpp.orig 2013-03-15 13:37:02.000000000 +0000 +++ ipelib/ipedoc.cpp -@@ -850,7 +850,7 @@ +@@ -41,6 +41,7 @@ + #include "ipelatex.h" + + #include <errno.h> ++#include <sys/param.h> + + #ifdef IPE_USE_ICONV + #include <iconv.h> +@@ -850,7 +851,12 @@ int Document::runLatex(String &texLog) if (!file) return ErrWritingSource; -- char *inbuf = (char *) utf8.data(); ++#if defined(__FreeBSD__) || \ ++ (defined(__DragonFly__) && __DragonFly_version > 300502) + const char *inbuf = utf8.data(); ++#else + char *inbuf = (char *) utf8.data(); ++#endif size_t inbytesleft = utf8.size(); FileStream fstream(file); |