commit abcf9984e7e08b5f0228e23534436f3ab6a0eb12 Author: Marcin Krol <h...@tld-linux.org> Date: Tue Mar 12 15:32:50 2019 +0100
- updated to 3.7.0 (new soname) no-wrap-memcpy.patch | 29 ++++++++++++++++------------- protobuf.spec | 12 ++++++------ 2 files changed, 22 insertions(+), 19 deletions(-) --- diff --git a/protobuf.spec b/protobuf.spec index bfd87c1..c53269e 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.6.1 +Version: 3.7.0 Release: 1 License: BSD Group: Libraries #Source0Download: https://github.com/google/protobuf/releases Source0: https://github.com/google/protobuf/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: e8ce2659ea4f5df1a1e0dbd107dd61d9 +# Source0-md5: 99ab003ca0e98c9dc40edbd60dd43633 Source1: ftdetect-proto.vim Patch0: system-gtest.patch Patch1: no-wrap-memcpy.patch @@ -271,7 +271,7 @@ install ruby/lib/google/protobuf_c.so $RPM_BUILD_ROOT%{ruby_vendorarchdir}/googl cp -pr ruby/lib/google/{protobuf,protobuf.rb} $RPM_BUILD_ROOT%{ruby_vendorlibdir}/google cp -p ruby/google-protobuf.gemspec $RPM_BUILD_ROOT%{ruby_specdir}/google-protobuf-%{version}.gemspec %endif -cp -p examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +cp -pr examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} %clean rm -rf $RPM_BUILD_ROOT @@ -290,17 +290,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.17 +%attr(755,root,root) %ghost %{_libdir}/libprotoc.so.18 %files libs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libprotobuf.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libprotobuf.so.17 +%attr(755,root,root) %ghost %{_libdir}/libprotobuf.so.18 %files lite %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libprotobuf-lite.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libprotobuf-lite.so.17 +%attr(755,root,root) %ghost %{_libdir}/libprotobuf-lite.so.18 %files devel %defattr(644,root,root,755) diff --git a/no-wrap-memcpy.patch b/no-wrap-memcpy.patch index f3b1589..e050a19 100644 --- a/no-wrap-memcpy.patch +++ b/no-wrap-memcpy.patch @@ -1,22 +1,25 @@ ---- protobuf-3.6.1/ruby/ext/google/protobuf_c/extconf.rb.orig 2018-10-12 18:23:59.206483460 +0200 -+++ protobuf-3.6.1/ruby/ext/google/protobuf_c/extconf.rb 2018-10-12 18:42:35.729804045 +0200 -@@ -3,17 +3,11 @@ - require 'mkmf' - - unless RUBY_PLATFORM =~ /mswin|mingw/ +--- 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 @@ + 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" + else - $CFLAGS += " -std=c99 -O3 -DNDEBUG" -+ $CFLAGS += " -std=c99 -DNDEBUG" - end - - +-end +- +- -if RUBY_PLATFORM =~ /linux/ - # Instruct the linker to point memcpy calls at our __wrap_memcpy wrapper. - $LDFLAGS += " -Wl,-wrap,memcpy" --end -- ++ $CFLAGS += " -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"] ++ "repeated_field.o", "map.o", "encode_decode.o", "upb.o" ] create_makefile("google/protobuf_c") ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/protobuf.git/commitdiff/abcf9984e7e08b5f0228e23534436f3ab6a0eb12 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit