diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
commit | 957235cf19a691360c720f7913672adda4258ed0 (patch) | |
tree | 812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /dev-python/protobuf-python/files | |
parent | 62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff) |
gentoo resync : 07.10.2018
Diffstat (limited to 'dev-python/protobuf-python/files')
-rw-r--r-- | dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch | 2 | ||||
-rw-r--r-- | dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch | 67 |
2 files changed, 68 insertions, 1 deletions
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch b/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch index d1e1d745ab7c..c29da40ca261 100644 --- a/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch +++ b/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch @@ -1,4 +1,4 @@ -https://github.com/google/protobuf/pull/4365 +https://github.com/protocolbuffers/protobuf/pull/4365 --- /python/google/protobuf/pyext/message.cc +++ /python/google/protobuf/pyext/message.cc diff --git a/dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch b/dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch new file mode 100644 index 000000000000..bd4ce9d7fcaf --- /dev/null +++ b/dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch @@ -0,0 +1,67 @@ +https://github.com/protocolbuffers/protobuf/pull/4862 +https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7 + +--- /python/google/protobuf/pyext/descriptor.cc ++++ /python/google/protobuf/pyext/descriptor.cc +@@ -56,7 +56,7 @@ + #endif + #define PyString_AsStringAndSize(ob, charpp, sizep) \ + (PyUnicode_Check(ob)? \ +- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ ++ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ + PyBytes_AsStringAndSize(ob, (charpp), (sizep))) + #endif + +--- /python/google/protobuf/pyext/descriptor_containers.cc ++++ /python/google/protobuf/pyext/descriptor_containers.cc +@@ -66,7 +66,7 @@ + #endif + #define PyString_AsStringAndSize(ob, charpp, sizep) \ + (PyUnicode_Check(ob)? \ +- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ ++ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ + PyBytes_AsStringAndSize(ob, (charpp), (sizep))) + #endif + +--- /python/google/protobuf/pyext/descriptor_pool.cc ++++ /python/google/protobuf/pyext/descriptor_pool.cc +@@ -48,7 +48,7 @@ + #endif + #define PyString_AsStringAndSize(ob, charpp, sizep) \ + (PyUnicode_Check(ob)? \ +- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ ++ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ + PyBytes_AsStringAndSize(ob, (charpp), (sizep))) + #endif + +--- /python/google/protobuf/pyext/extension_dict.cc ++++ /python/google/protobuf/pyext/extension_dict.cc +@@ -53,7 +53,7 @@ + #endif + #define PyString_AsStringAndSize(ob, charpp, sizep) \ + (PyUnicode_Check(ob)? \ +- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ ++ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ + PyBytes_AsStringAndSize(ob, (charpp), (sizep))) + #endif + +--- /python/google/protobuf/pyext/message.cc ++++ /python/google/protobuf/pyext/message.cc +@@ -79,7 +79,7 @@ + (PyUnicode_Check(ob)? PyUnicode_AsUTF8(ob): PyBytes_AsString(ob)) + #define PyString_AsStringAndSize(ob, charpp, sizep) \ + (PyUnicode_Check(ob)? \ +- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ ++ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ + PyBytes_AsStringAndSize(ob, (charpp), (sizep))) + #endif + #endif +@@ -1529,7 +1529,7 @@ + return NULL; + } + #else +- field_name = PyUnicode_AsUTF8AndSize(arg, &size); ++ field_name = const_cast<char*>(PyUnicode_AsUTF8AndSize(arg, &size)); + if (!field_name) { + return NULL; + } |