diff --git a/adding-Release_CompareAndSwap-64-bit-variant.patch b/adding-Release_CompareAndSwap-64-bit-variant.patch deleted file mode 100644 index 7c90723..0000000 --- a/adding-Release_CompareAndSwap-64-bit-variant.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 642e1ac635f2563b4a14c255374f02645ae85dac Mon Sep 17 00:00:00 2001 -From: Nayana-ibm -Date: Mon, 27 Nov 2017 05:43:30 -0500 -Subject: [PATCH] Adding Release_CompareAndSwap 64-bit variant - ---- - src/google/protobuf/stubs/atomicops_internals_generic_gcc.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h b/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h -index 0b0b06ce..075c406a 100644 ---- a/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h -+++ b/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h -@@ -146,6 +146,14 @@ inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) { - return __atomic_load_n(ptr, __ATOMIC_RELAXED); - } - -+inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr, -+ Atomic64 old_value, -+ Atomic64 new_value) { -+ __atomic_compare_exchange_n(ptr, &old_value, new_value, false, -+ __ATOMIC_RELEASE, __ATOMIC_ACQUIRE); -+ return old_value; -+} -+ - #endif // defined(__LP64__) - - } // namespace internal --- -2.16.1 - diff --git a/baselibs.conf b/baselibs.conf index 60c0e17..7e21576 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ -libprotobuf15 -libprotoc15 -libprotobuf-lite15 +libprotobuf17 +libprotoc17 +libprotobuf-lite17 diff --git a/protobuf-3.5.2.tar.gz b/protobuf-3.5.2.tar.gz deleted file mode 100644 index d8175e9..0000000 --- a/protobuf-3.5.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ffd420f39f226e96aebc3554f9c66a912f6cad6261f39f194f16af8a1f6dab2 -size 4584659 diff --git a/protobuf-3.6.1.tar.gz b/protobuf-3.6.1.tar.gz new file mode 100644 index 0000000..5a04550 --- /dev/null +++ b/protobuf-3.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d4e589d81b2006ca603c1ab712c9715a76227293032d05b26fca603f90b3f5b +size 4485582 diff --git a/protobuf.changes b/protobuf.changes index 24cb10c..f0b4c83 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,182 @@ +------------------------------------------------------------------- +Wed Sep 12 07:24:48 UTC 2018 - Thomas Bechtold + +- update to version v3.6.1: + * PHP namespaces for nested messages and enums (#4536) + * Allows the json marshaller to be passed json marshal options (#4252) + * Make sure to delete temporary maps used by FileDescriptorTables + * fix python cpp kokoro build + * Change C# reflection to avoid using expression trees + * Updated checked-in generated code + * Removed unused variables in repeated_scalar_container.cc + * Removed unused code pertaining to shared_ptr + * Include no_package.proto in Python test + * Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262) + * Convert descriptortype to type for upb_msgval_sizeof (#4357) + * Removed duplicate using statement from ReflectionUtil.cs + * Add support for power ppc64le + * Cat the test-suite.log on errors for presubits + * Address review comments + * Add third-party RPC implementation: raster - a network framework supports pbrpc by 'service' keyword. + * Delete javanano kokoro build configs. + * Updated Ruby conformance test failure list + * Removed use of some type traits + * Adopt php_metadata_namespace in php code generator (#4622) + * Move to Xcode 9.3 which also means a High Sierra image. + * Add protoc release script for Linux build. + * protoc-artifacts: Avoid storing temporary files and use fewer layers + * Rewrite go_benchmark + * Add files to build ruby artifact for mac on kokoro (#4814) + * Remove javanano. + * Comment out unused command from release script. + * Avoid direct check of class name (#4601) + * The JsonParseOptions::ignore_unknown_fields option behavior treats + * Fix php memory leak test (#4692) + * Fix benchmark build + * Add VS2017 optional component dependency details to the C# readme (#4128) + * Fix initialization with Visual Studio + * For windows, all python version should use /MT (#4468) + * use brew install instead of easy_install in OSX (#4537) + * Sync upb change (#4373) + * Always add -std=c++11 for mac (#4684) + * Add kokoro build status badges. + * Removed unrecognized option from no_package.proto + * Fixed up proto3_lite_unittest.cc + * Update Xcode settings + * Cleanup LICENSE file. + * Remove js_embed binary. (#4709) + * Fixed JS parsing of unspecified map keys + * Update version number to 3.6.0 + * Deliberately call simple code to avoid Unity linker pruning + * Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources." + * protoc-artifacts: Use ENTRYPOINT to enable devtoolset-1.1 + * MinGW build failed + * Support using MSVC intrinsics in Log2FloorNonZero + * Fix array constructor in c extension for compatibility (#4667) + * Add space between class name and concat message (#4577) + * fix python + * Add performance.md and add instruction for linking tcmalloc + * Add script for run and upload the benchmark result to bq + * Add test for failing write of raw pointer to output stream + * [objectivec] Fix memory leak of exceptions raised by RaiseException() (#4556) + * Remove stray indent on normal imports. + * Fix python ext build on kokoro (#4527) + * Add compile test sources for to test include order. + * Fixed a Visual Studio 2017 build error. (#4488) + * fix linux kokoro build in docker + * Fixes MSVC compiler warning C4800 "Forcing value to bool 'true' or 'false'" (#4350) + * Updated Docker setup to use GCC 4.8 + * Remove broken build status icons. + * Run autogen.sh in release script. + * Output *_pb2_grpc.py when use_grpc_plugin=True + * Adopt ruby_package in ruby generated code. (#4627) + * Cygwin build failed + * Work around an "old runtime" issue with reflection + * Added Kokoro protoc release build for OS X (#4770) + * Updated change log for 3.6.1 release + * Move methods out of class (#4697) + * Fix to allow AOT compilers to play nicely with reflection + * Update Makefile.am for Java lite files. + * Added map_lite_test.proto to fix LiteTest + * Introduce a compatiblity shim to support .NET 3.5 delegate creation + * Revert "Removed mention of Buffer in byteSourceToUint8Array" + * Add gogo benchmark + * Set ext.no_native = true for non mac platform + * Removed atomicops.h since it is no longer used + * Rename a shadowed variable. + * Add kokoro bazel configs for 3.6.x branch. + * Deleted scoped_ptr.h + * Check the message to be encoded is the wrong type. (#4885) (#4949) + * protoc-artifacts: Avoid checking out protobuf code + * Add conformance test for null value in list JSON + * Build ruby gem on kokoro (#4819) + * Try using a new version of Visual Studio on AppVeyor + * Make ruby release configs consistent with protoc. + * fix for API change in PHP 7.3 (#4898) + * Add .proto files to extract_includes.bat + * Update protoc build scripts. + * Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation. + * Additional support for building and deploying ppcle_64 artifacts + * Fix php tests + * Cleanup + documentation for Java Lite runtime. + * Added Kokoro Windows release build config for protoc (#4766) + * typo + * fix golang kokoro linux build + * Fix spelling error of __GNUC_MINOR__ + * Update code to work for Xcode 10b1 (#4729) + * Added pyext/thread_unsafe_shared_ptr.h + * Added missing .inc files to BUILD + * js message support for jstype string on integers (#4332) + * Improve error message when googletest is missing. + * Make assertEquals pass for message (#4947) + * Sync internal benchmark changes + * Removed some unused C++ source files + * Fix missing LIBPROTOC_EXPORT. + * Added new test source files to Makefile.am + * Update php version to 3.6.0 (#4736) + * Fix RepeatedField#delete_if (#4292) + * Merge branch (#4466) + * Implement array constructor in php c extension. + * protoc-artifacts: Update centos base from 6.6 to 6.9 + * PHP array constructors for protobuf messages (#4530) + * Fix problem: cmake build failed in c++11 by clang + * Don't assume Windows builds use MSVC. + * Use legacy name in php runtime (#4741) + * Add file option php_metadata_namespace and ruby_package (#4609) + * Fix cpp benchmark dependency on mac + * Use the first enum value instead of 0 in DefaultValueObjectWriter::FindEnumDefault + * Check return value on write of raw pointer + * Delete unused directories. + * Replace //:protoc and similar default macro arguments with + * Add extra C# file to Makefile.am + * includes the expected class in the exception, otherwise the error is harder to track down (#3371) + * Update instructions about getting protobuf source. + * Add cpp tests under release docker image. + * fix java benchmark, fix dashboard build + * `update_file_lists.sh` depends on Bash features, thus needs Bash sebang. + * Rename build_artifacts.cfg to release.cfg (#4818) + * Fix bug: whether always_print_enums_as_ints is true or false, it always print the default value of enums as strings + * source code info for interpreted options; fix source code info for extension range options (#4342) + * Updated version numbers to 3.6.1 + * Trim imports for bundled generated protos. + * Require C++11 and pass -std=c++11 + * Remove the iOS Test App. + * fix duplicate mkdir in update_file_lists.sh + * Updated csharp/README.md to reflect testing changes + * Fix bazel build of examples. + * Add missing ruby/tests/test_ruby_package.proto + * Fix cpp_distcheck + * Updated the change log with changes for 3.6.0 + * some fix + * CMake: Update CXX Standard management + * Add the files added in #4485. + * Change to deal all messages in one loop + * Fix php conformance test. + * Add __init__.py files to compiler and util subpackages (#4117) + * Updated .gitignore to exclude downloaded gmock/ directory + * Fix error in Clang UndefinedBehaviorSanitizer + * Work around MSVC issue with std::atomic initialization (#4777) + * Updated conformance failure lists + * Add back GeneratedClassName to public (#4686) + * Add continuous test for ruby 2.3, 2.4 and 2.5 (#4829) + * Throw error if user want to access message properties (#4603) + * fix json_decode call parameters (#4381) + * Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources. + * PHP: fixed typo in message.c + * Add go benchmark + * Allow list values to be null when parsing + * Added instruction for existing ZLIB configuration + * Fix 32bit php tests + * Removed javanano from post_process_dist.sh + * Don't generate imports for the WKTs unless generating the WKTs. + * For encoding upb needs descriptor type instead of type. (#4354) + * Include googletest as a submodule (#3993) + * Write messages to backing field in generated C# cloning code (#4440) + * Integrated internal changes from Google +- Drop adding-Release_CompareAndSwap-64-bit-variant.patch . Applied + upstream. +- bump soname version + ------------------------------------------------------------------- Mon May 14 15:19:25 UTC 2018 - tbechtold@suse.com diff --git a/protobuf.spec b/protobuf.spec index 21710f9..f30f793 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define sover 15 +%define sover 17 %define tarname protobuf # requires gmock, which is not yet in the distribution %bcond_with check @@ -25,7 +25,7 @@ %bcond_without python2 %bcond_without python3 Name: protobuf -Version: 3.5.2 +Version: 3.6.1 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause @@ -34,8 +34,6 @@ Url: https://github.com/google/protobuf/ Source0: https://github.com/google/protobuf/archive/v%{version}.tar.gz#/%{tarname}-%{version}.tar.gz Source1: manifest.txt.in Source2: baselibs.conf -# PATCH-FIX-UPSTREAM Adding Release_CompareAndSwap 64-bit variant to fix compile error - mlin@suse.com -Patch0: adding-Release_CompareAndSwap-64-bit-variant.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module python-dateutil} BuildRequires: %{python_module python-gflags} @@ -130,7 +128,6 @@ This package contains the Python bindings for Google Protocol Buffers. %prep %setup -q -n %{tarname}-%{version} -%patch0 -p1 mkdir gmock %if %{with python2} || %{with python3}