[gentoo-commits] repo/gentoo:master commit in: dev-python/protobuf-python/files/, dev-python/protobuf-python/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/protobuf-python/files/, dev-python/protobuf-python/
Date: Thu, 24 Sep 2020 14:26:51 +0000 (UTC)	[thread overview]
Message-ID: <1600957602.0e9db0dda1d173a473598238861bfdf5846821cb.floppym@gentoo> (raw)

commit:     0e9db0dda1d173a473598238861bfdf5846821cb
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Tue Sep 22 04:00:00 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> 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 <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> 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

next             reply	other threads:[~2020-09-24 14:26 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-24 14:26 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-02-03 19:35 [gentoo-commits] repo/gentoo:master commit in: dev-python/protobuf-python/files/, dev-python/protobuf-python/ Jason Zaman
2022-04-22  7:09 Michał Górny
2022-02-14  8:32 Michał Górny
2019-12-06 20:25 Mike Gilbert
2019-04-19 16:39 Mike Gilbert
2018-10-02 20:08 Mike Gilbert
2018-04-26 15:14 Mike Gilbert
2017-05-09 17:18 Michał Górny
2016-06-23 15:57 Patrice Clement
2016-04-21  9:52 Ian Delaney

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:68318320b9 dfblob:0d5203efdc dfblob:832edea234
dfblob:2cd68f6c7f dfblob:ccd1e09b36 dfblob:9e7ca9ff7d dfblob:a9f7d2854c
dfblob:eb481ccd56 dfblob:d7e474dcdb dfblob:0007bff057 dfblob:77f252e252 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-python/protobuf-python/files/, dev-python/protobuf-python/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1600957602.0e9db0dda1d173a473598238861bfdf5846821cb.floppym@gentoo \
    --to=floppym@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox