diff options
| author | marino <marino@FreeBSD.org> | 2013-10-07 17:24:12 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2013-10-07 17:24:12 +0800 |
| commit | cafe9b84179bd074f506795a4e093a7c86a5b51e (patch) | |
| tree | cc9b8c0e17e58749941deb7ceaa69b723e74314d | |
| parent | e976c7c5a546f6c329d1b0b38a31f9f5ae40b83a (diff) | |
| download | freebsd-ports-gnome-cafe9b84179bd074f506795a4e093a7c86a5b51e.tar.gz freebsd-ports-gnome-cafe9b84179bd074f506795a4e093a7c86a5b51e.tar.zst freebsd-ports-gnome-cafe9b84179bd074f506795a4e093a7c86a5b51e.zip | |
textproc/sablotron: Modify iconv patch to support DragonFly
DragonFly 3.4 and DragonFly 3.6 have different iconv prototypes.
This modifies the FreeBSD support patch to handle the two different
DragonFly cases as well.
| -rw-r--r-- | textproc/sablotron/files/patch-src__engine__encoding.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/textproc/sablotron/files/patch-src__engine__encoding.cpp b/textproc/sablotron/files/patch-src__engine__encoding.cpp index 3079d18b8ac7..afca8521973d 100644 --- a/textproc/sablotron/files/patch-src__engine__encoding.cpp +++ b/textproc/sablotron/files/patch-src__engine__encoding.cpp @@ -1,11 +1,23 @@ ---- ./src/engine/encoding.cpp.orig 2013-07-30 16:44:46.000000000 +0200 -+++ ./src/engine/encoding.cpp 2013-07-30 16:46:02.000000000 +0200 -@@ -278,7 +278,7 @@ +--- src/engine/encoding.cpp.orig 2003-11-21 08:45:11.000000000 +0000 ++++ src/engine/encoding.cpp +@@ -30,6 +30,7 @@ + * GPL. + */ + #include <errno.h> ++#include <sys/param.h> + + #include "encoding.h" + #include "proc.h" +@@ -278,7 +279,12 @@ eFlag Recoder::conv(Sit S, CDesc cd, con errno = 0; iconv((iconv_t)(cd -> physCD), # ifdef SABLOT_ICONV_CAST_OK -- (char**)(&inbuf), ++#if defined(__FreeBSD__) || \ ++ (defined(__DragonFly__) && __DragonFly_version > 300502) + (const char**)(&inbuf), ++#else + (char**)(&inbuf), ++#endif # else &inbuf, # endif |