From ba2c1947ae1070704e122aa3925ce989ad0f5c5e3f408d25d1b653804d40aedb Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 5 May 2022 09:09:38 +0000 Subject: [PATCH 1/2] Accepting request 975051 from home:mcepl:branches:devel:languages:python - 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 --- change_desc_db.patch | 27 --------------------------- protobuf.changes | 6 ++++++ protobuf.spec | 4 ---- 3 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 change_desc_db.patch diff --git a/change_desc_db.patch b/change_desc_db.patch deleted file mode 100644 index ed65fcf..0000000 --- a/change_desc_db.patch +++ /dev/null @@ -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. diff --git a/protobuf.changes b/protobuf.changes index dc1dace..617d189 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 5 05:25:44 UTC 2022 - Matej Cepl + +- 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 diff --git a/protobuf.spec b/protobuf.spec index 8ef55e2..139c227 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -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} From 7935975c4f526ccd7cc899bcfa1a70ebd75cd9dbc25a701fa403bc1e78556306 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 5 May 2022 14:47:45 +0000 Subject: [PATCH 2/2] Accepting request 975180 from home:marxin:branches:devel:tools:building - Add temporary patch gcc12-disable-__constinit-with-c++-11.patch that addresses gh#protocolbuffers/protobuf#9916. OBS-URL: https://build.opensuse.org/request/show/975180 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=117 --- gcc12-disable-__constinit-with-c++-11.patch | 16 ++++++++++++++++ protobuf.changes | 6 ++++++ protobuf.spec | 1 + 3 files changed, 23 insertions(+) create mode 100644 gcc12-disable-__constinit-with-c++-11.patch diff --git a/gcc12-disable-__constinit-with-c++-11.patch b/gcc12-disable-__constinit-with-c++-11.patch new file mode 100644 index 0000000..1f01e69 --- /dev/null +++ b/gcc12-disable-__constinit-with-c++-11.patch @@ -0,0 +1,16 @@ +diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc +index 1e360cc..e0283fe 100644 +--- a/src/google/protobuf/port_def.inc ++++ b/src/google/protobuf/port_def.inc +@@ -609,7 +609,11 @@ + #define PROTOBUF_CONSTINIT [[clang::require_constant_initialization]] + #define PROTOBUF_CONSTEXPR constexpr + #elif PROTOBUF_GNUC_MIN(12, 0) ++#if PROTOBUF_CPLUSPLUS_MIN(201703L) + #define PROTOBUF_CONSTINIT __constinit ++#else ++#define PROTOBUF_CONSTINIT ++#endif + #define PROTOBUF_CONSTEXPR constexpr + #else + #define PROTOBUF_CONSTINIT diff --git a/protobuf.changes b/protobuf.changes index 617d189..a4140b0 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 5 10:54:05 UTC 2022 - Martin Liška + +- Add temporary patch gcc12-disable-__constinit-with-c++-11.patch + that addresses gh#protocolbuffers/protobuf#9916. + ------------------------------------------------------------------- Thu May 5 05:25:44 UTC 2022 - Matej Cepl diff --git a/protobuf.spec b/protobuf.spec index 139c227..f6afbd9 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -36,6 +36,7 @@ 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 +Patch0: gcc12-disable-__constinit-with-c++-11.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module python-dateutil} BuildRequires: %{python_module setuptools}