Date: Mon, 7 Oct 2013 09:04:10 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329666 - head/graphics/ipe/files Message-ID: <201310070904.r9794ADt081935@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Oct 7 09:04:10 2013 New Revision: 329666 URL: http://svnweb.freebsd.org/changeset/ports/329666 Log: 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. Modified: head/graphics/ipe/files/patch-ipelib__ipedoc.cpp Modified: head/graphics/ipe/files/patch-ipelib__ipedoc.cpp ============================================================================== --- head/graphics/ipe/files/patch-ipelib__ipedoc.cpp Mon Oct 7 08:54:36 2013 (r329665) +++ head/graphics/ipe/files/patch-ipelib__ipedoc.cpp Mon Oct 7 09:04:10 2013 (r329666) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310070904.r9794ADt081935>