From owner-svn-ports-all@freebsd.org Sat Feb 24 11:28:16 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBBD7F025B9; Sat, 24 Feb 2018 11:28:15 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8E97D7CC4F; Sat, 24 Feb 2018 11:28:15 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 708EC24DE8; Sat, 24 Feb 2018 11:28:15 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1OBSFua003309; Sat, 24 Feb 2018 11:28:15 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1OBSFwh003306; Sat, 24 Feb 2018 11:28:15 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201802241128.w1OBSFwh003306@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 24 Feb 2018 11:28:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462791 - head/textproc/py-pyctpp2/files X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: head/textproc/py-pyctpp2/files X-SVN-Commit-Revision: 462791 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Feb 2018 11:28:16 -0000 Author: antoine Date: Sat Feb 24 11:28:14 2018 New Revision: 462791 URL: https://svnweb.freebsd.org/changeset/ports/462791 Log: Fix build with clang 6 Reported by: pkg-fallout Added: head/textproc/py-pyctpp2/files/ head/textproc/py-pyctpp2/files/patch-pyctpp2___pyctpp2__py2.cpp (contents, props changed) head/textproc/py-pyctpp2/files/patch-pyctpp2___pyctpp2__py3.cpp (contents, props changed) head/textproc/py-pyctpp2/files/patch-pyctpp2_cengine.cc (contents, props changed) Added: head/textproc/py-pyctpp2/files/patch-pyctpp2___pyctpp2__py2.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/py-pyctpp2/files/patch-pyctpp2___pyctpp2__py2.cpp Sat Feb 24 11:28:14 2018 (r462791) @@ -0,0 +1,27 @@ +--- pyctpp2/_pyctpp2_py2.cpp.orig 2012-01-19 08:46:23 UTC ++++ pyctpp2/_pyctpp2_py2.cpp +@@ -4471,7 +4471,7 @@ static void __Pyx_RaiseArgtupleInvalid( + more_or_less = "exactly"; + } + PyErr_Format(PyExc_TypeError, +- "%s() takes %s %"PY_FORMAT_SIZE_T"d positional argument%s (%"PY_FORMAT_SIZE_T"d given)", ++ "%s() takes %s %" PY_FORMAT_SIZE_T "d positional argument%s (%" PY_FORMAT_SIZE_T "d given)", + func_name, more_or_less, num_expected, + (num_expected == 1) ? "" : "s", num_found); + } +@@ -4682,13 +4682,13 @@ bad: + + static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) { + PyErr_Format(PyExc_ValueError, +- "need more than %"PY_FORMAT_SIZE_T"d value%s to unpack", ++ "need more than %" PY_FORMAT_SIZE_T "d value%s to unpack", + index, (index == 1) ? "" : "s"); + } + + static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected) { + PyErr_Format(PyExc_ValueError, +- "too many values to unpack (expected %"PY_FORMAT_SIZE_T"d)", expected); ++ "too many values to unpack (expected %" PY_FORMAT_SIZE_T "d)", expected); + } + + static int __Pyx_IternextUnpackEndCheck(PyObject *retval, Py_ssize_t expected) { Added: head/textproc/py-pyctpp2/files/patch-pyctpp2___pyctpp2__py3.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/py-pyctpp2/files/patch-pyctpp2___pyctpp2__py3.cpp Sat Feb 24 11:28:14 2018 (r462791) @@ -0,0 +1,27 @@ +--- pyctpp2/_pyctpp2_py3.cpp.orig 2012-01-19 08:46:23 UTC ++++ pyctpp2/_pyctpp2_py3.cpp +@@ -4551,7 +4551,7 @@ static void __Pyx_RaiseArgtupleInvalid( + more_or_less = "exactly"; + } + PyErr_Format(PyExc_TypeError, +- "%s() takes %s %"PY_FORMAT_SIZE_T"d positional argument%s (%"PY_FORMAT_SIZE_T"d given)", ++ "%s() takes %s %" PY_FORMAT_SIZE_T "d positional argument%s (%" PY_FORMAT_SIZE_T "d given)", + func_name, more_or_less, num_expected, + (num_expected == 1) ? "" : "s", num_found); + } +@@ -4762,13 +4762,13 @@ bad: + + static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) { + PyErr_Format(PyExc_ValueError, +- "need more than %"PY_FORMAT_SIZE_T"d value%s to unpack", ++ "need more than %" PY_FORMAT_SIZE_T "d value%s to unpack", + index, (index == 1) ? "" : "s"); + } + + static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected) { + PyErr_Format(PyExc_ValueError, +- "too many values to unpack (expected %"PY_FORMAT_SIZE_T"d)", expected); ++ "too many values to unpack (expected %" PY_FORMAT_SIZE_T "d)", expected); + } + + static int __Pyx_IternextUnpackEndCheck(PyObject *retval, Py_ssize_t expected) { Added: head/textproc/py-pyctpp2/files/patch-pyctpp2_cengine.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/py-pyctpp2/files/patch-pyctpp2_cengine.cc Sat Feb 24 11:28:14 2018 (r462791) @@ -0,0 +1,34 @@ +--- pyctpp2/cengine.cc.orig 2012-01-19 08:46:23 UTC ++++ pyctpp2/cengine.cc +@@ -151,13 +151,13 @@ bool CEngine::Parse(const char *filename, CTemplate ** + string line; + string pos; + +- int res = snprintf(buf, len, "%"PRIu32, static_cast(e.GetLine())); ++ int res = snprintf(buf, len, "%" PRIu32, static_cast(e.GetLine())); + if (!(res < 0 || static_cast(res) == len)) { + line = string(buf); + } + + memset(buf, 0, len); +- res = snprintf(buf, len, "%"PRIu32, static_cast(e.GetLinePos())); ++ res = snprintf(buf, len, "%" PRIu32, static_cast(e.GetLinePos())); + if (!(res < 0 || static_cast(res) == len)) { + pos = string(buf); + } +@@ -198,13 +198,13 @@ bool CEngine::ParseText(const char *text, CTemplate ** + string line; + string pos; + +- int res = snprintf(buf, len, "%"PRIu32, static_cast(e.GetLine())); ++ int res = snprintf(buf, len, "%" PRIu32, static_cast(e.GetLine())); + if (!(res < 0 || static_cast(res) == len)) { + line = string(buf); + } + + memset(buf, 0, len); +- res = snprintf(buf, len, "%"PRIu32, static_cast(e.GetLinePos())); ++ res = snprintf(buf, len, "%" PRIu32, static_cast(e.GetLinePos())); + if (!(res < 0 || static_cast(res) == len)) { + pos = string(buf); + }