From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6B6BB138359 for ; Thu, 24 Sep 2020 14:26:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D53AE0805; Thu, 24 Sep 2020 14:26:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2700FE081A for ; Thu, 24 Sep 2020 14:26:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DDAAE33BEC5 for ; Thu, 24 Sep 2020 14:26:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8637837C for ; Thu, 24 Sep 2020 14:26:51 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1600957602.0e9db0dda1d173a473598238861bfdf5846821cb.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/protobuf-python/files/, dev-python/protobuf-python/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/protobuf-python/files/protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch dev-python/protobuf-python/protobuf-python-3.11.4.ebuild dev-python/protobuf-python/protobuf-python-3.12.2.ebuild dev-python/protobuf-python/protobuf-python-3.12.4.ebuild dev-python/protobuf-python/protobuf-python-3.13.0.ebuild dev-python/protobuf-python/protobuf-python-9999.ebuild X-VCS-Directories: dev-python/protobuf-python/ dev-python/protobuf-python/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 0e9db0dda1d173a473598238861bfdf5846821cb X-VCS-Branch: master Date: Thu, 24 Sep 2020 14:26:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 15f55751-be2d-4a20-a871-6cb255970c7b X-Archives-Hash: c193e1c4eb4cf72bb7cf6a65415e1fd8 commit: 0e9db0dda1d173a473598238861bfdf5846821cb Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Tue Sep 22 04:00:00 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Sep 24 14:26:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e9db0dd dev-python/protobuf-python: Fix tests. Closes: https://bugs.gentoo.org/743838 Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Mike Gilbert gentoo.org> ...protobuf.pyext._message.PyUnknownFieldRef.patch | 22 ++++++++++++++++++++++ .../protobuf-python/protobuf-python-3.11.4.ebuild | 1 + .../protobuf-python/protobuf-python-3.12.2.ebuild | 1 + .../protobuf-python/protobuf-python-3.12.4.ebuild | 1 + .../protobuf-python/protobuf-python-3.13.0.ebuild | 1 + .../protobuf-python/protobuf-python-9999.ebuild | 1 + 6 files changed, 27 insertions(+) diff --git a/dev-python/protobuf-python/files/protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch b/dev-python/protobuf-python/files/protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch new file mode 100644 index 00000000000..68318320b90 --- /dev/null +++ b/dev-python/protobuf-python/files/protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch @@ -0,0 +1,22 @@ +https://github.com/protocolbuffers/protobuf/issues/6205 +https://github.com/protocolbuffers/protobuf/pull/7016 + +--- /python/google/protobuf/pyext/unknown_fields.cc ++++ /python/google/protobuf/pyext/unknown_fields.cc +@@ -277,13 +277,13 @@ + PyObject* data = NULL; + switch (field->type()) { + case UnknownField::TYPE_VARINT: +- data = PyInt_FromLong(field->varint()); ++ data = PyLong_FromUnsignedLongLong(field->varint()); + break; + case UnknownField::TYPE_FIXED32: +- data = PyInt_FromLong(field->fixed32()); ++ data = PyLong_FromUnsignedLong(field->fixed32()); + break; + case UnknownField::TYPE_FIXED64: +- data = PyInt_FromLong(field->fixed64()); ++ data = PyLong_FromUnsignedLongLong(field->fixed64()); + break; + case UnknownField::TYPE_LENGTH_DELIMITED: + data = PyBytes_FromStringAndSize(field->length_delimited().data(), diff --git a/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild index 0d5203efdc8..832edea2344 100644 --- a/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild +++ b/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild @@ -44,6 +44,7 @@ fi python_prepare_all() { pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die + eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch" eapply_user popd > /dev/null || die diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild index 2cd68f6c7fd..ccd1e09b367 100644 --- a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild +++ b/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild @@ -44,6 +44,7 @@ fi python_prepare_all() { pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die + eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch" eapply_user popd > /dev/null || die diff --git a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild index 9e7ca9ff7d5..a9f7d2854ca 100644 --- a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild +++ b/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild @@ -44,6 +44,7 @@ fi python_prepare_all() { pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die + eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch" eapply_user popd > /dev/null || die diff --git a/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild index eb481ccd564..d7e474dcdb9 100644 --- a/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild +++ b/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild @@ -44,6 +44,7 @@ fi python_prepare_all() { pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die + eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch" eapply_user popd > /dev/null || die diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild index 0007bff057a..77f252e252b 100644 --- a/dev-python/protobuf-python/protobuf-python-9999.ebuild +++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild @@ -44,6 +44,7 @@ fi python_prepare_all() { pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die + eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch" eapply_user popd > /dev/null || die