Date: Wed, 7 Aug 2013 13:59:56 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324353 - in head/editors/xmlcopyeditor: . files Message-ID: <201308071359.r77Dxuaq032603@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Wed Aug 7 13:59:55 2013 New Revision: 324353 URL: http://svnweb.freebsd.org/changeset/ports/324353 Log: - Fix build with clang Added: head/editors/xmlcopyeditor/files/patch-src_housestyle.h (contents, props changed) head/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp (contents, props changed) head/editors/xmlcopyeditor/files/patch-src_xmlschemagenerator.cpp (contents, props changed) Modified: head/editors/xmlcopyeditor/Makefile Modified: head/editors/xmlcopyeditor/Makefile ============================================================================== --- head/editors/xmlcopyeditor/Makefile Wed Aug 7 13:20:32 2013 (r324352) +++ head/editors/xmlcopyeditor/Makefile Wed Aug 7 13:59:55 2013 (r324353) @@ -17,12 +17,7 @@ WX_COMPS= wx contrib WX_CONF_ARGS= absolute WX_UNICODE= yes USES= gettext -USE_DOS2UNIX= src/templates/DTD.dtd \ - src/templates/OpenLearn_document.xml \ - src/rng/docbookxi.rnc \ - src/rng/tei_all.rnc \ - src/rng/xhtml-strict.rng \ - src/rng/xhtml.rng +USE_DOS2UNIX= yes BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs LIB_DEPENDS= xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \ Added: head/editors/xmlcopyeditor/files/patch-src_housestyle.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/xmlcopyeditor/files/patch-src_housestyle.h Wed Aug 7 13:59:55 2013 (r324353) @@ -0,0 +1,13 @@ +--- src/housestyle.h.orig 2013-08-07 15:30:44.000000000 +0200 ++++ src/housestyle.h 2013-08-07 15:31:08.000000000 +0200 +@@ -68,8 +68,9 @@ + filterDirectory, + filterFile, + pathSeparator, +- error, ++ error + #ifdef __WXMSW__ ++ , + aspellDataPath, + aspellDictPath + #endif Added: head/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp Wed Aug 7 13:59:55 2013 (r324353) @@ -0,0 +1,45 @@ +--- src/xmlcopyeditor.cpp.orig 2013-08-07 15:31:32.000000000 +0200 ++++ src/xmlcopyeditor.cpp 2013-08-07 15:35:13.000000000 +0200 +@@ -2887,7 +2887,7 @@ + + const int arraySize = templateArray.GetCount(); + +- wxString choiceArray[arraySize + 1]; ++ wxString *choiceArray = new wxString[arraySize + 1]; + for ( int i = 0; i < arraySize; ++i ) + * ( choiceArray + i ) = templateArray.Item ( i ); + +@@ -2901,6 +2901,7 @@ + return; + } + typeSelection = scd.GetStringSelection(); ++ delete [] choiceArray; + } + + if ( typeSelection == defaultSelection ) +@@ -4384,20 +4385,23 @@ + encodingVector.push_back ( _T ( "ISO-8859-1" ) ); + encodingVector.push_back ( _T ( "US-ASCII" ) ); + const int vectorSize = encodingVector.size(); +- wxString choiceArray[vectorSize + 1]; ++ wxString *choiceArray = new wxString[vectorSize + 1]; + for ( int i = 0; i < vectorSize; ++i ) + * ( choiceArray + i ) = encodingVector.at ( i ); + wxSingleChoiceDialog scd ( + this, _ ( "Choose an encoding:" ), _ ( "Encoding" ), vectorSize, choiceArray ); + +- if ( scd.ShowModal() == wxID_CANCEL ) ++ if ( scd.ShowModal() == wxID_CANCEL ) { ++ delete [] choiceArray; + return; ++ } + + wxString selection; + std::string selectionUtf8, bufferUtf8; + + selection = scd.GetStringSelection(); + selectionUtf8 = selection.mb_str ( wxConvUTF8 ); ++ delete [] choiceArray; + + getRawText ( doc, bufferUtf8 ); + XmlEncodingHandler::setUtf8 ( bufferUtf8, true ); Added: head/editors/xmlcopyeditor/files/patch-src_xmlschemagenerator.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/xmlcopyeditor/files/patch-src_xmlschemagenerator.cpp Wed Aug 7 13:59:55 2013 (r324353) @@ -0,0 +1,11 @@ +--- src/xmlschemagenerator.cpp.orig 2013-08-07 15:53:21.000000000 +0200 ++++ src/xmlschemagenerator.cpp 2013-08-07 15:54:00.000000000 +0200 +@@ -203,7 +203,7 @@ + continue; + for ( attrItr = attrMap.begin(); attrItr != attrMap.end(); attrItr++ ) + { +- const static wxMBConvUTF16 conv; ++ static wxMBConvUTF16 conv; + if ( attrs->getNamedItem ( ( const XMLCh * ) ( const char * ) + attrItr->first.mb_str ( conv ) ) == NULL ) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308071359.r77Dxuaq032603>