pool/protobuf
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 975051 from home:mcepl:branches:devel:languages:python

Browse Source 
- Remove change_desc_db.patch, because underlying bug in
  gh#googleapis/python-api-core#372 has been fixed.

OBS-URL: https://build.opensuse.org/request/show/975051
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=116
This commit is contained in:
Martin Pluskal 2022-05-05 09:09:38 +00:00 committed by Git OBS Bridge
parent a02710abd8
commit ba2c1947ae
3 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
change_desc_db.patch
View File

@ -1,27 +0,0 @@
---
python/google/protobuf/descriptor_database.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- a/python/google/protobuf/descriptor_database.py
+++ b/python/google/protobuf/descriptor_database.py
@@ -75,14 +75,17 @@ class DescriptorDatabase(object):
for name in _ExtractSymbols(message, package):
self._AddSymbol(name, file_desc_proto)
for enum in file_desc_proto.enum_type:
- self._AddSymbol(('.'.join((package, enum.name))), file_desc_proto)
+ symbol = ('.'.join((package, enum.name))).lstrip('.')
+ self._AddSymbol(symbol, file_desc_proto)
for enum_value in enum.value:
self._file_desc_protos_by_symbol[
'.'.join((package, enum_value.name))] = file_desc_proto
for extension in file_desc_proto.extension:
- self._AddSymbol(('.'.join((package, extension.name))), file_desc_proto)
+ symbol = ('.'.join((package, extension.name))).lstrip('.')
+ self._AddSymbol(symbol, file_desc_proto)
for service in file_desc_proto.service:
- self._AddSymbol(('.'.join((package, service.name))), file_desc_proto)
+ symbol = ('.'.join((package, service.name))).lstrip('.')
+ self._AddSymbol(symbol, file_desc_proto)
def FindFileByName(self, name):
"""Finds the file descriptor proto by file name.

6
protobuf.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 5 05:25:44 UTC 2022 - Matej Cepl <mcepl@suse.com>
- Remove change_desc_db.patch, because underlying bug in
gh#googleapis/python-api-core#372 has been fixed.
-------------------------------------------------------------------
Mon Apr 25 13:01:22 UTC 2022 - Matej Cepl <mcepl@suse.com>

4
protobuf.spec
View File

@ -36,10 +36,6 @@ URL: https://github.com/protocolbuffers/protobuf
Source0: https://github.com/protocolbuffers/protobuf/archive/v%{version}.tar.gz#/%{tarname}-%{version}.tar.gz
Source1: manifest.txt.in
Source2: baselibs.conf
# PATCH-FIX-UPSTREAM change_desc_db.patch gh#googleapis/python-api-core#372 mcepl@suse.com
# Remove leading dot from database entries, probably just a poor workaround
# Reported to upstream as gh#protocolbuffers/protobuf#9867
Patch0: change_desc_db.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module python-dateutil}
BuildRequires: %{python_module setuptools}