From e06a43c3ab386180546e8c7a7ecb98daffaf1c8cd0eff5845d0202d9bf45e867 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 28 Jul 2022 11:33:30 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/protobuf revision 61.0 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=198c3f140786d955e937ab85672ae0b2 --- 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, 9 insertions(+), 36 deletions(-) create mode 100644 protobuf-21.2.tar.gz delete 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 c9b411d..4bfba8a 100644 --- a/gcc12-disable-__constinit-with-c++-11.patch +++ b/gcc12-disable-__constinit-with-c++-11.patch @@ -1,8 +1,6 @@ -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 @@ +--- 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 @@ #define PROTOBUF_CONSTINIT [[clang::require_constant_initialization]] #define PROTOBUF_CONSTEXPR constexpr #elif PROTOBUF_GNUC_MIN(12, 2) @@ -12,5 +10,5 @@ Index: protobuf-21.3/src/google/protobuf/port_def.inc +#define PROTOBUF_CONSTINIT +#endif #define PROTOBUF_CONSTEXPR constexpr - // MSVC 17 currently seems to raise an error about constant-initialized pointers. - #elif defined(_MSC_VER) && _MSC_VER >= 1930 + #else + #define PROTOBUF_CONSTINIT diff --git a/protobuf-21.2.tar.gz b/protobuf-21.2.tar.gz new file mode 100644 index 0000000..b45cb7c --- /dev/null +++ b/protobuf-21.2.tar.gz @@ -0,0 +1,3 @@ +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 deleted file mode 100644 index a659d1d..0000000 --- a/protobuf-21.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e958b62debbb46ebefa16d848741d17c88dc018dd57b729c0cd58965380f3f8 -size 5104916 diff --git a/protobuf.changes b/protobuf.changes index 1f4bf3b..6af35a0 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,28 +1,3 @@ -------------------------------------------------------------------- -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 601866f..da3b088 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -27,7 +27,7 @@ %bcond_without python2 %bcond_without python3 Name: protobuf -Version: 21.3 +Version: 21.2 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause