From 5a8a5cc42ec9aa3df01944c2a91e90f879c7a2fbdc606ae22c24011ec1c9e130 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 25 Jul 2022 14:11:15 +0000 Subject: [PATCH] Accepting request 990943 from home:dirkmueller:Factory - update to 21.3: * C++ * Add header search paths to Protobuf-C++.podspec (#10024) * Fixed Visual Studio constinit errors (#10232) * Fix #9947: make the ABI compatible between debug and non-debug builds (#10271) * UPB * Allow empty package names (fixes behavior regression in 4.21.0) * Fix a SEGV bug when comparing a non-materialized sub-message (#10208) * Fix several bugs in descriptor mapping containers (eg. descriptor.services_by_name) * for x in mapping now yields keys rather than values, to match Python conventions and the behavior of the old library. * Lookup operations now correctly reject unhashable types as map keys. * We implement repr() to use the same format as dict. * Fix maps to use the ScalarMapContainer class when appropriate * Fix bug when parsing an unknown value in a proto2 enum extension (protocolbuffers/upb#717) * PHP * Add "readonly" as a keyword for PHP and add previous classnames to descriptor pool (#10041) * Python * Make //:protobuf_python and //:well_known_types_py_pb2 public (#10118) * Bazel * Add back a filegroup for :well_known_protos (#10061) OBS-URL: https://build.opensuse.org/request/show/990943 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=123 --- gcc12-disable-__constinit-with-c++-11.patch | 12 +++++----- protobuf-21.2.tar.gz | 3 --- protobuf-21.3.tar.gz | 3 +++ protobuf.changes | 25 +++++++++++++++++++++ protobuf.spec | 2 +- 5 files changed, 36 insertions(+), 9 deletions(-) delete mode 100644 protobuf-21.2.tar.gz create mode 100644 protobuf-21.3.tar.gz diff --git a/gcc12-disable-__constinit-with-c++-11.patch b/gcc12-disable-__constinit-with-c++-11.patch index 4bfba8a..c9b411d 100644 --- a/gcc12-disable-__constinit-with-c++-11.patch +++ b/gcc12-disable-__constinit-with-c++-11.patch @@ -1,6 +1,8 @@ ---- protobuf-21.2/src/google/protobuf/port_def.inc.orig 2022-07-03 09:45:35.196880191 +0200 -+++ protobuf-21.2/src/google/protobuf/port_def.inc 2022-07-03 09:46:17.673245305 +0200 -@@ -651,7 +651,11 @@ +Index: protobuf-21.3/src/google/protobuf/port_def.inc +=================================================================== +--- protobuf-21.3.orig/src/google/protobuf/port_def.inc ++++ protobuf-21.3/src/google/protobuf/port_def.inc +@@ -652,7 +652,11 @@ #define PROTOBUF_CONSTINIT [[clang::require_constant_initialization]] #define PROTOBUF_CONSTEXPR constexpr #elif PROTOBUF_GNUC_MIN(12, 2) @@ -10,5 +12,5 @@ +#define PROTOBUF_CONSTINIT +#endif #define PROTOBUF_CONSTEXPR constexpr - #else - #define PROTOBUF_CONSTINIT + // MSVC 17 currently seems to raise an error about constant-initialized pointers. + #elif defined(_MSC_VER) && _MSC_VER >= 1930 diff --git a/protobuf-21.2.tar.gz b/protobuf-21.2.tar.gz deleted file mode 100644 index b45cb7c..0000000 --- a/protobuf-21.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca983c9d2c8f8c935513642bcc4b2cbc64e4046e0bb16bf2ff893128577ece8c -size 5103383 diff --git a/protobuf-21.3.tar.gz b/protobuf-21.3.tar.gz new file mode 100644 index 0000000..a659d1d --- /dev/null +++ b/protobuf-21.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e958b62debbb46ebefa16d848741d17c88dc018dd57b729c0cd58965380f3f8 +size 5104916 diff --git a/protobuf.changes b/protobuf.changes index 6af35a0..1f4bf3b 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Jul 25 07:11:14 UTC 2022 - Dirk Müller + +- update to 21.3: + * C++ + * Add header search paths to Protobuf-C++.podspec (#10024) + * Fixed Visual Studio constinit errors (#10232) + * Fix #9947: make the ABI compatible between debug and non-debug builds (#10271) + * UPB + * Allow empty package names (fixes behavior regression in 4.21.0) + * Fix a SEGV bug when comparing a non-materialized sub-message (#10208) + * Fix several bugs in descriptor mapping containers (eg. descriptor.services_by_name) + * for x in mapping now yields keys rather than values, to match Python + conventions and the behavior of the old library. + * Lookup operations now correctly reject unhashable types as map keys. + * We implement repr() to use the same format as dict. + * Fix maps to use the ScalarMapContainer class when appropriate + * Fix bug when parsing an unknown value in a proto2 enum extension (protocolbuffers/upb#717) + * PHP + * Add "readonly" as a keyword for PHP and add previous classnames to descriptor pool (#10041) + * Python + * Make //:protobuf_python and //:well_known_types_py_pb2 public (#10118) + * Bazel + * Add back a filegroup for :well_known_protos (#10061) + ------------------------------------------------------------------- Sun Jul 3 07:50:16 UTC 2022 - Paolo Stivanin diff --git a/protobuf.spec b/protobuf.spec index da3b088..601866f 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -27,7 +27,7 @@ %bcond_without python2 %bcond_without python3 Name: protobuf -Version: 21.2 +Version: 21.3 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause