Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/protobuf-python/, dev-python/protobuf-python/files/
Date: Thu, 26 Apr 2018 15:14:17
Message-Id: 1524755535.9a5682c3a38b987fe3ff3116cf3e5aa26e9a56b7.floppym@gentoo
1 commit: 9a5682c3a38b987fe3ff3116cf3e5aa26e9a56b7
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Wed Apr 25 17:57:54 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 26 15:12:15 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a5682c3
7
8 dev-python/protobuf-python: Fix google.protobuf.pyext._message.MessageMeta.
9
10 Closes: https://bugs.gentoo.org/651780
11
12 ...oogle.protobuf.pyext._message.MessageMeta.patch | 26 ++++++++++++++++++++++
13 ....5.2.ebuild => protobuf-python-3.5.2-r1.ebuild} | 5 +++++
14 2 files changed, 31 insertions(+)
15
16 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
17 new file mode 100644
18 index 00000000000..d1e1d745ab7
19 --- /dev/null
20 +++ b/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch
21 @@ -0,0 +1,26 @@
22 +https://github.com/google/protobuf/pull/4365
23 +
24 +--- /python/google/protobuf/pyext/message.cc
25 ++++ /python/google/protobuf/pyext/message.cc
26 +@@ -402,12 +402,6 @@
27 + return result.release();
28 + }
29 +
30 +-static PyGetSetDef Getters[] = {
31 +- {"_extensions_by_name", (getter)GetExtensionsByName, NULL},
32 +- {"_extensions_by_number", (getter)GetExtensionsByNumber, NULL},
33 +- {NULL}
34 +-};
35 +-
36 + } // namespace message_meta
37 +
38 + PyTypeObject CMessageClass_Type = {
39 +@@ -440,7 +434,7 @@
40 + 0, // tp_iternext
41 + 0, // tp_methods
42 + 0, // tp_members
43 +- message_meta::Getters, // tp_getset
44 ++ 0, // tp_getset
45 + 0, // tp_base
46 + 0, // tp_dict
47 + 0, // tp_descr_get
48
49 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
50 similarity index 89%
51 rename from dev-python/protobuf-python/protobuf-python-3.5.2.ebuild
52 rename to dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
53 index aaf563b424f..db40a5b37f8 100644
54 --- a/dev-python/protobuf-python/protobuf-python-3.5.2.ebuild
55 +++ b/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
56 @@ -25,6 +25,11 @@ RDEPEND="${DEPEND}
57
58 S="${WORKDIR}/protobuf-${PV}/python"
59
60 +python_prepare_all() {
61 + eapply -p2 "${FILESDIR}/${P}-google.protobuf.pyext._message.MessageMeta.patch"
62 + distutils-r1_python_prepare_all
63 +}
64 +
65 python_configure_all() {
66 mydistutilsargs=(--cpp_implementation)
67 }