commit c7d35bcb2a0538c39c1e67757727e4cbc8d5e74c
Author: Jakub Bogusz <[email protected]>
Date: Wed Jun 29 22:03:13 2022 +0200
- updated to 3.17.3 (new sonames; the last of python2 binding)
no-wrap-memcpy.patch | 23 +++++++++--------------
protobuf.spec | 12 ++++++------
2 files changed, 15 insertions(+), 20 deletions(-)
---
diff --git a/protobuf.spec b/protobuf.spec
index 903691f..8e3286a 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -12,13 +12,13 @@
Summary: Protocol Buffers - Google's data interchange format
Summary(pl.UTF-8): Protocol Buffers - format wymiany danych Google
Name: protobuf
-Version: 3.14.0
-Release: 6
+Version: 3.17.3
+Release: 1
License: BSD
Group: Libraries
#Source0Download: https://github.com/google/protobuf/releases
Source0:
https://github.com/google/protobuf/releases/download/v%{version}/%{name}-all-%{version}.tar.gz
-# Source0-md5: d0a7dd930210af5285c08c8a2c2304ab
+# Source0-md5: 689cac84577732d00dfec6e3d5b87cee
Source1: ftdetect-proto.vim
Patch0: system-gtest.patch
Patch1: no-wrap-memcpy.patch
@@ -313,17 +313,17 @@ rm -rf $RPM_BUILD_ROOT
%doc CHANGES.txt CONTRIBUTORS.txt LICENSE README.md
%attr(755,root,root) %{_bindir}/protoc
%attr(755,root,root) %{_libdir}/libprotoc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libprotoc.so.25
+%attr(755,root,root) %ghost %{_libdir}/libprotoc.so.28
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libprotobuf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libprotobuf.so.25
+%attr(755,root,root) %ghost %{_libdir}/libprotobuf.so.28
%files lite
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libprotobuf-lite.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libprotobuf-lite.so.25
+%attr(755,root,root) %ghost %{_libdir}/libprotobuf-lite.so.28
%files devel
%defattr(644,root,root,755)
diff --git a/no-wrap-memcpy.patch b/no-wrap-memcpy.patch
index 2a62acb..d721ac0 100644
--- a/no-wrap-memcpy.patch
+++ b/no-wrap-memcpy.patch
@@ -1,26 +1,21 @@
---- protobuf-3.11.4/ruby/ext/google/protobuf_c/extconf.rb~ 2020-02-14
21:13:37.000000000 +0100
-+++ protobuf-3.11.4/ruby/ext/google/protobuf_c/extconf.rb 2020-04-07
22:56:24.419874091 +0200
-@@ -3,19 +3,17 @@
+--- protobuf-3.17.3/ruby/ext/google/protobuf_c/extconf.rb~ 2020-02-14
21:13:37.000000000 +0100
++++ protobuf-3.17.3/ruby/ext/google/protobuf_c/extconf.rb 2020-04-07
22:56:24.419874091 +0200
+@@ -3,15 +3,15 @@
require 'mkmf'
if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
-- $CFLAGS += " -std=gnu90 -O3 -DNDEBUG -Wall -Wdeclaration-after-statement
-Wsign-compare"
-+ $CFLAGS += " -std=gnu90 -DNDEBUG -Wall -Wdeclaration-after-statement
-Wsign-compare"
+- $CFLAGS += " -std=gnu99 -O3 -DNDEBUG -fvisibility=hidden -Wall
-Wsign-compare -Wno-declaration-after-statement"
++ $CFLAGS += " -std=gnu99 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare
-Wno-declaration-after-statement"
else
-- $CFLAGS += " -std=gnu90 -O3 -DNDEBUG"
-+ $CFLAGS += " -std=gnu90 -DNDEBUG"
+- $CFLAGS += " -std=gnu99 -O3 -DNDEBUG"
++ $CFLAGS += " -std=gnu99 -DNDEBUG"
end
if RUBY_PLATFORM =~ /linux/
-- # Instruct the linker to point memcpy calls at our __wrap_memcpy wrapper.
+ # Instruct the linker to point memcpy calls at our __wrap_memcpy wrapper.
- $LDFLAGS += " -Wl,-wrap,memcpy"
+ $LDFLAGS += " -std=c99 -DNDEBUG"
end
- $objs = ["protobuf.o", "defs.o", "storage.o", "message.o",
-- "repeated_field.o", "map.o", "encode_decode.o", "upb.o",
-- "wrap_memcpy.o"]
-+ "repeated_field.o", "map.o", "encode_decode.o", "upb.o" ]
-
- create_makefile("google/protobuf_c")
+ $objs = ["protobuf.o", "convert.o", "defs.o", "message.o",
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/protobuf.git/commitdiff/c7d35bcb2a0538c39c1e67757727e4cbc8d5e74c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
