Attachment #155168 for bug #199099

Lines 2-8 Link Here

(-)audio/xmms-wavpack/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= xmms-wavpack	3	PORTNAME= xmms-wavpack
4	PORTVERSION= 1.0.3	4	PORTVERSION= 1.0.3
5	PORTREVISION= 4	5	PORTREVISION= 5
6	CATEGORIES= audio	6	CATEGORIES= audio
7	MASTER_SITES= http://www.wavpack.com/	7	MASTER_SITES= http://www.wavpack.com/
8		8
Lines 12-18 COMMENT= XMMS input plugin to play WavPa Link Here
12	LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack \	12	LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack \
13	libxmms.so:${PORTSDIR}/multimedia/xmms	13	libxmms.so:${PORTSDIR}/multimedia/xmms
14		14
15	USES= libtool pkgconfig tar:bzip2	15	USES= iconv libtool pkgconfig tar:bzip2
16	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
17	CPPFLAGS+= -I${LOCALBASE}/include	17	CPPFLAGS+= -I${LOCALBASE}/include
18	LDFLAGS+= -L${LOCALBASE}/lib	18	LDFLAGS+= -L${LOCALBASE}/lib




             float *fptr = (float *) input;
             int32_t *lptr = input;
             int cnt = tsamples;
@@ -362,7 +362,7 @@ convertUTF8toLocale(char *utf8)
     size_t in_left = strlen(utf8);
     size_t out_left = 2 * in_left + 1;
     char *buf = (char *)g_malloc(out_left);
-#if 1
+#if 0
     char *in = utf8;
 #else
     const char *in = (const char *) utf8;   // some systems (freeBSD?) require const here





PORTNAME=	libiconv
PORTVERSION=	1.14
PORTREVISION=	7
CATEGORIES=	converters devel
MASTER_SITES=	GNU



GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-static \
		--disable-nls \
		--docdir=${DOCSDIR} \
		am_cv_func_iconv=no
		am_cv_proto_iconv_arg1="const"
INSTALL_TARGET=	install-strip
MAKE_JOBS_UNSAFE=	yes
USES=		libtool

Lines 3-9 Link Here

(-)databases/kbibtex/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= kbibtex	4	PORTNAME= kbibtex
5	DISTVERSION= 0.4.1	5	DISTVERSION= 0.4.1
6	PORTREVISION= 9	6	PORTREVISION= 10
7	CATEGORIES= databases kde	7	CATEGORIES= databases kde
8	MASTER_SITES= http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\.[[:digit:]]).*,\1,}/	8	MASTER_SITES= http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\.[[:digit:]]).*,\1,}/
9		9
Lines 12-18 COMMENT= Bibliography editor for KDE Link Here
12		12
13	LIB_DEPENDS= libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4	13	LIB_DEPENDS= libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
14		14
15	USES= cmake shared-mime-info tar:bzip2	15	USES= cmake iconv shared-mime-info tar:bzip2
16	USE_GNOME= libxml2 libxslt	16	USE_GNOME= libxml2 libxslt
17	USE_KDE4= kdelibs kdeprefix automoc4	17	USE_KDE4= kdelibs kdeprefix automoc4
18	USE_QT4= qmake_build moc_build uic_build rcc_build \	18	USE_QT4= qmake_build moc_build uic_build rcc_build \

Lines 1-11 Link Here

