diff options
author | minskim <minskim> | 2004-02-15 04:14:04 +0000 |
---|---|---|
committer | minskim <minskim> | 2004-02-15 04:14:04 +0000 |
commit | 840f49ec746b5ee2d98664ac86db813af6ad4c63 (patch) | |
tree | 8dd8ddfae5400f51c03324fb124c3566c7619b3d /textproc/xerces-c | |
parent | dc8965c096c38a035779399209cab145a5fb7d8d (diff) | |
download | pkgsrc-840f49ec746b5ee2d98664ac86db813af6ad4c63.tar.gz |
Make this package build with GNU iconv.
Diffstat (limited to 'textproc/xerces-c')
-rw-r--r-- | textproc/xerces-c/distinfo | 3 | ||||
-rw-r--r-- | textproc/xerces-c/patches/patch-ab | 79 |
2 files changed, 81 insertions, 1 deletions
diff --git a/textproc/xerces-c/distinfo b/textproc/xerces-c/distinfo index e989d9e61a7..b6af61a1a82 100644 --- a/textproc/xerces-c/distinfo +++ b/textproc/xerces-c/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2004/02/11 04:06:04 minskim Exp $ +$NetBSD: distinfo,v 1.5 2004/02/15 04:14:04 minskim Exp $ SHA1 (xerces-c-src_2_3_0.tar.gz) = ea47e1899d569344e7ff1ca09f31f725bbe92033 Size (xerces-c-src_2_3_0.tar.gz) = 6885335 bytes SHA1 (patch-aa) = e72de819f840a867d17db1a8b5d0198213497c54 +SHA1 (patch-ab) = 673eee8137b79deae52297424a68293a00b53a91 SHA1 (patch-ac) = fb187d0c5b7dbc09d31be8dea09c88bea755f87d diff --git a/textproc/xerces-c/patches/patch-ab b/textproc/xerces-c/patches/patch-ab new file mode 100644 index 00000000000..c34a59cabcf --- /dev/null +++ b/textproc/xerces-c/patches/patch-ab @@ -0,0 +1,79 @@ +$NetBSD: patch-ab,v 1.4 2004/02/15 04:14:04 minskim Exp $ + +--- util/Transcoders/IconvGNU/IconvGNUTransService.cpp.orig 2003-05-27 10:04:57.000000000 -0500 ++++ util/Transcoders/IconvGNU/IconvGNUTransService.cpp +@@ -94,7 +94,11 @@ + #include <locale.h> + #include <iconv.h> + #include <errno.h> ++#ifdef __NetBSD__ ++#include <machine/endian.h> ++#else + #include <endian.h> ++#endif + + #include <xercesc/util/XMLString.hpp> + #include <xercesc/util/XMLUniDefs.hpp> +@@ -309,7 +313,7 @@ XMLCh IconvGNUWrapper::toUpper (const + xmlChToMbc (ch, wcbuf); + + char tmpArr[4]; +- char* ptr = wcbuf; ++ const char* ptr = wcbuf; + size_t len = fUChSize; + char *pTmpArr = tmpArr; + size_t bLen = 2; +@@ -341,7 +345,7 @@ XMLCh IconvGNUWrapper::toLower (const + xmlChToMbc (ch, wcbuf); + + char tmpArr[4]; +- char* ptr = wcbuf; ++ const char* ptr = wcbuf; + size_t len = fUChSize; + char *pTmpArr = tmpArr; + size_t bLen = 2; +@@ -373,7 +377,7 @@ bool IconvGNUWrapper::isSpace(const X + char tmpArr[4]; + + xmlChToMbc (toCheck, wcbuf); +- char* ptr = wcbuf; ++ const char* ptr = wcbuf; + size_t len = fUChSize; + char *pTmpArr = tmpArr; + size_t bLen = 2; +@@ -474,7 +478,7 @@ size_t IconvGNUWrapper::iconvFrom ( c + size_t toLen ) const + { + ICONV_LOCK; +- char ** tmpPtr = (char**)&fromPtr; ++ const char ** tmpPtr = &fromPtr; + return ::iconv (fCDFrom, tmpPtr, fromLen, toPtr, &toLen); + } + +@@ -484,7 +488,7 @@ size_t IconvGNUWrapper::iconvTo ( con + size_t toLen ) const + { + ICONV_LOCK; +- char ** tmpPtr = (char**)&fromPtr; ++ const char ** tmpPtr = &fromPtr; + return ::iconv (fCDTo, tmpPtr, fromLen, toPtr, &toLen); + } + +@@ -1051,7 +1055,7 @@ XMLCh* IconvGNULCPTranscoder::transcode( + if (*toTranscode) { + const unsigned int wLent = calcRequiredSize(toTranscode); + if (wLent == 0) { +- retVal = (XMLCh*) manager->allocate(sizeof(XMLCh));/new XMLCh[1]; ++ retVal = (XMLCh*) manager->allocate(sizeof(XMLCh));//new XMLCh[1]; + retVal[0] = 0; + return retVal; + } +@@ -1186,7 +1190,7 @@ IconvGNUTranscoder::IconvGNUTranscoder ( + , iconv_t cd_to + , size_t uchsize + , unsigned int ubo +- , MemoryManger* const manager ++ , MemoryManager* const manager + ) + : XMLTranscoder(encodingName, blockSize, manager) + , IconvGNUWrapper (cd_from, cd_to, uchsize, ubo) |