svn commit: r462791 - head/textproc/py-pyctpp2/files
Antoine Brodin
antoine at FreeBSD.org
Sat Feb 24 11:28:16 UTC 2018
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<uint32_t>(e.GetLine()));
++ int res = snprintf(buf, len, "%" PRIu32, static_cast<uint32_t>(e.GetLine()));
+ if (!(res < 0 || static_cast<size_t>(res) == len)) {
+ line = string(buf);
+ }
+
+ memset(buf, 0, len);
+- res = snprintf(buf, len, "%"PRIu32, static_cast<uint32_t>(e.GetLinePos()));
++ res = snprintf(buf, len, "%" PRIu32, static_cast<uint32_t>(e.GetLinePos()));
+ if (!(res < 0 || static_cast<size_t>(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<uint32_t>(e.GetLine()));
++ int res = snprintf(buf, len, "%" PRIu32, static_cast<uint32_t>(e.GetLine()));
+ if (!(res < 0 || static_cast<size_t>(res) == len)) {
+ line = string(buf);
+ }
+
+ memset(buf, 0, len);
+- res = snprintf(buf, len, "%"PRIu32, static_cast<uint32_t>(e.GetLinePos()));
++ res = snprintf(buf, len, "%" PRIu32, static_cast<uint32_t>(e.GetLinePos()));
+ if (!(res < 0 || static_cast<size_t>(res) == len)) {
+ pos = string(buf);
+ }
More information about the svn-ports-head
mailing list