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/, dev-python/protobuf-python/files/
Date: Thu, 26 Apr 2018 15:14:12 +0000 (UTC)	[thread overview]
Message-ID: <1524755535.9a5682c3a38b987fe3ff3116cf3e5aa26e9a56b7.floppym@gentoo> (raw)

commit:     9a5682c3a38b987fe3ff3116cf3e5aa26e9a56b7
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Apr 25 17:57:54 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 15:12:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a5682c3

dev-python/protobuf-python: Fix google.protobuf.pyext._message.MessageMeta.

Closes: https://bugs.gentoo.org/651780

 ...oogle.protobuf.pyext._message.MessageMeta.patch | 26 ++++++++++++++++++++++
 ....5.2.ebuild => protobuf-python-3.5.2-r1.ebuild} |  5 +++++
 2 files changed, 31 insertions(+)

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
new file mode 100644
index 00000000000..d1e1d745ab7
--- /dev/null
+++ b/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch
@@ -0,0 +1,26 @@
+https://github.com/google/protobuf/pull/4365
+
+--- /python/google/protobuf/pyext/message.cc
++++ /python/google/protobuf/pyext/message.cc
+@@ -402,12 +402,6 @@
+   return result.release();
+ }
+ 
+-static PyGetSetDef Getters[] = {
+-  {"_extensions_by_name", (getter)GetExtensionsByName, NULL},
+-  {"_extensions_by_number", (getter)GetExtensionsByNumber, NULL},
+-  {NULL}
+-};
+-
+ }  // namespace message_meta
+ 
+ PyTypeObject CMessageClass_Type = {
+@@ -440,7 +434,7 @@
+   0,                                   // tp_iternext
+   0,                                   // tp_methods
+   0,                                   // tp_members
+-  message_meta::Getters,               // tp_getset
++  0,                                   // tp_getset
+   0,                                   // tp_base
+   0,                                   // tp_dict
+   0,                                   // tp_descr_get

diff --git a/dev-python/protobuf-python/protobuf-python-3.5.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
similarity index 89%
rename from dev-python/protobuf-python/protobuf-python-3.5.2.ebuild
rename to dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
index aaf563b424f..db40a5b37f8 100644
--- a/dev-python/protobuf-python/protobuf-python-3.5.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
@@ -25,6 +25,11 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/protobuf-${PV}/python"
 
+python_prepare_all() {
+	eapply -p2 "${FILESDIR}/${P}-google.protobuf.pyext._message.MessageMeta.patch"
+	distutils-r1_python_prepare_all
+}
+
 python_configure_all() {
 	mydistutilsargs=(--cpp_implementation)
 }


             reply	other threads:[~2018-04-26 15:14 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-26 15:14 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-10-02 20:08 [gentoo-commits] repo/gentoo:master commit in: dev-python/protobuf-python/, dev-python/protobuf-python/files/ Mike Gilbert
2021-11-09 11:51 Arthur Zamarin
2022-10-25 23:02 Sam James
2022-10-26 22:35 Sam James
2023-01-05 11:12 Michał Górny
2024-06-13  4:53 Sam James

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=1524755535.9a5682c3a38b987fe3ff3116cf3e5aa26e9a56b7.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