Control: tags 897151 + patch Control: tags 902597 + patch Control: tags 902597 + pending
Dear maintainer,
I've prepared an NMU for protobuf (versioned as 3.0.0-9.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for protobuf-3.0.0 protobuf-3.0.0 changelog | 10 +++++++ control | 1 patches/python37.patch | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 tests/control | 1 5 files changed, 83 insertions(+) diff -Nru protobuf-3.0.0/debian/changelog protobuf-3.0.0/debian/changelog --- protobuf-3.0.0/debian/changelog 2017-10-16 13:34:16.000000000 +0200 +++ protobuf-3.0.0/debian/changelog 2018-09-26 11:20:43.000000000 +0200 @@ -1,3 +1,13 @@ +protobuf (3.0.0-9.2) unstable; urgency=medium + + * Non-maintainer upload. + * Add missing build-depends on libgmock-dev. Closes: #897151 + * Add patch from upstream to fix build with Python 3.7. Closes: #902597 + * Run jdbc-tests autopkg test allowing output on stderr (warning with + illegal reflective access operation on OpenJDK 9). (Change from Ubuntu). + + -- Mattia Rizzolo <[email protected]> Wed, 26 Sep 2018 11:20:43 +0200 + protobuf (3.0.0-9.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru protobuf-3.0.0/debian/control protobuf-3.0.0/debian/control --- protobuf-3.0.0/debian/control 2017-10-16 11:50:01.000000000 +0200 +++ protobuf-3.0.0/debian/control 2018-09-26 11:20:19.000000000 +0200 @@ -15,6 +15,7 @@ # C/C++ , zlib1g-dev , google-mock + , libgmock-dev , libgtest-dev # Python , dh-python diff -Nru protobuf-3.0.0/debian/patches/python37.patch protobuf-3.0.0/debian/patches/python37.patch --- protobuf-3.0.0/debian/patches/python37.patch 1970-01-01 01:00:00.000000000 +0100 +++ protobuf-3.0.0/debian/patches/python37.patch 2018-09-26 11:19:18.000000000 +0200 @@ -0,0 +1,70 @@ +From 5c42943e75231b79f4ffcc37a22f0077a2fb0e7d Mon Sep 17 00:00:00 2001 +From: Ben Webb <[email protected]> +Date: Tue, 3 Jul 2018 09:51:09 -0700 +Subject: [PATCH] Add Python 3.7 compatibility + +Compilation of Python wrappers fails with Python 3.7 because +the Python folks changed their C API such that +PyUnicode_AsUTF8AndSize() now returns a const char* rather +than a char*. Add a patch to work around. Relates #4086. +--- + python/google/protobuf/pyext/descriptor.cc | 2 +- + python/google/protobuf/pyext/descriptor_containers.cc | 2 +- + python/google/protobuf/pyext/descriptor_pool.cc | 2 +- + python/google/protobuf/pyext/extension_dict.cc | 2 +- + python/google/protobuf/pyext/message.cc | 4 ++-- + 5 files changed, 6 insertions(+), 6 deletions(-) + +--- a/python/google/protobuf/pyext/descriptor.cc ++++ b/python/google/protobuf/pyext/descriptor.cc +@@ -54,7 +54,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 + +--- a/python/google/protobuf/pyext/descriptor_containers.cc ++++ b/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 + +--- a/python/google/protobuf/pyext/descriptor_pool.cc ++++ b/python/google/protobuf/pyext/descriptor_pool.cc +@@ -47,7 +47,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 + +--- a/python/google/protobuf/pyext/message.cc ++++ b/python/google/protobuf/pyext/message.cc +@@ -81,7 +81,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 +@@ -1415,7 +1415,7 @@ + return NULL; + } + #else +- field_name = PyUnicode_AsUTF8AndSize(arg, &size); ++ field_name = const_cast<char*>(PyUnicode_AsUTF8AndSize(arg, &size)); + if (!field_name) { + return NULL; + } diff -Nru protobuf-3.0.0/debian/patches/series protobuf-3.0.0/debian/patches/series --- protobuf-3.0.0/debian/patches/series 2017-10-16 10:57:22.000000000 +0200 +++ protobuf-3.0.0/debian/patches/series 2018-09-26 11:20:02.000000000 +0200 @@ -7,3 +7,4 @@ sparc64.patch python3_long_fix.patch python36.patch +python37.patch diff -Nru protobuf-3.0.0/debian/tests/control protobuf-3.0.0/debian/tests/control --- protobuf-3.0.0/debian/tests/control 2016-08-22 07:37:15.000000000 +0200 +++ protobuf-3.0.0/debian/tests/control 2018-09-26 11:20:43.000000000 +0200 @@ -1,2 +1,3 @@ Tests: simple Depends: @, make, python, pkg-config, zlib1g-dev, build-essential, default-jdk +Restrictions: allow-stderr
signature.asc
Description: PGP signature