(-)databases/kbibtex/files/patch-src__libkbibtexio__iconvlatex.cpp (-11 lines)
1	--- ./src/libkbibtexio/iconvlatex.cpp.orig 2012-05-05 10:50:42.000000000 +0000
2	+++ ./src/libkbibtexio/iconvlatex.cpp 2012-05-06 00:53:04.285249457 +0000
3	@@ -58,7 +58,7 @@
4	QByteArray IConvLaTeX::encode(const QString &input)
5	{
6	QByteArray inputByteArray = input.toUtf8();
7	-#ifdef Q_WS_WIN
8	+#ifndef Q_OS_LINUX
9	/// iconv on Windows likes to have it as const char *
10	const char *inputBuffer = inputByteArray.data();
11	#else

Lines 53-59 MAKE_ENV+= TARGET_ARCH=desktop TARGET_ST Link Here

(-)deskutils/fbreader/Makefile (-1 / +1 lines)
53	MAKE_ARGS+= MAKE=${MAKE_CMD} LIBDIR=${PREFIX}/lib	53	MAKE_ARGS+= MAKE=${MAKE_CMD} LIBDIR=${PREFIX}/lib
54		54
55	post-patch:	55	post-patch:
56	@${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DDO_ICONV_CAST -DLIBICONV_PLUG,' \	56	@${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DLIBICONV_PLUG,' \
57	-e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \	57	-e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \
58	${WRKSRC}/makefiles/arch/desktop.mk	58	${WRKSRC}/makefiles/arch/desktop.mk
59	@${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \	59	@${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \

Lines 1-11 Link Here

(-)emulators/dolphin-emu/files/patch-Source-Core-Common-Src-StringUtil.cpp (-11 lines)
1	--- Source/Core/Common/Src/StringUtil.cpp.orig 2013-03-21 06:49:23.000000000 +0100
2	+++ Source/Core/Common/Src/StringUtil.cpp 2013-03-21 06:50:08.000000000 +0100
3	@@ -460,7 +460,7 @@
4
5	while (src_bytes != 0)
6	{
7	- size_t const iconv_result = iconv(conv_desc, (char**)(&src_buffer), &src_bytes,
8	+ size_t const iconv_result = iconv(conv_desc, (const char**)(&src_buffer), &src_bytes,
9	&dst_buffer, &dst_bytes);
10
11	if ((size_t)-1 == iconv_result)




--- src/VBox/Runtime/r3/posix/utf8-posix.cpp.orig	2015-03-16 17:04:36 UTC
+++ src/VBox/Runtime/r3/posix/utf8-posix.cpp
@@ -194,7 +194,10 @@ static int rtstrConvertCached(const void
             const void *pvInputLeft = pvInput;
             void       *pvOutputLeft = pvOutput;
             size_t      cchNonRev;
-#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */
+#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) \
+ || defined(RT_OS_FREEBSD) || defined(RT_OS_DRAGONFLY) \
+ || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE))
+/* there are different opinions about the constness of the input buffer. */
             cchNonRev = iconv(hIconv, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
 #else
             cchNonRev = iconv(hIconv, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);

Lines 1-11 Link Here

(-)finance/libofx/files/patch-lib__ofx_preproc.cpp (-11 lines)
1	--- lib/ofx_preproc.cpp.orig 2014-09-12 19:26:30 UTC
2	+++ lib/ofx_preproc.cpp
3	@@ -310,7 +310,7 @@ int ofx_proc_file(LibofxContextPtr ctx,
4	size_t outbytesleft = inbytesleft * 2 - 1;
5	iconv_buffer = (char) malloc (inbytesleft 2);
6	memset(iconv_buffer, 0, inbytesleft * 2);
7	-#if defined(OS_WIN32) \|\| defined(__sun)
8	+#if defined(__FreeBSD__) \|\| defined(__DragonFly__)
9	const char * inchar = (const char *)s_buffer.c_str();
10	#else
11	char * inchar = (char *)s_buffer.c_str();

Lines 1-11 Link Here

(-)games/cuyo/files/patch-src__cuyointl.cpp (-11 lines)
1	--- src/cuyointl.cpp.orig
2	+++ src/cuyointl.cpp
3	@@ -93,7 +93,7 @@
4	return convert_error(ret,s,"Character conversion not possible.");
5
6	while (*inpos) {
7	- size_t res = iconv(handle,&inpos,&inleft,&outpos,&outleft);
8	+ size_t res = iconv(handle,(const char **)&inpos,&inleft,&outpos,&outleft);
9	if (res == (size_t) -1)
10	/* An error occured */
11	switch (errno) {




--- src/core/linux/convhelper.cpp.orig	2008-01-20 13:32:07.000000000 +0100
+++ src/core/linux/convhelper.cpp	2008-01-20 12:56:03.000000000 +0100
@@ -39,7 +39,7 @@
 #ifdef __APPLE__
 	const char *inbuf = inStr.data();
 #else
-	char *inbuf = const_cast<char *>(inStr.data());
+	const char *inbuf = const_cast<char *>(inStr.data());
 #endif
 
 	const size_t c_outsize = insize * 6; // max size of utf-8 char is 6 per input char
@@ -74,7 +74,7 @@
 #ifdef __APPLE__
 	const char *inbuf = inStr.data();
 #else
-	char *inbuf = const_cast<char *>(inStr.data());
+	const char *inbuf = const_cast<char *>(inStr.data());
 #endif
 
 	const size_t c_outsize = insize;

Line 0 Link Here

(-)games/valyriatear/files/patch-src-utils-ustring.cpp (+11 lines)
	1	--- src/utils/ustring.cpp.orig 2013-09-24 11:33:12 UTC
	2	+++ src/utils/ustring.cpp
	3	@@ -203,7 +203,7 @@ static bool UTF8ToUTF16(const char *sour
	4	return false;
	5	}
	6
	7	-#if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109) \|\| defined(__FreeBSD__)
	8	+#if defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109
	9	// We are using an iconv API that uses const char*
	10	const char *sourceChar = source;
	11	#else

Lines 1-11 Link Here

(-)graphics/iccexamin/files/patch-icc_gl.cpp (-11 lines)
1	--- icc_gl.cpp.orig 2013-05-01 21:38:55.000000000 +0400
2	+++ icc_gl.cpp 2013-05-01 21:39:28.000000000 +0400
3	@@ -191,7 +191,7 @@ void drawText( FTFont * f, const char *
4	ttmp = txt = strdup(in_txt);
5
6	iconv_t cd = iconv_open( "WCHAR_T", oy_domain_codeset );
7	- iconv( cd, &ttmp, &in_left, (char**)&wtmp, &out_left);
8	+ iconv( cd, (const char)&ttmp, &in_left, (char)&wtmp, &out_left);
9	iconv_close( cd );
10
11	drawTEXT( f, wchar );




--- ipelib/ipedoc.cpp.orig	2013-03-15 13:37:02.000000000 +0000
+++ ipelib/ipedoc.cpp
@@ -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;
 
+#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);




--- src/libs/libgroff/encoding.cc.bak	Wed Sep 10 03:45:14 2003
+++ src/libs/libgroff/encoding.cc	Wed Sep 10 11:31:11 2003
@@ -382,6 +382,9 @@
   inline wchar make_wchar(unsigned char c0, encoding_istream& eis) {
     wchar wc = 0;
     char inbuf[8], outbuf[8];
-    char *inp, *outp;
+    const char *inp;
+    char *outp;
     size_t inbytesleft, outbytesleft;
     int i = 0;
     
@@ -214,7 +215,8 @@
 
   inline int put_wchar(wchar wc, encoding_ostream& eos) {
     char inbuf[4], outbuf[4];
-    char *inp, *outp;
+    const char *inp;
+    char *outp;
     size_t inbytesleft, outbytesleft;
 
     if (!is_wchar_code(wc)) {
@@ -382,6 +384,9 @@
 #if HAVE_LANGINFO_CODESET
   charset = nl_langinfo(CODESET);
 #else

Lines 3-9 Link Here

(-)japanese/jd/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= jd	4	PORTNAME= jd
5	PORTVERSION= 2.8.8	5	PORTVERSION= 2.8.8
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= japanese www	7	CATEGORIES= japanese www
8	MASTER_SITES= SFJP	8	MASTER_SITES= SFJP
9	MASTER_SITE_SUBDIR= jd4linux/61281	9	MASTER_SITE_SUBDIR= jd4linux/61281
Lines 18-24 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
18	LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \	18	LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
19	libgcrypt.so:${PORTSDIR}/security/libgcrypt	19	libgcrypt.so:${PORTSDIR}/security/libgcrypt
20		20
21	USES= autoreconf iconv libtool tar:tgz	21	USES= autoreconf iconv:translit libtool tar:tgz
22	USE_GNOME= gtk20 gtkmm24 libgnomeui	22	USE_GNOME= gtk20 gtkmm24 libgnomeui
23		23
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes

Line 0 Link Here

(-)japanese/jd/files/patch-configure.ac (+11 lines)
	1	--- configure.ac.orig 2013-02-10 11:38:45 UTC
	2	+++ configure.ac
	3	@@ -30,7 +30,7 @@ dnl
	4	case "${host_os}" in
	5	freebsd*)
	6	echo "os = freebsd"
	7	- AC_DEFINE(ICONV_CONST, const, "iconv_const")
	8	+ AC_DEFINE(ICONV_CONST, , "iconv_const")
	9	AC_DEFINE(USE_MKTIME, , "use mktime")
	10	;;
	11	solaris*)




--- base/iconv.cc.orig	2013-03-29 13:33:43.000000000 +0900
+++ base/iconv.cc	2013-04-27 15:36:30.000000000 +0900
@@ -53,7 +53,11 @@
   size_t olen_org = olen;
   iconv(ic, 0, &ilen, 0, &olen);  // reset iconv state
   while (ilen != 0) {
+#ifdef OS_FREEBSD
+    if (iconv(ic, (const char **)(&ibuf), &ilen, &obuf, &olen)
+#else
     if (iconv(ic, reinterpret_cast<char **>(&ibuf), &ilen, &obuf, &olen)
+#endif
         == static_cast<size_t>(-1)) {
       return false;
     }




--- curses/cursesscreen.C.orig	2011-04-04 11:58:28.000000000 +0000
+++ curses/cursesscreen.C	2011-06-27 19:41:38.000000000 +0000
@@ -73,7 +73,9 @@
 	while (input_buf.size() > 0)
 	{
 
-		char *inbuf=&input_buf[0], *outbuf=&winput_buf[winput_cnt];
+		//char *inbuf=&input_buf[0], *outbuf=&winput_buf[winput_cnt];
+		const char *inbuf=&input_buf[0];
+		char *outbuf=&winput_buf[winput_cnt];
 		size_t inbytesleft=input_buf.size(),
 			outbytesleft=winput_buf.size()-winput_cnt;
 




 #include <stdlib.h> // for broadcaster stupidity workaround
 #include <string.h>
 #include "descriptor.h"
@@ -381,7 +383,11 @@ bool convertCharacterTable(const char *f
   if (SystemCharacterTable) {
      iconv_t cd = iconv_open(SystemCharacterTable, fromCode);
      if (cd != (iconv_t)-1) {
+#ifdef __FreeBSD__
+        const char *fromPtr = from;
+#else
         char *fromPtr = (char *)from;
+#endif
         while (fromLength > 0 && toLength > 1) {
            if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) {
               if (errno == EILSEQ) {




                LOG_ERROR_STR(*buf);
             close(f);
             remove(buf);
@@ -818,7 +846,11 @@
 const char *cCharSetConv::Convert(const char *From, char *To, size_t ToLength)
 {
   if (cd != (iconv_t)-1 && From && *From) {
+#ifdef __FreeBSD__
+     const char *FromPtr = (char *)From;
+#else
      char *FromPtr = (char *)From;
+#endif
      size_t FromLength = strlen(From);
      char *ToPtr = To;
      if (!ToPtr) {
@@ -920,7 +952,11 @@
   return cString(buffer, true);
 }

 #include <stdlib.h> // for broadcaster stupidity workaround
 #include <string.h>
 #include "descriptor.h"
@@ -381,7 +383,11 @@
   if (SystemCharacterTable) {
      iconv_t cd = iconv_open(SystemCharacterTable, fromCode);
      if (cd != (iconv_t)-1) {
+#ifdef __FreeBSD__
+        const char *fromPtr = from;
+#else
         char *fromPtr = (char *)from;
+#endif
         while (fromLength > 0 && toLength > 1) {
            if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) {
               if (errno == EILSEQ) {
--- PLUGINS/src/dvbsddevice/Makefile.orig
+++ PLUGINS/src/dvbsddevice/Makefile
@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)




--- SConstruct.orig	2011-04-17 17:57:09 UTC
+++ SConstruct
@@ -20,7 +20,7 @@ BUILD_LOCALE_PATH = BUILD_PATH + 'locale
 BUILD_FLAGS = {
 	'common'  : ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'],
 	'debug'   : ['-g', '-ggdb', '-Wall', '-D_DEBUG'], 

 }
 
 # ----------------------------------------------------------------------
@@ -106,6 +106,7 @@ else:
 vars.AddVariables(
 	BoolVariable('debug', 'Compile the program with debug information', 0),
 	BoolVariable('release', 'Compile the program with optimizations', 0),

 	BoolVariable('profile', 'Compile the program with profiling information', 0),
 	PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir),
 	('FAKE_ROOT', 'Make scons install the program under a fake root', '')
@@ -131,7 +132,10 @@ if os.environ.has_key('CC'):
 	env['CC'] = os.environ['CC']
 
 if os.environ.has_key('CXXFLAGS'):

 
 if os.environ.has_key('LDFLAGS'):
 	env['LINKFLAGS'] = os.environ['LDFLAGS'].split()
@@ -139,6 +143,12 @@ if os.environ.has_key('LDFLAGS'):
 if os.environ.has_key('CFLAGS'):
 	env['CFLAGS'] = os.environ['CFLAGS'].split()
 

 env['CPPDEFINES'] = [] # Initialize as a list so Append doesn't concat strings
 
 env.SConsignFile('build/sconf/.sconsign')
@@ -256,21 +266,20 @@ if not 'install' in COMMAND_LINE_TARGETS
 
 	if not conf.CheckHeader('iconv.h'):
 		Exit(1)
-	elif conf.CheckLibWithHeader('iconv', 'iconv.h', 'c', 'iconv(0, (const char **)0, 0, (char**)0, 0);'):
-		conf.env.Append(CPPDEFINES = ('ICONV_CONST', 'const'))
 
 	if conf.CheckHeader(['sys/types.h', 'sys/socket.h', 'ifaddrs.h', 'net/if.h']):
 		conf.env.Append(CPPDEFINES = 'HAVE_IFADDRS_H')
 
 	# TODO: Implement a plugin system so libnotify doesn't have compile-time dependencies

+				conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7')
 
 	conf.CheckBZRRevision()
 




--- pan/usenet-utils/mime-utils.cc.orig	2013-03-12 18:24:13.000000000 +0000
+++ pan/usenet-utils/mime-utils.cc	2013-03-12 18:25:19.000000000 +0000
@@ -77,7 +77,11 @@
       outbuf = out + converted;
       outleft = outlen - converted;
 
+#if defined(__NetBSD__) || defined(__FreeBSD__)
+      converted = iconv (cd, &inbuf, &inleft, &outbuf, &outleft);
+#else
       converted = iconv (cd, (char **) &inbuf, &inleft, &outbuf, &outleft);
+#endif
 
       if (converted != (size_t) -1 && errno == 0) {
         /*

Lines 1-11 Link Here

(-)textproc/gmetadom/files/patch-GdomeSmartDOMGdomeString.cc (-11 lines)
1	--- src/gdome_cpp_smart/basic/GdomeSmartDOMGdomeString.cc.orig Wed Apr 2 12:36:39 2003
2	+++ src/gdome_cpp_smart/basic/GdomeSmartDOMGdomeString.cc Wed Apr 2 12:37:21 2003
3	@@ -95,7 +95,7 @@
4
5	while (inBytesLeft > 0) {
6	//cout << "before: " << (void) inbuf << " " << inBytesLeft << " " << (void) outbuf << " " << outBytesLeft << endl;
7	- size_t iconv_res = iconv(cd, &inbuf, &inBytesLeft, &outbuf, &outBytesLeft);
8	+ size_t iconv_res = iconv(cd, (const char**)&inbuf, &inBytesLeft, &outbuf, &outBytesLeft);
9	//cout << "after: " << (void) inbuf << " " << inBytesLeft << " " << (void) outbuf << " " << outBytesLeft << endl;
10
11	unsigned n = outbuf - outbuf0;




 #include<iconv.h>
 #include <QTextDocument>
 
@@ -648,13 +648,8 @@
 
   inbufbytes = s.size();
   outbufbytes = s.size() * 6;
-#ifdef _WIN32
   const char *inbuf;
   inbuf = s.data();
-#else
-  char *inbuf;
-  inbuf = (char *)s.data();
-#endif
   outbuf = (char*)malloc( outbufbytes + 1 );
   memset( outbuf, '\0', outbufbytes + 1 );
   defbuf = outbuf;




--- ./iconv.cc.orig	2010-12-04 00:12:46.000000000 +0300
+++ ./iconv.cc	2010-12-28 11:46:37.208721626 +0300
@@ -44,11 +44,7 @@
   throw( exIncorrectSeq, exOther )
 {
   size_t result = iconv( state,
-                         #ifdef __WIN32
                          (char const **)&inBuf,
-                         #else
-                         (char **)&inBuf,
-                         #endif
                                            &inBytesLeft,
                          (char **)&outBuf, &outBytesLeft );
 




--- src/utils.cpp.orig	2015-02-19 10:56:59 UTC
+++ src/utils.cpp
@@ -274,7 +274,8 @@ std::string utils::convert_text(const st
 	 * of all the Unix-like systems around there, only Linux/glibc seems to
 	 * come with a SuSv3-conforming iconv implementation.
 	 */
-#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) && !defined(__OpenBSD__)
+#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) \
+ && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
 	const char * inbufp;
 #else
 	char * inbufp;

Lines 3-9 Link Here

(-)x11-wm/icewm/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= icewm	4	PORTNAME= icewm
5	PORTVERSION= 1.3.8	5	PORTVERSION= 1.3.8
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= x11-wm	7	CATEGORIES= x11-wm
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION}
9		9
Lines 12-18 COMMENT= Window Manager designed for spe Link Here
12		12
13	LICENSE= GPLv2	13	LICENSE= GPLv2
14		14
15	USES= gmake iconv pkgconfig	15	USES= gmake iconv:translit pkgconfig
16	USE_XORG= ice sm x11 xext	16	USE_XORG= ice sm x11 xext
17	USE_GNOME= gdkpixbuf2	17	USE_GNOME= gdkpixbuf2
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes




--- src/ylocale.cc.orig	2013-11-03 19:58:39.180727369 -0500
+++ src/ylocale.cc	2013-11-03 19:58:51.540725980 -0500
@@ -126,8 +126,12 @@ YLocale::~YLocale() {
 iconv_t YLocale::getConverter (const char *from, const char **&to) {
     iconv_t cd = (iconv_t) -1;
 
+    char *myfrom = (char *)malloc(1 + strlen(from));
+    strcpy(myfrom, from);
+    char *modptr = strstr(myfrom, "//");
+    if (NULL != modptr) *modptr = '\0';
     while (NULL != *to)
-        if ((iconv_t) -1 != (cd = iconv_open(*to, from))) return cd;
+        if ((iconv_t) -1 != (cd = iconv_open(*to, myfrom))) return cd;
         else ++to;
 
     return (iconv_t) -1;
@@ -149,7 +153,8 @@ YUChar *YLocale::unicodeString(const YLC
         return NULL;
 
     YUChar * uStr(new YUChar[lLen + 1]);
-    char * inbuf((char *) lStr), * outbuf((char *) uStr);
+    const char * inbuf((char *) lStr);
+    char * outbuf((char *) uStr);
     size_t inlen(lLen), outlen(4 * lLen);
 
     if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))

Lines 21-27 CONFIGURE_ARGS+=--enable-shape --enable- Link Here

(-)x11-wm/pekwm/Makefile (-1 / +1 lines)
21	--enable-xft --enable-image-xpm --enable-image-jpeg \	21	--enable-xft --enable-image-xpm --enable-image-jpeg \
22	--enable-image-png --disable-debug \	22	--enable-image-png --disable-debug \
23	--disable-pedantic	23	--disable-pedantic
24	CFLAGS+= -DICONV_CONST -I${LOCALBASE}/include	24	CFLAGS+= -I${LOCALBASE}/include
25	LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}	25	LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
26		26
27	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Return to bug 199099

Lines 18-29 Link Here

(-)audio/xmms-wavpack/files/patch-src_libwavpack.cpp (-9 lines)
18	float fptr = (float ) input;	18	float fptr = (float ) input;
19	int32_t *lptr = input;	19	int32_t *lptr = input;
20	int cnt = tsamples;	20	int cnt = tsamples;
21	@@ -362,7 +362,7 @@ convertUTF8toLocale(char *utf8)
22	size_t in_left = strlen(utf8);
23	size_t out_left = 2 * in_left + 1;
24	char buf = (char )g_malloc(out_left);
25	-#if 1
26	+#if 0
27	char *in = utf8;
28	#else
29	const char in = (const char ) utf8; // some systems (freeBSD?) require const here

Lines 3-9 Link Here

(-)converters/libiconv/Makefile (-5 / +4 lines)
3		3
4	PORTNAME= libiconv	4	PORTNAME= libiconv
5	PORTVERSION= 1.14	5	PORTVERSION= 1.14
6	PORTREVISION= 6	6	PORTREVISION= 7
7	CATEGORIES= converters devel	7	CATEGORIES= converters devel
8	MASTER_SITES= GNU	8	MASTER_SITES= GNU
9		9
Lines 12-21 COMMENT= Character set conversion librar Link Here
12		12
13	GNU_CONFIGURE= yes	13	GNU_CONFIGURE= yes
14	CONFIGURE_ARGS= --enable-static \	14	CONFIGURE_ARGS= --enable-static \
15	--without-libintl-prefix \	15	--disable-nls \
16	--docdir=${DOCSDIR}	16	--docdir=${DOCSDIR} \
17	CONFIGURE_ENV= am_cv_func_iconv="yes" \	17	am_cv_func_iconv=no
18	am_cv_proto_iconv_arg1="const"
19	INSTALL_TARGET= install-strip	18	INSTALL_TARGET= install-strip
20	MAKE_JOBS_UNSAFE= yes	19	MAKE_JOBS_UNSAFE= yes
21	USES= libtool	20	USES= libtool

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp (+14 lines)
	1	--- src/VBox/Runtime/r3/posix/utf8-posix.cpp.orig 2015-03-16 17:04:36 UTC
	2	+++ src/VBox/Runtime/r3/posix/utf8-posix.cpp
	3	@@ -194,7 +194,10 @@ static int rtstrConvertCached(const void
	4	const void *pvInputLeft = pvInput;
	5	void *pvOutputLeft = pvOutput;
	6	size_t cchNonRev;
	7	-#if defined(RT_OS_LINUX) \|\| defined(RT_OS_HAIKU) \|\| defined(RT_OS_SOLARIS) \|\| (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */
	8	+#if defined(RT_OS_LINUX) \|\| defined(RT_OS_HAIKU) \|\| defined(RT_OS_SOLARIS) \
	9	+ \|\| defined(RT_OS_FREEBSD) \|\| defined(RT_OS_DRAGONFLY) \
	10	+ \|\| (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE))
	11	+/* there are different opinions about the constness of the input buffer. */
	12	cchNonRev = iconv(hIconv, (char )&pvInputLeft, &cbInLeft, (char )&pvOutputLeft, &cbOutLeft);
	13	#else
	14	cchNonRev = iconv(hIconv, (const char )&pvInputLeft, &cbInLeft, (char )&pvOutputLeft, &cbOutLeft);

Lines 1-20 Link Here

(-)games/pokerth/files/patch-src-core-linux-convhelper.cpp (-20 lines)
1	--- src/core/linux/convhelper.cpp.orig 2008-01-20 13:32:07.000000000 +0100
2	+++ src/core/linux/convhelper.cpp 2008-01-20 12:56:03.000000000 +0100
3	@@ -39,7 +39,7 @@
4	#ifdef __APPLE__
5	const char *inbuf = inStr.data();
6	#else
7	- char inbuf = const_cast<char >(inStr.data());
8	+ const char inbuf = const_cast<char >(inStr.data());
9	#endif
10
11	const size_t c_outsize = insize * 6; // max size of utf-8 char is 6 per input char
12	@@ -74,7 +74,7 @@
13	#ifdef __APPLE__
14	const char *inbuf = inStr.data();
15	#else
16	- char inbuf = const_cast<char >(inStr.data());
17	+ const char inbuf = const_cast<char >(inStr.data());
18	#endif
19
20	const size_t c_outsize = insize;

Lines 1-23 Link Here

(-)graphics/ipe/files/patch-ipelib__ipedoc.cpp (-23 lines)
1	--- ipelib/ipedoc.cpp.orig 2013-03-15 13:37:02.000000000 +0000
2	+++ ipelib/ipedoc.cpp
3	@@ -41,6 +41,7 @@
4	#include "ipelatex.h"
5
6	#include <errno.h>
7	+#include <sys/param.h>
8
9	#ifdef IPE_USE_ICONV
10	#include <iconv.h>
11	@@ -850,7 +851,12 @@ int Document::runLatex(String &texLog)
12	if (!file)
13	return ErrWritingSource;
14
15	+#if defined(__FreeBSD__) \|\| \
16	+ (defined(__DragonFly__) && __DragonFly_version > 300502)
17	+ const char *inbuf = utf8.data();
18	+#else
19	char inbuf = (char ) utf8.data();
20	+#endif
21	size_t inbytesleft = utf8.size();
22
23	FileStream fstream(file);

Lines 1-26 Link Here

(-)japanese/groff/files/patch-src:libs:libgroff:encoding.cc (-21 / +1 lines)
1	--- src/libs/libgroff/encoding.cc.bak Wed Sep 10 03:45:14 2003	1	--- src/libs/libgroff/encoding.cc.bak Wed Sep 10 03:45:14 2003
2	+++ src/libs/libgroff/encoding.cc Wed Sep 10 11:31:11 2003	2	+++ src/libs/libgroff/encoding.cc Wed Sep 10 11:31:11 2003
3	@@ -179,7 +179,8 @@	3	@@ -382,6 +382,9 @@
4	inline wchar make_wchar(unsigned char c0, encoding_istream& eis) {
5	wchar wc = 0;
6	char inbuf[8], outbuf[8];
7	- char inp, outp;
8	+ const char *inp;
9	+ char *outp;
10	size_t inbytesleft, outbytesleft;
11	int i = 0;
12
13	@@ -214,7 +215,8 @@
14
15	inline int put_wchar(wchar wc, encoding_ostream& eos) {
16	char inbuf[4], outbuf[4];
17	- char inp, outp;
18	+ const char *inp;
19	+ char *outp;
20	size_t inbytesleft, outbytesleft;
21
22	if (!is_wchar_code(wc)) {
23	@@ -382,6 +384,9 @@
24	#if HAVE_LANGINFO_CODESET	4	#if HAVE_LANGINFO_CODESET
25	charset = nl_langinfo(CODESET);	5	charset = nl_langinfo(CODESET);
26	#else	6	#else

Lines 1-14 Link Here

(-)japanese/mozc-server/files/patch-base_iconv.cc (-14 lines)
1	--- base/iconv.cc.orig 2013-03-29 13:33:43.000000000 +0900
2	+++ base/iconv.cc 2013-04-27 15:36:30.000000000 +0900
3	@@ -53,7 +53,11 @@
4	size_t olen_org = olen;
5	iconv(ic, 0, &ilen, 0, &olen); // reset iconv state
6	while (ilen != 0) {
7	+#ifdef OS_FREEBSD
8	+ if (iconv(ic, (const char **)(&ibuf), &ilen, &obuf, &olen)
9	+#else
10	if (iconv(ic, reinterpret_cast<char **>(&ibuf), &ilen, &obuf, &olen)
11	+#endif
12	== static_cast<size_t>(-1)) {
13	return false;
14	}

Lines 1-13 Link Here

(-)mail/cone/files/patch-curses-cursesscreen.diff (-13 lines)
1	--- curses/cursesscreen.C.orig 2011-04-04 11:58:28.000000000 +0000
2	+++ curses/cursesscreen.C 2011-06-27 19:41:38.000000000 +0000
3	@@ -73,7 +73,9 @@
4	while (input_buf.size() > 0)
5	{
6
7	- char inbuf=&input_buf[0], outbuf=&winput_buf[winput_cnt];
8	+ //char inbuf=&input_buf[0], outbuf=&winput_buf[winput_cnt];
9	+ const char *inbuf=&input_buf[0];
10	+ char *outbuf=&winput_buf[winput_cnt];
11	size_t inbytesleft=input_buf.size(),
12	outbytesleft=winput_buf.size()-winput_cnt;
13

Lines 10-24 Link Here

(-)multimedia/naludump/files/patch-libsi-si.c (-12 lines)
10	#include <stdlib.h> // for broadcaster stupidity workaround	10	#include <stdlib.h> // for broadcaster stupidity workaround
11	#include <string.h>	11	#include <string.h>
12	#include "descriptor.h"	12	#include "descriptor.h"
13	@@ -381,7 +383,11 @@ bool convertCharacterTable(const char *f
14	if (SystemCharacterTable) {
15	iconv_t cd = iconv_open(SystemCharacterTable, fromCode);
16	if (cd != (iconv_t)-1) {
17	+#ifdef __FreeBSD__
18	+ const char *fromPtr = from;
19	+#else
20	char fromPtr = (char )from;
21	+#endif
22	while (fromLength > 0 && toLength > 1) {
23	if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) {
24	if (errno == EILSEQ) {

Lines 711-728 diff -u -r1.1.1.5 -r1.8 Link Here

(-)multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD (-24 lines)
711	LOG_ERROR_STR(*buf);	711	LOG_ERROR_STR(*buf);
712	close(f);	712	close(f);
713	remove(buf);	713	remove(buf);
714	@@ -818,7 +846,11 @@
715	const char cCharSetConv::Convert(const char From, char *To, size_t ToLength)
716	{
717	if (cd != (iconv_t)-1 && From && *From) {
718	+#ifdef __FreeBSD__
719	+ const char FromPtr = (char )From;
720	+#else
721	char FromPtr = (char )From;
722	+#endif
723	size_t FromLength = strlen(From);
724	char *ToPtr = To;
725	if (!ToPtr) {
726	@@ -920,7 +952,11 @@	714	@@ -920,7 +952,11 @@
727	return cString(buffer, true);	715	return cString(buffer, true);
728	}	716	}
Lines 1003-1020 diff -u -r1.1.1.4 -r1.7 Link Here
1003	#include <stdlib.h> // for broadcaster stupidity workaround	991	#include <stdlib.h> // for broadcaster stupidity workaround
1004	#include <string.h>	992	#include <string.h>
1005	#include "descriptor.h"	993	#include "descriptor.h"
1006	@@ -381,7 +383,11 @@
1007	if (SystemCharacterTable) {
1008	iconv_t cd = iconv_open(SystemCharacterTable, fromCode);
1009	if (cd != (iconv_t)-1) {
1010	+#ifdef __FreeBSD__
1011	+ const char *fromPtr = from;
1012	+#else
1013	char fromPtr = (char )from;
1014	+#endif
1015	while (fromLength > 0 && toLength > 1) {
1016	if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) {
1017	if (errno == EILSEQ) {
1018	--- PLUGINS/src/dvbsddevice/Makefile.orig	994	--- PLUGINS/src/dvbsddevice/Makefile.orig
1019	+++ PLUGINS/src/dvbsddevice/Makefile	995	+++ PLUGINS/src/dvbsddevice/Makefile
1020	@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)	996	@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)

Lines 1-6 Link Here

(-)net-p2p/linuxdcpp/files/patch-SConstruct (-7 / +15 lines)
1	--- SConstruct.orig 2011-04-18 01:57:09.000000000 +0800	1	--- SConstruct.orig 2011-04-17 17:57:09 UTC
2	+++ SConstruct 2011-10-19 23:42:24.000000000 +0800	2	+++ SConstruct
3	@@ -20,7 +20,7 @@	3	@@ -20,7 +20,7 @@ BUILD_LOCALE_PATH = BUILD_PATH + 'locale
4	BUILD_FLAGS = {	4	BUILD_FLAGS = {
5	'common' : ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'],	5	'common' : ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'],
6	'debug' : ['-g', '-ggdb', '-Wall', '-D_DEBUG'],	6	'debug' : ['-g', '-ggdb', '-Wall', '-D_DEBUG'],
Lines 9-15 Link Here
9	}	9	}
10		10
11	# ----------------------------------------------------------------------	11	# ----------------------------------------------------------------------
12	@@ -106,6 +106,7 @@	12	@@ -106,6 +106,7 @@ else:
13	vars.AddVariables(	13	vars.AddVariables(
14	BoolVariable('debug', 'Compile the program with debug information', 0),	14	BoolVariable('debug', 'Compile the program with debug information', 0),
15	BoolVariable('release', 'Compile the program with optimizations', 0),	15	BoolVariable('release', 'Compile the program with optimizations', 0),
Lines 17-23 Link Here
17	BoolVariable('profile', 'Compile the program with profiling information', 0),	17	BoolVariable('profile', 'Compile the program with profiling information', 0),
18	PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir),	18	PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir),
19	('FAKE_ROOT', 'Make scons install the program under a fake root', '')	19	('FAKE_ROOT', 'Make scons install the program under a fake root', '')
20	@@ -131,7 +131,10 @@	20	@@ -131,7 +132,10 @@ if os.environ.has_key('CC'):
21	env['CC'] = os.environ['CC']	21	env['CC'] = os.environ['CC']
22		22
23	if os.environ.has_key('CXXFLAGS'):	23	if os.environ.has_key('CXXFLAGS'):
Lines 29-35 Link Here
29		29
30	if os.environ.has_key('LDFLAGS'):	30	if os.environ.has_key('LDFLAGS'):
31	env['LINKFLAGS'] = os.environ['LDFLAGS'].split()	31	env['LINKFLAGS'] = os.environ['LDFLAGS'].split()
32	@@ -139,6 +140,12 @@	32	@@ -139,6 +143,12 @@ if os.environ.has_key('LDFLAGS'):
33	if os.environ.has_key('CFLAGS'):	33	if os.environ.has_key('CFLAGS'):
34	env['CFLAGS'] = os.environ['CFLAGS'].split()	34	env['CFLAGS'] = os.environ['CFLAGS'].split()
35		35
Lines 42-48 Link Here
42	env['CPPDEFINES'] = [] # Initialize as a list so Append doesn't concat strings	42	env['CPPDEFINES'] = [] # Initialize as a list so Append doesn't concat strings
43		43
44	env.SConsignFile('build/sconf/.sconsign')	44	env.SConsignFile('build/sconf/.sconsign')
45	@@ -263,14 +270,15 @@	45	@@ -256,21 +266,20 @@ if not 'install' in COMMAND_LINE_TARGETS
		46
		47	if not conf.CheckHeader('iconv.h'):
		48	Exit(1)
		49	- elif conf.CheckLibWithHeader('iconv', 'iconv.h', 'c', 'iconv(0, (const char )0, 0, (char)0, 0);'):
		50	- conf.env.Append(CPPDEFINES = ('ICONV_CONST', 'const'))
		51
		52	if conf.CheckHeader(['sys/types.h', 'sys/socket.h', 'ifaddrs.h', 'net/if.h']):
46	conf.env.Append(CPPDEFINES = 'HAVE_IFADDRS_H')	53	conf.env.Append(CPPDEFINES = 'HAVE_IFADDRS_H')
47		54
48	# TODO: Implement a plugin system so libnotify doesn't have compile-time dependencies	55	# TODO: Implement a plugin system so libnotify doesn't have compile-time dependencies
Lines 65-67 Link Here
65	+ conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7')	72	+ conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7')
66		73
67	conf.CheckBZRRevision()	74	conf.CheckBZRRevision()
		75

Lines 1-14 Link Here

(-)news/pan/files/patch-pan_usenet-utils_mime-utils.cc (-14 lines)
1	--- pan/usenet-utils/mime-utils.cc.orig 2013-03-12 18:24:13.000000000 +0000
2	+++ pan/usenet-utils/mime-utils.cc 2013-03-12 18:25:19.000000000 +0000
3	@@ -77,7 +77,11 @@
4	outbuf = out + converted;
5	outleft = outlen - converted;
6
7	+#if defined(__NetBSD__) \|\| defined(__FreeBSD__)
8	+ converted = iconv (cd, &inbuf, &inleft, &outbuf, &outleft);
9	+#else
10	converted = iconv (cd, (char **) &inbuf, &inleft, &outbuf, &outleft);
11	+#endif
12
13	if (converted != (size_t) -1 && errno == 0) {
14	/*

Lines 8-24 Link Here

(-)textproc/goldendict/files/patch-bgl_babylon.cc (-14 lines)
8	#include<iconv.h>	8	#include<iconv.h>
9	#include <QTextDocument>	9	#include <QTextDocument>
10		10
11	@@ -648,13 +648,8 @@
12
13	inbufbytes = s.size();
14	outbufbytes = s.size() * 6;
15	-#ifdef _WIN32
16	const char *inbuf;
17	inbuf = s.data();
18	-#else
19	- char *inbuf;
20	- inbuf = (char *)s.data();
21	-#endif
22	outbuf = (char*)malloc( outbufbytes + 1 );
23	memset( outbuf, '\0', outbufbytes + 1 );
24	defbuf = outbuf;

Lines 1-14 Link Here

(-)textproc/goldendict/files/patch-iconv.cc (-14 lines)
1	--- ./iconv.cc.orig 2010-12-04 00:12:46.000000000 +0300
2	+++ ./iconv.cc 2010-12-28 11:46:37.208721626 +0300
3	@@ -44,11 +44,7 @@
4	throw( exIncorrectSeq, exOther )
5	{
6	size_t result = iconv( state,
7	- #ifdef __WIN32
8	(char const **)&inBuf,
9	- #else
10	- (char **)&inBuf,
11	- #endif
12	&inBytesLeft,
13	(char **)&outBuf, &outBytesLeft );
14

Line 0 Link Here

(-)www/newsbeuter/files/patch-src-utils.cpp (+12 lines)
	1	--- src/utils.cpp.orig 2015-02-19 10:56:59 UTC
	2	+++ src/utils.cpp
	3	@@ -274,7 +274,8 @@ std::string utils::convert_text(const st
	4	* of all the Unix-like systems around there, only Linux/glibc seems to
	5	* come with a SuSv3-conforming iconv implementation.
	6	*/
	7	-#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) && !defined(__OpenBSD__)
	8	+#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) \
	9	+ && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
	10	const char * inbufp;
	11	#else
	12	char * inbufp;

Lines 1-26 Link Here

(-)x11-wm/icewm/files/patch-src_ylocale.cc (-26 lines)
1	--- src/ylocale.cc.orig 2013-11-03 19:58:39.180727369 -0500
2	+++ src/ylocale.cc 2013-11-03 19:58:51.540725980 -0500
3	@@ -126,8 +126,12 @@ YLocale::~YLocale() {
4	iconv_t YLocale::getConverter (const char from, const char *&to) {
5	iconv_t cd = (iconv_t) -1;
6
7	+ char myfrom = (char )malloc(1 + strlen(from));
8	+ strcpy(myfrom, from);
9	+ char *modptr = strstr(myfrom, "//");
10	+ if (NULL != modptr) *modptr = '\0';
11	while (NULL != *to)
12	- if ((iconv_t) -1 != (cd = iconv_open(*to, from))) return cd;
13	+ if ((iconv_t) -1 != (cd = iconv_open(*to, myfrom))) return cd;
14	else ++to;
15
16	return (iconv_t) -1;
17	@@ -149,7 +153,8 @@ YUChar *YLocale::unicodeString(const YLC
18	return NULL;
19
20	YUChar * uStr(new YUChar[lLen + 1]);
21	- char * inbuf((char ) lStr), outbuf((char *) uStr);
22	+ const char * inbuf((char *) lStr);
23	+ char * outbuf((char *) uStr);
24	size_t inlen(lLen), outlen(4 * lLen);
25
26	if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))