Accepting request 1088980 from system:homeautomation:home-assistant:unstable

- update to v23.1
  * C++: Add a workaround for GCC constexpr bug
  * C#: Replace regex that validates descriptor names
- gcc12-disable-__constinit-with-c++-11.patch is obsolete

OBS-URL: https://build.opensuse.org/request/show/1088980
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=148
This commit is contained in:
Dirk Mueller 2023-05-25 11:12:35 +00:00 committed by Git OBS Bridge
parent b3ac2d0654
commit 86f9dc655f
5 changed files with 13 additions and 23 deletions

View File

@ -1,17 +0,0 @@
Index: protobuf-22.3/src/google/protobuf/port_def.inc
===================================================================
--- protobuf-22.3.orig/src/google/protobuf/port_def.inc
+++ protobuf-22.3/src/google/protobuf/port_def.inc
@@ -708,7 +708,11 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201
# define PROTOBUF_CONSTINIT [[clang::require_constant_initialization]]
# define PROTOBUF_CONSTEXPR constexpr
# elif PROTOBUF_GNUC_MIN(12, 2)
-# define PROTOBUF_CONSTINIT __constinit
+#if PROTOBUF_CPLUSPLUS_MIN(201703L)
+#define PROTOBUF_CONSTINIT __constinit
+#else
+#define PROTOBUF_CONSTINIT
+#endif
# define PROTOBUF_CONSTEXPR constexpr
# endif
#endif

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:786bf22c8fd3f20b7242df3b9649900714b0ba77b24a4971573088f41dfe9f8a
size 4922612

3
protobuf-23.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dc167b7d23ec0d6e4a3d4eae1798de6c8d162e69fa136d39753aaeb7a6e1289d
size 5040405

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed May 24 06:32:33 UTC 2023 - Adrian Schröter <adrian@suse.de>
- update to v23.1
* C++: Add a workaround for GCC constexpr bug
* C#: Replace regex that validates descriptor names
- gcc12-disable-__constinit-with-c++-11.patch is obsolete
-------------------------------------------------------------------
Tue May 9 09:26:46 UTC 2023 - Martin Pluskal <mpluskal@suse.com>

View File

@ -28,9 +28,9 @@
%bcond_without java
%bcond_without python3
Name: protobuf
Version: 22.3
Version: 23.1
# python module have their own version specified in python/google/protobuf/__init__.py
%define pversion 4.22.3
%define pversion 4.23.1
Release: 0
Summary: Protocol Buffers - Google's data interchange format
License: BSD-3-Clause
@ -40,7 +40,6 @@ Source0: https://github.com/protocolbuffers/protobuf/archive/v%{version}.
Source1: manifest.txt.in
Source2: baselibs.conf
Source1000: %{name}-rpmlintrc
Patch0: gcc12-disable-__constinit-with-c++-11.patch
Patch1: add-missing-stdint-header.patch
BuildRequires: %{python_module abseil}
BuildRequires: %{python_module devel}