FreeBSD Bugzilla – Attachment 155168 Details for
Bug 199099
[exp-run] remove const from iconv(3) prototype
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
ports patch2
iconvports.patch (text/plain), 27.28 KB, created by
Tijl Coosemans
on 2015-04-03 20:03:45 UTC
(
hide
)
Description:
ports patch2
Filename:
MIME Type:
Creator:
Tijl Coosemans
Created:
2015-04-03 20:03:45 UTC
Size:
27.28 KB
patch
obsolete
>Index: audio/xmms-wavpack/Makefile >=================================================================== >--- audio/xmms-wavpack/Makefile (revision 383141) >+++ audio/xmms-wavpack/Makefile (working copy) >@@ -2,7 +2,7 @@ > > PORTNAME= xmms-wavpack > PORTVERSION= 1.0.3 >-PORTREVISION= 4 >+PORTREVISION= 5 > CATEGORIES= audio > MASTER_SITES= http://www.wavpack.com/ > >@@ -12,7 +12,7 @@ COMMENT= XMMS input plugin to play WavPa > LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack \ > libxmms.so:${PORTSDIR}/multimedia/xmms > >-USES= libtool pkgconfig tar:bzip2 >+USES= iconv libtool pkgconfig tar:bzip2 > GNU_CONFIGURE= yes > CPPFLAGS+= -I${LOCALBASE}/include > LDFLAGS+= -L${LOCALBASE}/lib >Index: audio/xmms-wavpack/files/patch-src_libwavpack.cpp >=================================================================== >--- audio/xmms-wavpack/files/patch-src_libwavpack.cpp (revision 383141) >+++ audio/xmms-wavpack/files/patch-src_libwavpack.cpp (working copy) >@@ -18,12 +18,3 @@ > 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 >Index: converters/libiconv/Makefile >=================================================================== >--- converters/libiconv/Makefile (revision 383141) >+++ converters/libiconv/Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= libiconv > PORTVERSION= 1.14 >-PORTREVISION= 6 >+PORTREVISION= 7 > CATEGORIES= converters devel > MASTER_SITES= GNU > >@@ -12,10 +12,9 @@ COMMENT= Character set conversion librar > > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --enable-static \ >- --without-libintl-prefix \ >- --docdir=${DOCSDIR} >-CONFIGURE_ENV= am_cv_func_iconv="yes" \ >- am_cv_proto_iconv_arg1="const" >+ --disable-nls \ >+ --docdir=${DOCSDIR} \ >+ am_cv_func_iconv=no > INSTALL_TARGET= install-strip > MAKE_JOBS_UNSAFE= yes > USES= libtool >Index: databases/kbibtex/Makefile >=================================================================== >--- databases/kbibtex/Makefile (revision 383141) >+++ databases/kbibtex/Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= kbibtex > DISTVERSION= 0.4.1 >-PORTREVISION= 9 >+PORTREVISION= 10 > CATEGORIES= databases kde > MASTER_SITES= http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\.[[:digit:]]).*,\1,}/ > >@@ -12,7 +12,7 @@ COMMENT= Bibliography editor for KDE > > LIB_DEPENDS= libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 > >-USES= cmake shared-mime-info tar:bzip2 >+USES= cmake iconv shared-mime-info tar:bzip2 > USE_GNOME= libxml2 libxslt > USE_KDE4= kdelibs kdeprefix automoc4 > USE_QT4= qmake_build moc_build uic_build rcc_build \ >Index: databases/kbibtex/files/patch-src__libkbibtexio__iconvlatex.cpp >=================================================================== >--- databases/kbibtex/files/patch-src__libkbibtexio__iconvlatex.cpp (revision 383141) >+++ databases/kbibtex/files/patch-src__libkbibtexio__iconvlatex.cpp (working copy) >@@ -1,11 +0,0 @@ >---- ./src/libkbibtexio/iconvlatex.cpp.orig 2012-05-05 10:50:42.000000000 +0000 >-+++ ./src/libkbibtexio/iconvlatex.cpp 2012-05-06 00:53:04.285249457 +0000 >-@@ -58,7 +58,7 @@ >- QByteArray IConvLaTeX::encode(const QString &input) >- { >- QByteArray inputByteArray = input.toUtf8(); >--#ifdef Q_WS_WIN >-+#ifndef Q_OS_LINUX >- /// iconv on Windows likes to have it as const char * >- const char *inputBuffer = inputByteArray.data(); >- #else >Index: deskutils/fbreader/Makefile >=================================================================== >--- deskutils/fbreader/Makefile (revision 383141) >+++ deskutils/fbreader/Makefile (working copy) >@@ -53,7 +53,7 @@ MAKE_ENV+= TARGET_ARCH=desktop TARGET_ST > MAKE_ARGS+= MAKE=${MAKE_CMD} LIBDIR=${PREFIX}/lib > > post-patch: >- @${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DDO_ICONV_CAST -DLIBICONV_PLUG,' \ >+ @${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DLIBICONV_PLUG,' \ > -e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \ > ${WRKSRC}/makefiles/arch/desktop.mk > @${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \ >Index: emulators/dolphin-emu/files/patch-Source-Core-Common-Src-StringUtil.cpp >=================================================================== >--- emulators/dolphin-emu/files/patch-Source-Core-Common-Src-StringUtil.cpp (revision 383141) >+++ emulators/dolphin-emu/files/patch-Source-Core-Common-Src-StringUtil.cpp (working copy) >@@ -1,11 +0,0 @@ >---- Source/Core/Common/Src/StringUtil.cpp.orig 2013-03-21 06:49:23.000000000 +0100 >-+++ Source/Core/Common/Src/StringUtil.cpp 2013-03-21 06:50:08.000000000 +0100 >-@@ -460,7 +460,7 @@ >- >- while (src_bytes != 0) >- { >-- size_t const iconv_result = iconv(conv_desc, (char**)(&src_buffer), &src_bytes, >-+ size_t const iconv_result = iconv(conv_desc, (const char**)(&src_buffer), &src_bytes, >- &dst_buffer, &dst_bytes); >- >- if ((size_t)-1 == iconv_result) >Index: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp >=================================================================== >--- emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp (revision 0) >+++ emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp (working copy) >@@ -0,0 +1,14 @@ >+--- 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); > >Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: finance/libofx/files/patch-lib__ofx_preproc.cpp >=================================================================== >--- finance/libofx/files/patch-lib__ofx_preproc.cpp (revision 383141) >+++ finance/libofx/files/patch-lib__ofx_preproc.cpp (working copy) >@@ -1,11 +0,0 @@ >---- lib/ofx_preproc.cpp.orig 2014-09-12 19:26:30 UTC >-+++ lib/ofx_preproc.cpp >-@@ -310,7 +310,7 @@ int ofx_proc_file(LibofxContextPtr ctx, >- size_t outbytesleft = inbytesleft * 2 - 1; >- iconv_buffer = (char*) malloc (inbytesleft * 2); >- memset(iconv_buffer, 0, inbytesleft * 2); >--#if defined(OS_WIN32) || defined(__sun) >-+#if defined(__FreeBSD__) || defined(__DragonFly__) >- const char * inchar = (const char *)s_buffer.c_str(); >- #else >- char * inchar = (char *)s_buffer.c_str(); >Index: games/cuyo/files/patch-src__cuyointl.cpp >=================================================================== >--- games/cuyo/files/patch-src__cuyointl.cpp (revision 383141) >+++ games/cuyo/files/patch-src__cuyointl.cpp (working copy) >@@ -1,11 +0,0 @@ >---- src/cuyointl.cpp.orig >-+++ src/cuyointl.cpp >-@@ -93,7 +93,7 @@ >- return convert_error(ret,s,"Character conversion not possible."); >- >- while (*inpos) { >-- size_t res = iconv(handle,&inpos,&inleft,&outpos,&outleft); >-+ size_t res = iconv(handle,(const char **)&inpos,&inleft,&outpos,&outleft); >- if (res == (size_t) -1) >- /* An error occured */ >- switch (errno) { >Index: games/pokerth/files/patch-src-core-linux-convhelper.cpp >=================================================================== >--- games/pokerth/files/patch-src-core-linux-convhelper.cpp (revision 383141) >+++ games/pokerth/files/patch-src-core-linux-convhelper.cpp (working copy) >@@ -1,20 +0,0 @@ >---- 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; >Index: games/valyriatear/files/patch-src-utils-ustring.cpp >=================================================================== >--- games/valyriatear/files/patch-src-utils-ustring.cpp (revision 0) >+++ games/valyriatear/files/patch-src-utils-ustring.cpp (working copy) >@@ -0,0 +1,11 @@ >+--- src/utils/ustring.cpp.orig 2013-09-24 11:33:12 UTC >++++ src/utils/ustring.cpp >+@@ -203,7 +203,7 @@ static bool UTF8ToUTF16(const char *sour >+ return false; >+ } >+ >+-#if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109) || defined(__FreeBSD__) >++#if defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109 >+ // We are using an iconv API that uses const char* >+ const char *sourceChar = source; >+ #else > >Property changes on: games/valyriatear/files/patch-src-utils-ustring.cpp >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: graphics/iccexamin/files/patch-icc_gl.cpp >=================================================================== >--- graphics/iccexamin/files/patch-icc_gl.cpp (revision 383141) >+++ graphics/iccexamin/files/patch-icc_gl.cpp (working copy) >@@ -1,11 +0,0 @@ >---- icc_gl.cpp.orig 2013-05-01 21:38:55.000000000 +0400 >-+++ icc_gl.cpp 2013-05-01 21:39:28.000000000 +0400 >-@@ -191,7 +191,7 @@ void drawText( FTFont * f, const char * >- ttmp = txt = strdup(in_txt); >- >- iconv_t cd = iconv_open( "WCHAR_T", oy_domain_codeset ); >-- iconv( cd, &ttmp, &in_left, (char**)&wtmp, &out_left); >-+ iconv( cd, (const char**)&ttmp, &in_left, (char**)&wtmp, &out_left); >- iconv_close( cd ); >- >- drawTEXT( f, wchar ); >Index: graphics/ipe/files/patch-ipelib__ipedoc.cpp >=================================================================== >--- graphics/ipe/files/patch-ipelib__ipedoc.cpp (revision 383141) >+++ graphics/ipe/files/patch-ipelib__ipedoc.cpp (working copy) >@@ -1,23 +0,0 @@ >---- 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); >Index: japanese/groff/files/patch-src:libs:libgroff:encoding.cc >=================================================================== >--- japanese/groff/files/patch-src:libs:libgroff:encoding.cc (revision 383141) >+++ japanese/groff/files/patch-src:libs:libgroff:encoding.cc (working copy) >@@ -1,26 +1,6 @@ > --- 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 >-@@ -179,7 +179,8 @@ >- 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 @@ >+@@ -382,6 +382,9 @@ > #if HAVE_LANGINFO_CODESET > charset = nl_langinfo(CODESET); > #else >Index: japanese/jd/Makefile >=================================================================== >--- japanese/jd/Makefile (revision 383141) >+++ japanese/jd/Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= jd > PORTVERSION= 2.8.8 >-PORTREVISION= 4 >+PORTREVISION= 5 > CATEGORIES= japanese www > MASTER_SITES= SFJP > MASTER_SITE_SUBDIR= jd4linux/61281 >@@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING > LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ > libgcrypt.so:${PORTSDIR}/security/libgcrypt > >-USES= autoreconf iconv libtool tar:tgz >+USES= autoreconf iconv:translit libtool tar:tgz > USE_GNOME= gtk20 gtkmm24 libgnomeui > > GNU_CONFIGURE= yes >Index: japanese/jd/files/patch-configure.ac >=================================================================== >--- japanese/jd/files/patch-configure.ac (revision 0) >+++ japanese/jd/files/patch-configure.ac (working copy) >@@ -0,0 +1,11 @@ >+--- configure.ac.orig 2013-02-10 11:38:45 UTC >++++ configure.ac >+@@ -30,7 +30,7 @@ dnl >+ case "${host_os}" in >+ freebsd*) >+ echo "os = freebsd" >+- AC_DEFINE(ICONV_CONST, const, "iconv_const") >++ AC_DEFINE(ICONV_CONST, , "iconv_const") >+ AC_DEFINE(USE_MKTIME, , "use mktime") >+ ;; >+ solaris*) > >Property changes on: japanese/jd/files/patch-configure.ac >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: japanese/mozc-server/files/patch-base_iconv.cc >=================================================================== >--- japanese/mozc-server/files/patch-base_iconv.cc (revision 383141) >+++ japanese/mozc-server/files/patch-base_iconv.cc (working copy) >@@ -1,14 +0,0 @@ >---- 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; >- } >Index: mail/cone/files/patch-curses-cursesscreen.diff >=================================================================== >--- mail/cone/files/patch-curses-cursesscreen.diff (revision 383141) >+++ mail/cone/files/patch-curses-cursesscreen.diff (working copy) >@@ -1,13 +0,0 @@ >---- 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; >- >Index: multimedia/naludump/files/patch-libsi-si.c >=================================================================== >--- multimedia/naludump/files/patch-libsi-si.c (revision 383141) >+++ multimedia/naludump/files/patch-libsi-si.c (working copy) >@@ -10,15 +10,3 @@ > #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) { >Index: multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD >=================================================================== >--- multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD (revision 383141) >+++ multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD (working copy) >@@ -711,18 +711,6 @@ diff -u -r1.1.1.5 -r1.8 > 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); > } >@@ -1003,18 +991,6 @@ diff -u -r1.1.1.4 -r1.7 > #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) >Index: net-p2p/linuxdcpp/files/patch-SConstruct >=================================================================== >--- net-p2p/linuxdcpp/files/patch-SConstruct (revision 383141) >+++ net-p2p/linuxdcpp/files/patch-SConstruct (working copy) >@@ -1,6 +1,6 @@ >---- SConstruct.orig 2011-04-18 01:57:09.000000000 +0800 >-+++ SConstruct 2011-10-19 23:42:24.000000000 +0800 >-@@ -20,7 +20,7 @@ >+--- 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'], >@@ -9,7 +9,7 @@ > } > > # ---------------------------------------------------------------------- >-@@ -106,6 +106,7 @@ >+@@ -106,6 +106,7 @@ else: > vars.AddVariables( > BoolVariable('debug', 'Compile the program with debug information', 0), > BoolVariable('release', 'Compile the program with optimizations', 0), >@@ -17,7 +17,7 @@ > 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 +131,10 @@ >+@@ -131,7 +132,10 @@ if os.environ.has_key('CC'): > env['CC'] = os.environ['CC'] > > if os.environ.has_key('CXXFLAGS'): >@@ -29,7 +29,7 @@ > > if os.environ.has_key('LDFLAGS'): > env['LINKFLAGS'] = os.environ['LDFLAGS'].split() >-@@ -139,6 +140,12 @@ >+@@ -139,6 +143,12 @@ if os.environ.has_key('LDFLAGS'): > if os.environ.has_key('CFLAGS'): > env['CFLAGS'] = os.environ['CFLAGS'].split() > >@@ -42,7 +42,14 @@ > env['CPPDEFINES'] = [] # Initialize as a list so Append doesn't concat strings > > env.SConsignFile('build/sconf/.sconsign') >-@@ -263,14 +270,15 @@ >+@@ -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 >@@ -65,3 +72,4 @@ > + conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7') > > conf.CheckBZRRevision() >+ >Index: news/pan/files/patch-pan_usenet-utils_mime-utils.cc >=================================================================== >--- news/pan/files/patch-pan_usenet-utils_mime-utils.cc (revision 383141) >+++ news/pan/files/patch-pan_usenet-utils_mime-utils.cc (working copy) >@@ -1,14 +0,0 @@ >---- 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) { >- /* >Index: textproc/gmetadom/files/patch-GdomeSmartDOMGdomeString.cc >=================================================================== >--- textproc/gmetadom/files/patch-GdomeSmartDOMGdomeString.cc (revision 383141) >+++ textproc/gmetadom/files/patch-GdomeSmartDOMGdomeString.cc (working copy) >@@ -1,11 +0,0 @@ >---- src/gdome_cpp_smart/basic/GdomeSmartDOMGdomeString.cc.orig Wed Apr 2 12:36:39 2003 >-+++ src/gdome_cpp_smart/basic/GdomeSmartDOMGdomeString.cc Wed Apr 2 12:37:21 2003 >-@@ -95,7 +95,7 @@ >- >- while (inBytesLeft > 0) { >- //cout << "before: " << (void*) inbuf << " " << inBytesLeft << " " << (void*) outbuf << " " << outBytesLeft << endl; >-- size_t iconv_res = iconv(cd, &inbuf, &inBytesLeft, &outbuf, &outBytesLeft); >-+ size_t iconv_res = iconv(cd, (const char**)&inbuf, &inBytesLeft, &outbuf, &outBytesLeft); >- //cout << "after: " << (void*) inbuf << " " << inBytesLeft << " " << (void*) outbuf << " " << outBytesLeft << endl; >- >- unsigned n = outbuf - outbuf0; >Index: textproc/goldendict/files/patch-bgl_babylon.cc >=================================================================== >--- textproc/goldendict/files/patch-bgl_babylon.cc (revision 383141) >+++ textproc/goldendict/files/patch-bgl_babylon.cc (working copy) >@@ -8,17 +8,3 @@ > #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; >Index: textproc/goldendict/files/patch-iconv.cc >=================================================================== >--- textproc/goldendict/files/patch-iconv.cc (revision 383141) >+++ textproc/goldendict/files/patch-iconv.cc (working copy) >@@ -1,14 +0,0 @@ >---- ./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 ); >- >Index: www/newsbeuter/files/patch-src-utils.cpp >=================================================================== >--- www/newsbeuter/files/patch-src-utils.cpp (revision 0) >+++ www/newsbeuter/files/patch-src-utils.cpp (working copy) >@@ -0,0 +1,12 @@ >+--- 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; > >Property changes on: www/newsbeuter/files/patch-src-utils.cpp >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: x11-wm/icewm/Makefile >=================================================================== >--- x11-wm/icewm/Makefile (revision 383141) >+++ x11-wm/icewm/Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= icewm > PORTVERSION= 1.3.8 >-PORTREVISION= 1 >+PORTREVISION= 2 > CATEGORIES= x11-wm > MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION} > >@@ -12,7 +12,7 @@ COMMENT= Window Manager designed for spe > > LICENSE= GPLv2 > >-USES= gmake iconv pkgconfig >+USES= gmake iconv:translit pkgconfig > USE_XORG= ice sm x11 xext > USE_GNOME= gdkpixbuf2 > GNU_CONFIGURE= yes >Index: x11-wm/icewm/files/patch-src_ylocale.cc >=================================================================== >--- x11-wm/icewm/files/patch-src_ylocale.cc (revision 383141) >+++ x11-wm/icewm/files/patch-src_ylocale.cc (working copy) >@@ -1,26 +0,0 @@ >---- 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)) >Index: x11-wm/pekwm/Makefile >=================================================================== >--- x11-wm/pekwm/Makefile (revision 383141) >+++ x11-wm/pekwm/Makefile (working copy) >@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=--enable-shape --enable- > --enable-xft --enable-image-xpm --enable-image-jpeg \ > --enable-image-png --disable-debug \ > --disable-pedantic >-CFLAGS+= -DICONV_CONST -I${LOCALBASE}/include >+CFLAGS+= -I${LOCALBASE}/include > LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} > > .include <bsd.port.mk>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 199099
:
155100
|
155101
|
155168
|
155184
|
155201
|
155205
|
155228
|
155413
|
155482
|
155505
|
155544
|
155545