Update protobuf to version 21.2 / rev 63

https://build.opensuse.org/package/rdiff/openSUSE:Factory/protobuf?linkrev=base&rev=63 by user dimstar_suse protocolbuffers/protobuf#10323
bmwiedemann · Aug 4, 2022 · 1f7cbab · 1f7cbab
1 parent 571b445
commit 1f7cbab
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 34 deletions.
diff --git a/packages/p/protobuf/.files b/packages/p/protobuf/.files
diff --git a/packages/p/protobuf/.rev b/packages/p/protobuf/.rev
@@ -687,4 +687,11 @@
     <comment>Automatic submission by obs-autosubmit</comment>
     <requestid>992221</requestid>
   </revision>
+  <revision rev="63" vrev="3">
+    <srcmd5>cb93929f997d78a3f7181be550c39980</srcmd5>
+    <version>21.2</version>
+    <time>1659613242</time>
+    <user>dimstar_suse</user>
+    <comment>https://github.com/protocolbuffers/protobuf/issues/10323</comment>
+  </revision>
 </revisionlist>
diff --git a/packages/p/protobuf/.servicemark b/packages/p/protobuf/.servicemark
@@ -0,0 +1 @@
+6553c69f7154fa1dca6b30d2998f48f5
diff --git a/packages/p/protobuf/gcc12-disable-__constinit-with-c++-11.patch b/packages/p/protobuf/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/packages/p/protobuf/protobuf-21.2.tar.gz b/packages/p/protobuf/protobuf-21.2.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeib6kuttrodcwdgbsdpc43p3enqgpiuoxp4tfbyr7lmxw5fvowflhu
diff --git a/packages/p/protobuf/protobuf-21.3.tar.gz b/packages/p/protobuf/protobuf-21.3.tar.gz
diff --git a/packages/p/protobuf/protobuf.changes b/packages/p/protobuf/protobuf.changes
@@ -1,28 +1,3 @@
--------------------------------------------------------------------
-Mon Jul 25 07:11:14 UTC 2022 - Dirk Müller <dmueller@suse.com>
-
-- 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 <info@paolostivanin.com>
 

diff --git a/packages/p/protobuf/protobuf.spec b/packages/p/protobuf/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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/ipfs/bafybeib6kuttrodcwdgbsdpc43p3enqgpiuoxp4tfbyr7lmxw5fvowflhu