Date: Sun, 6 Sep 2015 13:40:37 +0000 (UTC) From: Rodrigo Osorio <rodrigo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396215 - in head/editors/poedit: . files Message-ID: <201509061340.t86DebUM060324@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rodrigo Date: Sun Sep 6 13:40:36 2015 New Revision: 396215 URL: https://svnweb.freebsd.org/changeset/ports/396215 Log: Fix issues in freeBSD 9.3-RELEASE Bump PORTREVISION Added: head/editors/poedit/files/ head/editors/poedit/files/patch-src_gexecute.cpp (contents, props changed) head/editors/poedit/files/patch-src_http__client__casablanca.cpp (contents, props changed) head/editors/poedit/files/patch-src_tm_dump__legacy__tm.cpp (contents, props changed) Modified: head/editors/poedit/Makefile Modified: head/editors/poedit/Makefile ============================================================================== --- head/editors/poedit/Makefile Sun Sep 6 13:15:53 2015 (r396214) +++ head/editors/poedit/Makefile Sun Sep 6 13:40:36 2015 (r396215) @@ -4,6 +4,7 @@ PORTNAME= poedit PORTVERSION= 1.8.4 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= http://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/ @@ -17,7 +18,7 @@ LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ liblucene++.so:${PORTSDIR}/textproc/luceneplusplus -USES= gettext gmake pkgconfig desktop-file-utils +USES= compiler:c++11-lib desktop-file-utils gettext gmake pkgconfig USE_WX= 3.0 WX_CONF_ARGS= absolute WX_UNICODE= yes @@ -28,13 +29,14 @@ CONFIGURE_ENV= WXRC="${WXRC_CMD}" INSTALLS_ICONS= yes CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include +## -stdlib=libc++ LDFLAGS+= -lpthread -L${BDB_LIB_DIR} -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS OPTIONS_SUB=yes -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls post-patch: @${REINPLACE_CMD} -e \ Added: head/editors/poedit/files/patch-src_gexecute.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/poedit/files/patch-src_gexecute.cpp Sun Sep 6 13:40:36 2015 (r396215) @@ -0,0 +1,36 @@ +--- src/gexecute.cpp.orig 2015-08-03 10:49:16 UTC ++++ src/gexecute.cpp +@@ -32,6 +32,8 @@ + #include <wx/stdpaths.h> + #include <wx/filename.h> + ++#include <sstream> ++ + #include "gexecute.h" + #include "errors.h" + #include "chooselang.h" +@@ -49,6 +51,14 @@ + using std::regex_match; + #endif + ++static int strtoi(const std::string& s) ++{ ++ std::istringstream str(s); ++ int i; ++ str >> i; ++ return i; ++} ++ + namespace + { + +@@ -186,7 +196,8 @@ bool ExecuteGettextAndParseOutput(const + wsmatch match; + if (regex_match(e, match, RE_ERROR)) + { +- rec.line = std::stoi(match.str(1)); ++ std::string str(match.str(1).begin(),match.str(2).end()); ++ rec.line = strtoi(str); + rec.text = match.str(3); + errors.push_back(rec); + wxLogTrace("poedit.execute", Added: head/editors/poedit/files/patch-src_http__client__casablanca.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/poedit/files/patch-src_http__client__casablanca.cpp Sun Sep 6 13:40:36 2015 (r396215) @@ -0,0 +1,40 @@ +--- src/http_client_casablanca.cpp.orig 2015-08-03 10:49:16 UTC ++++ src/http_client_casablanca.cpp +@@ -30,10 +30,13 @@ + + #include <boost/algorithm/string/predicate.hpp> + ++ + #include <cpprest/asyncrt_utils.h> + #include <cpprest/http_client.h> + #include <cpprest/http_msg.h> + #include <cpprest/filestream.h> ++#include <sstream> ++ + + #ifdef _WIN32 + #include <windows.h> +@@ -66,6 +69,14 @@ struct json_dict::native + } + }; + ++static trtoi(const std::string& s) ++{ ++ std::istringstream str(s); ++ int i; ++ str >> i; ++ return i; ++} ++ + static inline json_dict make_json_dict(const web::json::value& x) + { + return std::make_shared<json_dict::native>(x); +@@ -102,7 +113,7 @@ int json_dict::number(const char *name) + { + // Some broken APIs may return strings instead of numbers, so lets try + // that too as a fallback +- return std::stoi(val.as_string()); ++ return strtoi(val.as_string()); + } + } + Added: head/editors/poedit/files/patch-src_tm_dump__legacy__tm.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/poedit/files/patch-src_tm_dump__legacy__tm.cpp Sun Sep 6 13:40:36 2015 (r396215) @@ -0,0 +1,10 @@ +--- src/tm/dump_legacy_tm.cpp.orig 2015-08-03 10:49:16 UTC ++++ src/tm/dump_legacy_tm.cpp +@@ -28,6 +28,7 @@ + #include <string> + #include <vector> + ++#include <errno.h> + #include <string.h> + + #ifdef DB_HEADER
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509061340.t86DebUM060324>