Accepting request 1032646 from devel:tools:building

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

10355.patch

@@ -7,16 +7,16 @@ Subject: [PATCH 1/2] Use release version instead of libtool version
  src/Makefile.am | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-Index: protobuf-21.6/src/Makefile.am
+Index: protobuf-21.9/src/Makefile.am
 ===================================================================
---- protobuf-21.6.orig/src/Makefile.am
-+++ protobuf-21.6/src/Makefile.am
+--- protobuf-21.9.orig/src/Makefile.am
++++ protobuf-21.9/src/Makefile.am
 @@ -18,7 +18,7 @@ else
  PTHREAD_DEF =
  endif
  
--PROTOBUF_VERSION = 32:6:0
-+PROTOBUF_VERSION = 3.21.6
+-PROTOBUF_VERSION = 32:9:0
++PROTOBUF_VERSION = 3.21.9
  
  if GCC
  # Turn on all warnings except for sign comparison (we ignore sign comparison
@@ -47,10 +47,10 @@ Index: protobuf-21.6/src/Makefile.am
  if HAVE_LD_VERSION_SCRIPT
  libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map
  EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map
-Index: protobuf-21.6/cmake/libprotobuf-lite.cmake
+Index: protobuf-21.9/cmake/libprotobuf-lite.cmake
 ===================================================================
---- protobuf-21.6.orig/cmake/libprotobuf-lite.cmake
-+++ protobuf-21.6/cmake/libprotobuf-lite.cmake
+--- protobuf-21.9.orig/cmake/libprotobuf-lite.cmake
++++ protobuf-21.9/cmake/libprotobuf-lite.cmake
 @@ -112,7 +112,6 @@ if(protobuf_BUILD_SHARED_LIBS)
  endif()
  set_target_properties(libprotobuf-lite PROPERTIES
@@ -59,10 +59,10 @@ Index: protobuf-21.6/cmake/libprotobuf-lite.cmake
      OUTPUT_NAME ${LIB_PREFIX}protobuf-lite
      DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
  add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
-Index: protobuf-21.6/cmake/libprotobuf.cmake
+Index: protobuf-21.9/cmake/libprotobuf.cmake
 ===================================================================
---- protobuf-21.6.orig/cmake/libprotobuf.cmake
-+++ protobuf-21.6/cmake/libprotobuf.cmake
+--- protobuf-21.9.orig/cmake/libprotobuf.cmake
++++ protobuf-21.9/cmake/libprotobuf.cmake
 @@ -128,7 +128,6 @@ if(protobuf_BUILD_SHARED_LIBS)
  endif()
  set_target_properties(libprotobuf PROPERTIES
@@ -71,10 +71,10 @@ Index: protobuf-21.6/cmake/libprotobuf.cmake
      OUTPUT_NAME ${LIB_PREFIX}protobuf
      DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
  add_library(protobuf::libprotobuf ALIAS libprotobuf)
-Index: protobuf-21.6/cmake/libprotoc.cmake
+Index: protobuf-21.9/cmake/libprotoc.cmake
 ===================================================================
---- protobuf-21.6.orig/cmake/libprotoc.cmake
-+++ protobuf-21.6/cmake/libprotoc.cmake
+--- protobuf-21.9.orig/cmake/libprotoc.cmake
++++ protobuf-21.9/cmake/libprotoc.cmake
 @@ -130,7 +130,6 @@ endif()
  set_target_properties(libprotoc PROPERTIES
      COMPILE_DEFINITIONS LIBPROTOC_EXPORTS

baselibs.conf

@@ -1,3 +1,3 @@
-libprotobuf3_21_6
-libprotoc3_21_6
-libprotobuf-lite3_21_6
+libprotobuf3_21_9
+libprotoc3_21_9
+libprotobuf-lite3_21_9

protobuf-21.6.tar.gz

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

protobuf-21.9.tar.gz

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

protobuf.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Sat Oct 29 12:20:55 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 21.9:
+  * Ruby
+      * Replace libc strdup usage with internal impl to restore musl compat (#10818)
+      * Auto capitalize enums name in Ruby (#10454) (#10763)
+  * Other
+      * Fix for grpc.tools #17995 & protobuf #7474 (handle UTF-8 paths in argumentfile) (#10721)
+  * C++
+      * 21.x No longer define no_threadlocal on OpenBSD (#10743)
+  * Java
+      * Mark default instance as immutable first to avoid race during static initialization of default instances (#10771)
+      * Refactoring java full runtime to reuse sub-message builders and prepare to
+        migrate parsing logic from parse constructor to builder.
+      * Move proto wireformat parsing functionality from the private "parsing
+        constructor" to the Builder class.
+      * Change the Lite runtime to prefer merging from the wireformat into mutable
+        messages rather than building up a new immutable object before merging. This
+        way results in fewer allocations and copy operations.
+      * Make message-type extensions merge from wire-format instead of building up
+        instances and merging afterwards. This has much better performance.
+      * Fix TextFormat parser to build up recurring (but supposedly not repeated)
+        sub-messages directly from text rather than building a new sub-message and
+        merging the fully formed message into the existing field.
+
 -------------------------------------------------------------------
 Mon Sep 19 07:27:02 UTC 2022 - Dirk Müller <dmueller@suse.com>
 

protobuf.spec

@@ -17,7 +17,7 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define sover 3_21_6
+%define sover 3_21_9
 %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:        21.6
+Version:        21.9
 Release:        0
 Summary:        Protocol Buffers - Google's data interchange format
 License:        BSD-3-Clause