[packages/protobuf] - up to 3.11.4
arekm
arekm at pld-linux.org
Tue Apr 7 23:45:04 CEST 2020
commit 5fb1028c65ad618aa99f0bda9eb6c21ca5587bf5
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Apr 7 23:44:56 2020 +0200
- up to 3.11.4
no-wrap-memcpy.patch | 27 ++++++++++++++-------------
protobuf.spec | 12 ++++++------
2 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/protobuf.spec b/protobuf.spec
index dcef0ab..480d09e 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.9.0
-Release: 3
+Version: 3.11.4
+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: a44c3bbee380181c86f573b835294782
+# Source0-md5: 47c0308941a8f2c2f838e737f87cc3a1
Source1: ftdetect-proto.vim
Patch0: system-gtest.patch
Patch1: no-wrap-memcpy.patch
@@ -300,17 +300,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.20
+%attr(755,root,root) %ghost %{_libdir}/libprotoc.so.22
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libprotobuf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libprotobuf.so.20
+%attr(755,root,root) %ghost %{_libdir}/libprotobuf.so.22
%files lite
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libprotobuf-lite.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libprotobuf-lite.so.20
+%attr(755,root,root) %ghost %{_libdir}/libprotobuf-lite.so.22
%files devel
%defattr(644,root,root,755)
diff --git a/no-wrap-memcpy.patch b/no-wrap-memcpy.patch
index e050a19..2a62acb 100644
--- a/no-wrap-memcpy.patch
+++ b/no-wrap-memcpy.patch
@@ -1,20 +1,21 @@
---- protobuf-3.7.0/ruby/ext/google/protobuf_c/extconf.rb 2019-03-12 12:41:06.025000000 +0100
-+++ protobuf-3.7.0/ruby/ext/google/protobuf_c/extconf.rb 2019-03-12 12:42:04.062000000 +0100
-@@ -5,19 +5,12 @@
+--- 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 @@
+ require 'mkmf'
+
if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
- # XOPEN_SOURCE needed for strptime:
- # https://stackoverflow.com/questions/35234152/strptime-giving-implicit-declaration-and-undefined-reference
-- $CFLAGS += " -std=c99 -O3 -DNDEBUG -D_XOPEN_SOURCE=700"
-+ $CFLAGS += " -std=c99 -DNDEBUG -D_XOPEN_SOURCE=700"
+- $CFLAGS += " -std=gnu90 -O3 -DNDEBUG -Wall -Wdeclaration-after-statement -Wsign-compare"
++ $CFLAGS += " -std=gnu90 -DNDEBUG -Wall -Wdeclaration-after-statement -Wsign-compare"
else
-- $CFLAGS += " -std=c99 -O3 -DNDEBUG"
--end
--
--
--if RUBY_PLATFORM =~ /linux/
+- $CFLAGS += " -std=gnu90 -O3 -DNDEBUG"
++ $CFLAGS += " -std=gnu90 -DNDEBUG"
+ end
+
+
+ if RUBY_PLATFORM =~ /linux/
- # Instruct the linker to point memcpy calls at our __wrap_memcpy wrapper.
- $LDFLAGS += " -Wl,-wrap,memcpy"
-+ $CFLAGS += " -std=c99 -DNDEBUG"
++ $LDFLAGS += " -std=c99 -DNDEBUG"
end
$objs = ["protobuf.o", "defs.o", "storage.o", "message.o",
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/protobuf.git/commitdiff/5fb1028c65ad618aa99f0bda9eb6c21ca5587bf5
More information about the pld-cvs-commit
mailing list