Accepting request 988286 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/988286
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/protobuf?expand=0&rev=59

baselibs.conf

@@ -1,3 +1,3 @@
-libprotobuf31
-libprotoc31
-libprotobuf-lite31
+libprotobuf32
+libprotoc32
+libprotobuf-lite32

gcc12-disable-__constinit-with-c++-11.patch

@@ -1,11 +1,9 @@
-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 @@
+--- 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, 0)
+ #elif PROTOBUF_GNUC_MIN(12, 2)
 +#if PROTOBUF_CPLUSPLUS_MIN(201703L)
  #define PROTOBUF_CONSTINIT __constinit
 +#else

protobuf-21.2.tar.gz

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

protobuf-3.20.1.tar.gz

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

protobuf.changes

@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Sun Jul  3 07:50:16 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to 21.2:
+- C++
+  - cmake: Call get_filename_component() with DIRECTORY mode instead of PATH mode (#9614)
+  - Escape GetObject macro inside protoc-generated code (#9739)
+  - Update CMake configuration to add a dependency on Abseil (#9793)
+  - Fix cmake install targets (#9822)
+  - Use __constinit only in GCC 12.2 and up (#9936)
+- Java
+  - Update protobuf_version.bzl to separate protoc and per-language java … (#9900)
+- Python
+  - Increment python major version to 4 in version.json for python upb (#9926)
+  - The C extension module for Python has been rewritten to use the upb library.
+  - This is expected to deliver significant performance benefits, especially when
+    parsing large payloads. There are some minor breaking changes, but these
+    should not impact most users. For more information see:
+    https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+- PHP
+  - [PHP] fix PHP build system (#9571)
+  - Fix building packaged PHP extension (#9727)
+  - fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility (#9633)
+  - fix: phpdoc syntax for repeatedfield parameters (#9784)
+  - fix: phpdoc for repeatedfield (#9783)
+  - Change enum string name for reserved words (#9780)
+  - chore: [PHP] fix phpdoc for MapField keys (#9536)
+  - Fixed PHP SEGV by not writing to shared memory for zend_class_entry. (#9996)
+- Ruby
+  - Allow pre-compiled binaries for ruby 3.1.0 (#9566)
+  - Implement respond_to? in RubyMessage (#9677)
+  - [Ruby] Fix RepeatedField#last, #first inconsistencies (#9722)
+  - Do not use range based UTF-8 validation in truffleruby (#9769)
+  - Improve range handling logic of RepeatedField (#9799)
+- Other
+  - Fix invalid dependency manifest when using descriptor_set_out (#9647)
+  - Remove duplicate java generated code (#9909)
+
 -------------------------------------------------------------------
 Wed May 11 14:13:04 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

protobuf.spec

@@ -17,7 +17,7 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define sover 31
+%define sover 32
 %define tarname protobuf
 %define src_install_dir %{_prefix}/src/%{name}
 %define extra_java_flags -source 7 -target 7
@@ -27,7 +27,7 @@
 %bcond_without python2
 %bcond_without python3
 Name:           protobuf
-Version:        3.20.1
+Version:        21.2
 Release:        0
 Summary:        Protocol Buffers - Google's data interchange format
 License:        BSD-3-Clause
@@ -241,7 +241,6 @@ find %{buildroot}%{src_install_dir} -type f -name "*.sh" -exec sed -i 's|#!.*%{_
 find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!%{_bindir}/python2.4|#!%{_bindir}/python2.7|' "{}" +
 # Fix spurious-executable-perm rpmlint error
 chmod -x %{buildroot}%{src_install_dir}/src/google/protobuf/arenastring.h
-chmod -x %{buildroot}%{src_install_dir}/src/google/protobuf/compiler/js/js_generator.h
 chmod -x %{buildroot}%{src_install_dir}/src/google/protobuf/reflection.h
 # Fix version-control-internal-file rpmlint warning
 find %{buildroot}%{src_install_dir} -type f -name ".gitignore" -exec rm -f "{}" +