<pre style='margin:0'>
tobypeterson pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e1b37148a8a238a0df823b6ce5f80f6d6e00962d">https://github.com/macports/macports-ports/commit/e1b37148a8a238a0df823b6ce5f80f6d6e00962d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e1b3714 py-protobuf3: update to 3.7.0
</span>e1b3714 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e1b37148a8a238a0df823b6ce5f80f6d6e00962d
</span>Author: Toby Peterson <toby@macports.org>
AuthorDate: Mon Mar 11 20:01:17 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-protobuf3: update to 3.7.0
</span>---
python/py-protobuf3/Portfile | 11 ++-
.../files/patch-py-protobuf3-settings.diff | 12 +--
python/py-protobuf3/files/py37.diff | 85 ----------------------
3 files changed, 11 insertions(+), 97 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-protobuf3/Portfile b/python/py-protobuf3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2d31e39..ff26bbd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-protobuf3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-protobuf3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,7 @@ PortGroup github 1.0
</span> PortGroup cxx11 1.1
name py-protobuf3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.6.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.7.0
</span> categories-append devel
maintainers nomaintainer
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,9 +36,9 @@ master_sites https://github.com/google/protobuf/releases/download/v${version}
</span> distfiles protobuf-python-${version}.tar.gz
worksrcdir protobuf-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 40f009cb0c190816a52fc21d45c26558ee7d63c3bd511b326bd85739b2fd99a6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ee9f8344a688f636cee409227b36a5161fa88c44 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4748789
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 a1a98779986794a15783629490148dffe8fd79171e963e38b0927cc86fce208a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 df6b932a559ccfc73eeccecb8b63ba58be0a56cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4869606
</span>
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +56,7 @@ if {${name} ne ${subport}} {
</span> # tricks to force the right -stdlib setting
# and to put a needed CXX flag on the 10.6 build
# see https://trac.macports.org/ticket/56482
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-py-protobuf3-settings.diff py37.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-py-protobuf3-settings.diff
</span>
post-patch {
set extraargs ""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-protobuf3/files/patch-py-protobuf3-settings.diff b/python/py-protobuf3/files/patch-py-protobuf3-settings.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6efc381..2f834a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-protobuf3/files/patch-py-protobuf3-settings.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-protobuf3/files/patch-py-protobuf3-settings.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- setup.py.old 2018-05-24 19:42:16.000000000 -0700
+++ setup.py 2018-05-24 19:43:21.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -204,6 +204,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v, _, _ = platform.mac_ver()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if v:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extra_compile_args.append('-std=c++11')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -189,6 +189,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_compile_args.append("-Wno-shorten-64-to-32");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_compile_args.append("-Wno-deprecated-register");
</span> + extra_compile_args.append('@@MACPORTS_STDLIB@@')
+ extra_compile_args.append('@@MACPORTS_EXTRAARG@@')
<span style='display:block; white-space:pre;background:#ffe0e0;'>- elif os.getenv('KOKORO_BUILD_NUMBER') or os.getenv('KOKORO_BUILD_ID'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extra_compile_args.append('-std=c++11')
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # C++ projects must now migrate to libc++ and are recommended to set a
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-protobuf3/files/py37.diff b/python/py-protobuf3/files/py37.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8544993..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-protobuf3/files/py37.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,85 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit 0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Ben Webb <ben@salilab.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu Jul 12 10:58:10 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Add Python 3.7 compatibility (#4862)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Compilation of Python wrappers fails with Python 3.7 because
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the Python folks changed their C API such that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyUnicode_AsUTF8AndSize() now returns a const char* rather
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- than a char*. Add a patch to work around. Relates #4086.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git google/protobuf/pyext/descriptor.cc google/protobuf/pyext/descriptor.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8af0cb12..19a1c38a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- google/protobuf/pyext/descriptor.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ google/protobuf/pyext/descriptor.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyString_AsStringAndSize(ob, charpp, sizep) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (PyUnicode_Check(ob)? \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git google/protobuf/pyext/descriptor_containers.cc google/protobuf/pyext/descriptor_containers.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bc007f7e..0153664f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- google/protobuf/pyext/descriptor_containers.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ google/protobuf/pyext/descriptor_containers.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,7 +66,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyString_AsStringAndSize(ob, charpp, sizep) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (PyUnicode_Check(ob)? \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git google/protobuf/pyext/descriptor_pool.cc google/protobuf/pyext/descriptor_pool.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 95882aeb..962accc6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- google/protobuf/pyext/descriptor_pool.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ google/protobuf/pyext/descriptor_pool.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyString_AsStringAndSize(ob, charpp, sizep) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (PyUnicode_Check(ob)? \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git google/protobuf/pyext/extension_dict.cc google/protobuf/pyext/extension_dict.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 018b5c2c..174c5470 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- google/protobuf/pyext/extension_dict.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ google/protobuf/pyext/extension_dict.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyString_AsStringAndSize(ob, charpp, sizep) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (PyUnicode_Check(ob)? \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git google/protobuf/pyext/message.cc google/protobuf/pyext/message.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 53736b9c..b2984509 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- google/protobuf/pyext/message.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ google/protobuf/pyext/message.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,7 +79,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (PyUnicode_Check(ob)? PyUnicode_AsUTF8(ob): PyBytes_AsString(ob))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyString_AsStringAndSize(ob, charpp, sizep) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (PyUnicode_Check(ob)? \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1529,7 +1529,7 @@ PyObject* HasField(CMessage* self, PyObject* arg) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- field_name = PyUnicode_AsUTF8AndSize(arg, &size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ field_name = const_cast<char*>(PyUnicode_AsUTF8AndSize(arg, &size));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!field_name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>