diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2009-11-28 20:32:35 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2009-11-28 20:32:35 +0000 |
| commit | f60a5105e0dd142565312543e3c23aa38bea0604 (patch) | |
| tree | e84f436aa900f29380d6bab337c8eb0563887c99 /textproc/kmflcomp | |
| parent | Update to 2.2.6b. (diff) | |
- Fixes kmflcomp coredumping on amd64 systems; the patches are provided by Doug Rintoul <doug_rintoul@sil.org>,
PR: 140910
Submitted by: Nikola Lecic <nikola.lecic@anthesphoria.net>
Notes
Notes:
svn path=/head/; revision=244930
Diffstat (limited to 'textproc/kmflcomp')
| -rw-r--r-- | textproc/kmflcomp/Makefile | 1 | ||||
| -rw-r--r-- | textproc/kmflcomp/files/patch-include-kmfl.h | 39 | ||||
| -rw-r--r-- | textproc/kmflcomp/files/patch-include-kmflutfconv.h | 24 |
3 files changed, 64 insertions, 0 deletions
diff --git a/textproc/kmflcomp/Makefile b/textproc/kmflcomp/Makefile index 34ef3fb63aaa..52dd608404b1 100644 --- a/textproc/kmflcomp/Makefile +++ b/textproc/kmflcomp/Makefile @@ -7,6 +7,7 @@ PORTNAME= kmflcomp PORTVERSION= 0.9.8 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= SF/kmfl/kmfl/${PORTVERSION} \ http://anthesphoria.net/FreeBSD/ports/distfiles/ diff --git a/textproc/kmflcomp/files/patch-include-kmfl.h b/textproc/kmflcomp/files/patch-include-kmfl.h new file mode 100644 index 000000000000..8c9d30bdf9c2 --- /dev/null +++ b/textproc/kmflcomp/files/patch-include-kmfl.h @@ -0,0 +1,39 @@ +--- include/kmfl.h 2006-11-03 10:32:24.000000000 -0800 ++++ include/kmfl.h 2009-11-18 16:57:02.000000000 -0800 +@@ -31,6 +31,7 @@ + #endif + + ++#include <sys/types.h> + #define FILE_VERSION "1" + #define BASE_VERSION "320" + #define LAST_VERSION "600" +@@ -79,25 +80,12 @@ + #ifdef _WIN32 + typedef unsigned int UINT; // 32-bit unsigned integer (general purpose) + #else +-#include <stdint.h> +-#ifdef __uint32_t_defined +- typedef uint32_t UINT; +-#else +- typedef unsigned long UINT; // 32-bit unsigned integer (general purpose) +-#endif ++ typedef u_int32_t UINT; + #endif + +-#ifdef __int32_t_defined +- typedef int32_t INT; +-#else +- typedef long INT; // 32-bit unsigned integer (general purpose) +-#endif ++typedef int32_t INT; + +-#ifdef __uint8_t_defined +-typedef uint8_t BYTE; +-#else +-typedef unsigned char BYTE; // 8-bit unsigned integer +-#endif ++typedef u_int8_t BYTE; + typedef UINT ITEM; // 32-bit unsigned integer for UTF-32 or control values + typedef UINT OFFSET; // 32-bit unsigned integer used as table offsets + diff --git a/textproc/kmflcomp/files/patch-include-kmflutfconv.h b/textproc/kmflcomp/files/patch-include-kmflutfconv.h new file mode 100644 index 000000000000..f4138dcddde1 --- /dev/null +++ b/textproc/kmflcomp/files/patch-include-kmflutfconv.h @@ -0,0 +1,24 @@ +--- include/kmflutfconv.h 2006-03-10 15:34:49.000000000 -0800 ++++ include/kmflutfconv.h 2009-11-18 16:56:36.000000000 -0800 +@@ -26,16 +26,10 @@ + extern "C" { + #endif + +- +-#ifdef __uint32_t_defined +-typedef uint32_t UTF32; +-typedef uint16_t UTF16; +-typedef uint8_t UTF8; +-#else +-typedef unsigned long UTF32; +-typedef unsigned short UTF16; +-typedef unsigned char UTF8; +-#endif ++#include <sys/types.h> ++typedef u_int32_t UTF32; ++typedef u_int16_t UTF16; ++typedef u_int8_t UTF8; + + size_t IConvertUTF8toUTF16 ( + const UTF8** sourceStart, const UTF8* sourceEnd, + |