[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: ff18a544a0a2ab7413c4ab395b7253f5ca2ceab9 Author: wangjiezhe gmail com> AuthorDate: Fri Jan 19 10:27:06 2024 + Commit: Jason Zaman gentoo org> CommitDate: Sat Feb 3 19:32:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff18a544 dev-libs/protobuf: add 22.5 dependency tree: - tensorflow-2.13.1 - net-libs/grpc-1.55.1 - dev-libs/protobuf-22.5 - dev-cpp/abseil-cpp-20230125.2 Signed-off-by: wangjiezhe gmail.com> Signed-off-by: Jason Zaman gentoo.org> dev-libs/protobuf/Manifest | 1 + ...e-ABI-for-static-and-shared-libraries-on-.patch | 71 + ...issing-PROTOBUF_EXPORT-for-public-symbols.patch | 32 ++ dev-libs/protobuf/protobuf-22.5.ebuild | 117 + 4 files changed, 221 insertions(+) diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index 20e1338a9868..8695f23be04a 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -1,3 +1,4 @@ DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346 DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1 +DIST protobuf-22.5.tar.gz 4924661 BLAKE2B d69c73f4ebfddf45fd94b4f5f898faf00256fe674f2cbc0443c60a88d7a0f47fb96f2f6262879927c6da88095b4ea3ee7fd4c471c100bf42a2bae9edf48c07f1 SHA512 058ab2fec5b11007972e6043071056d1944c3b6fe1d31246cddba8eb57686e3b5280f6ad3d58e78940ca63005e74a8de3c72237f9f7c5066548c5a2513ddc584 DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b diff --git a/dev-libs/protobuf/files/protobuf-22.5-Use-the-same-ABI-for-static-and-shared-libraries-on-.patch b/dev-libs/protobuf/files/protobuf-22.5-Use-the-same-ABI-for-static-and-shared-libraries-on-.patch new file mode 100644 index ..4bbed7ecbaf5 --- /dev/null +++ b/dev-libs/protobuf/files/protobuf-22.5-Use-the-same-ABI-for-static-and-shared-libraries-on-.patch @@ -0,0 +1,71 @@ +From 4329fde9cf3fab7d1b3a9abe0fbeee1ad8a8b111 Mon Sep 17 00:00:00 2001 +From: "Romain Geissler @ Amadeus" +Date: Tue, 6 Jun 2023 10:49:55 -0700 +Subject: [PATCH] Use the same ABI for static and shared libraries on + non-Windows platforms (#12983) + +Hi, + +It seems that until last year, the logic behind `PROTOBUF_USE_DLLS` was for Windows (MSCV) only. It was changed to all platforms here in https://github.com/protocolbuffers/protobuf/commit/5a0887fc6529596eff5c0f72febc602a9d494cc2 + +Last month, the generated pkg config files were updated to reflect the protobuf build-time value of `PROTOBUF_USE_DLLS` as it was indeed noted that it changes the ABI. This was done in https://github.com/protocolbuffers/protobuf/pull/12700 In the commit message it is mentionned that most likely we shall rather have a stable ABI. + +Finally in https://github.com/protocolbuffers/protobuf/issues/12746 which at some point mentions https://issuetracker.google.com/issues/283987730#comment7 where a Google employee hits the linker issue: +``` +undefined reference to `google::protobuf::internal::ThreadSafeArena::thread_cache_' +``` +which denotes a mix of some .o or libs built `PROTOBUF_USE_DLLS` defined and some others build with `PROTOBUF_USE_DLLS` undefined, resulting in ABI incompatibilities. + +I also hit this issue while trying to include protobuf in a corporate environment using it's own proprietary build system in which it is expected that .a and .so use a compatible ABI. + +From my own understanding, ideally we should always use `thread_local` variables, but experience has shown that: + - old iOS (iOS < 9) didn't seem to accept `thread_local`, leading to the `GOOGLE_PROTOBUF_NO_THREADLOCAL` macro later renamed `PROTOBUF_NO_THREADLOCAL` which allowed to disable this, but it is not set anywhere in the protobuf code base. Also I doubt you still want to support such old iOS now, so maybe you should consider removing all `PROTOBUF_NO_THREADLOCAL` related code paths (this pull request doesn't do this). + - MSVC's DLL interface doesn't seem to accept exporting thread local variables (at least from what I understood, I know absolutely nothing about the Windows ecosystem), yet we can "hide" a thread local variable in a static function using a thread local variable. However in that case
[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: 2bf32183a2b79e19eb860b8e39dd2e8ac226113e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jun 27 20:00:38 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jun 27 20:14:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bf32183
dev-libs/protobuf: drop unmaintained
Multiple patches are broken, not synced with last release version bump,
autotools build system is dead.
Signed-off-by: Andreas Sturmlechner gentoo.org>
...protobuf-3.20.1-protoc_input_output_files.patch | 240 -
dev-libs/protobuf/protobuf-.ebuild | 148 -
2 files changed, 388 deletions(-)
diff --git
a/dev-libs/protobuf/files/protobuf-3.20.1-protoc_input_output_files.patch
b/dev-libs/protobuf/files/protobuf-3.20.1-protoc_input_output_files.patch
deleted file mode 100644
index 39a68650a74a..
--- a/dev-libs/protobuf/files/protobuf-3.20.1-protoc_input_output_files.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-https://github.com/protocolbuffers/protobuf/pull/235
-
a/src/google/protobuf/compiler/command_line_interface.cc
-+++ b/src/google/protobuf/compiler/command_line_interface.cc
-@@ -1110,6 +1110,28 @@
- }
-
- if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
-+bool success = false;
-+int in_fd = STDIN_FILENO;
-+int out_fd = STDOUT_FILENO;
-+
-+if (!protobuf_in_path_.empty()) {
-+ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
-+ if (in_fd == -1) {
-+std::cerr << protobuf_in_path_ << ": error: failed to open file." <<
std::endl;
-+return 1;
-+ }
-+}
-+if (!protobuf_out_path_.empty()) {
-+ out_fd = open(protobuf_out_path_.c_str(),
-+O_WRONLY | O_CREAT | O_TRUNC,
-+0644);
-+ if (out_fd == -1) {
-+std::cerr << protobuf_out_path_ << ": error: failed to open file." <<
std::endl;
-+close(in_fd);
-+return 1;
-+ }
-+}
-+
- if (codec_type_.empty()) {
- // HACK: Define an EmptyMessage type to use for decoding.
- DescriptorPool pool;
-@@ -1118,13 +1140,20 @@
- file.add_message_type()->set_name("EmptyMessage");
- GOOGLE_CHECK(pool.BuildFile(file) != NULL);
- codec_type_ = "EmptyMessage";
-- if (!EncodeOrDecode()) {
--return 1;
-- }
-+ success = EncodeOrDecode(, in_fd, out_fd);
- } else {
-- if (!EncodeOrDecode(descriptor_pool.get())) {
--return 1;
-- }
-+ success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
-+}
-+
-+if (in_fd != STDIN_FILENO) {
-+ close(in_fd);
-+}
-+if (out_fd != STDOUT_FILENO) {
-+ close(out_fd);
-+}
-+
-+if (!success) {
-+ return 1;
- }
- }
-
-@@ -1163,6 +1192,11 @@
- for (int i = 0; i < proto_path_.size(); i++) {
- source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
- }
-+ if (mode_ == MODE_COMPILE &&
-+ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
-+std::cerr << "--protobuf_in and --protobuf_out are only valid with "
-+ << "decode operations. Ignoring.";
-+ }
-
- // Map input files to virtual paths if possible.
- if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
-@@ -1885,6 +1919,12 @@
- } else if (name == "--deterministic_output") {
- deterministic_output_ = true;
-
-+ } else if (name == "--protobuf_in") {
-+protobuf_in_path_ = value;
-+
-+ } else if (name == "--protobuf_out") {
-+protobuf_out_path_ = value;
-+
- } else if (name == "--error_format") {
- if (value == "gcc") {
- error_format_ = ERROR_FORMAT_GCC;
-@@ -2018,22 +2058,38 @@
- --version Show version info and exit.
- -h, --help Show this text and exit.
- --encode=MESSAGE_TYPE Read a text-format message of the given type
-- from standard input and write it in binary
-- to standard output. The message type must
-+ from input protobuf file and write it in binary
-+ to output protobuf file. The message type must
- be defined in PROTO_FILES or their imports.
-+ The input/output protobuf files are specified
-+ using the --protobuf_in and --protobuf_out
-+ command line flags.
- --deterministic_output When using --encode, ensure map fields are
- deterministically ordered. Note that this order
- is not canonical, and changes across builds or
- releases of protoc.
- --decode=MESSAGE_TYPE Read a binary message of the given type from
-- standard input and write it in text format
-- to standard output. The
[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: a3b762d0a79a116e0a956d402b4f15269e282ec7
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Thu Nov 18 05:00:00 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Nov 18 22:22:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b762d0
dev-libs/protobuf: Delete old version (3.15.8).
Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org>
Signed-off-by: Mike Gilbert gentoo.org>
dev-libs/protobuf/Manifest | 1 -
...protobuf-3.15.0-protoc_input_output_files.patch | 240 -
.../files/protobuf-3.15.0-system_libraries.patch | 121 ---
dev-libs/protobuf/protobuf-3.15.8.ebuild | 140
4 files changed, 502 deletions(-)
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index e4219af26c33..e5d6443b5d31 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,4 +1,3 @@
-DIST protobuf-3.15.8.tar.gz 5285277 BLAKE2B
798fc011ac03cdc2406acf5845c667d8482082044bdace06c2c1d02b5b1b69c1b1f30e29774180dc1801a1d21d62e2ce50325105859564a1e36d3fe478e64d8b
SHA512
56fc6df2dae14eee0fb67dd4204fc1ec54a18d994a69c9e42c7888d0cd50d269d1c5e1445d74f0fa705850d4ac86a22d86781e09769a716e5c6f829b15b05592
DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B
9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123
SHA512
0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5
DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B
a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9
SHA512
36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36
DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B
7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1
SHA512
5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
diff --git
a/dev-libs/protobuf/files/protobuf-3.15.0-protoc_input_output_files.patch
b/dev-libs/protobuf/files/protobuf-3.15.0-protoc_input_output_files.patch
deleted file mode 100644
index 8e9733fc4644..
--- a/dev-libs/protobuf/files/protobuf-3.15.0-protoc_input_output_files.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-https://github.com/protocolbuffers/protobuf/pull/235
-
/src/google/protobuf/compiler/command_line_interface.cc
-+++ /src/google/protobuf/compiler/command_line_interface.cc
-@@ -1109,6 +1109,28 @@
- }
-
- if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
-+bool success = false;
-+int in_fd = STDIN_FILENO;
-+int out_fd = STDOUT_FILENO;
-+
-+if (!protobuf_in_path_.empty()) {
-+ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
-+ if (in_fd == -1) {
-+std::cerr << protobuf_in_path_ << ": error: failed to open file." <<
std::endl;
-+return 1;
-+ }
-+}
-+if (!protobuf_out_path_.empty()) {
-+ out_fd = open(protobuf_out_path_.c_str(),
-+O_WRONLY | O_CREAT | O_TRUNC,
-+0644);
-+ if (out_fd == -1) {
-+std::cerr << protobuf_out_path_ << ": error: failed to open file." <<
std::endl;
-+close(in_fd);
-+return 1;
-+ }
-+}
-+
- if (codec_type_.empty()) {
- // HACK: Define an EmptyMessage type to use for decoding.
- DescriptorPool pool;
-@@ -1117,13 +1139,20 @@
- file.add_message_type()->set_name("EmptyMessage");
- GOOGLE_CHECK(pool.BuildFile(file) != NULL);
- codec_type_ = "EmptyMessage";
-- if (!EncodeOrDecode()) {
--return 1;
-- }
-+ success = EncodeOrDecode(, in_fd, out_fd);
- } else {
-- if (!EncodeOrDecode(descriptor_pool.get())) {
--return 1;
-- }
-+ success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
-+}
-+
-+if (in_fd != STDIN_FILENO) {
-+ close(in_fd);
-+}
-+if (out_fd != STDOUT_FILENO) {
-+ close(out_fd);
-+}
-+
-+if (!success) {
-+ return 1;
- }
- }
-
-@@ -1161,6 +1190,11 @@
- for (int i = 0; i < proto_path_.size(); i++) {
- source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
- }
-+ if (mode_ == MODE_COMPILE &&
-+ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
-+std::cerr << "--protobuf_in and --protobuf_out are only valid with "
-+ << "decode operations. Ignoring.";
-+ }
-
- // Map input files to virtual paths if possible.
- if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
-@@ -1892,6 +1926,12 @@
- } else if (name == "--deterministic_output") {
- deterministic_output_ = true;
-
-+ } else if (name == "--protobuf_in") {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: 540f19a175063c37713fbebc9dac081cedd4f1e8 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sat Jun 5 00:00:00 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Jun 6 17:04:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=540f19a1 dev-libs/protobuf: Delete old version (3.14.0). Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Mike Gilbert gentoo.org> dev-libs/protobuf/Manifest | 1 - .../protobuf-3.13.0-disable_no-warning-test.patch | 19 -- .../files/protobuf-3.13.0-system_libraries.patch | 121 -- ...protobuf-3.14.0-protoc_input_output_files.patch | 268 - dev-libs/protobuf/protobuf-3.14.0.ebuild | 131 -- 5 files changed, 540 deletions(-) diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index db2b1f99008..a4051caa640 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -1,4 +1,3 @@ -DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11 DIST protobuf-3.15.0.tar.gz 5284848 BLAKE2B 6c1135499dd73b6d1764f47ded6415f8073841bccf5d5626e751fc159b67a6103d71a84096f563053c34c9e4235504238fcdc86ebb757d38b2f4bc1674d08674 SHA512 f52dfbfabdff3306d26ec05cbba7cd47bf3db8b08f4fb27e2cbd5a594de57f0a7ab2212dcea2055a9adfddc94ae4df2d0b1caea311ead75bb850ef8458b1b74a DIST protobuf-3.15.1.tar.gz 5284851 BLAKE2B 5e3f487ba1c3f6a3d2d87f2421f9b07aa4618df0853b05364d7f29e93d8e7dc4c3ece08ba3b7cd0bf69d0faaa32ccc952218a8df7575b74aa6216977f2b2219b SHA512 24efeec969ee72833c377e6287e3b06a431d54d9b3be50635685f6903534f15c2957d78cdbf4bcc6482732ecdbc735dc894c0b9095486419b8d11d6df6169180 DIST protobuf-3.15.2.tar.gz 5284455 BLAKE2B 433ac18774395174798d110e4eaae95c44bc8be89cfae85648497f8531cf19513f4c7745a6afc27d6d49a07e7e1fb4faeff73530fa082665727095e837f11940 SHA512 34e82ece83f47249fd5398a955e4f0a32d0722abcaa4e90c741bdc5106a0bd92088babe3d10d818dd89e2e9254cecbb68ae0c182ea408d4f1e2d70318e7baf37 diff --git a/dev-libs/protobuf/files/protobuf-3.13.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.13.0-disable_no-warning-test.patch deleted file mode 100644 index 1c583fec0fd..000 --- a/dev-libs/protobuf/files/protobuf-3.13.0-disable_no-warning-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings. - /src/Makefile.am -+++ /src/Makefile.am -@@ -708,7 +708,7 @@ - GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock - check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ - protobuf-lite-test test_plugin protobuf-lite-arena-test \ -- no-warning-test $(GZCHECKPROGRAMS) -+ $(GZCHECKPROGRAMS) - protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ - $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ - $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ -@@ -895,4 +895,4 @@ - - TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ - google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \ --protobuf-lite-arena-test no-warning-test -+protobuf-lite-arena-test diff --git a/dev-libs/protobuf/files/protobuf-3.13.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.13.0-system_libraries.patch deleted file mode 100644 index 990081ae1ab..000 --- a/dev-libs/protobuf/files/protobuf-3.13.0-system_libraries.patch +++ /dev/null @@ -1,121 +0,0 @@ /Makefile.am -+++ /Makefile.am -@@ -11,28 +11,10 @@ - # Always include third_party directories in distributions. - DIST_SUBDIRS = src conformance benchmarks third_party/googletest - --# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS --# because then "make check" would also build and run all of gmock's own tests, --# which takes a lot of time and is generally not useful to us. Also, we don't --# want "make install" to recurse into gmock since we don't want to overwrite --# the installed version of gmock if there is one. - check-local: -- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" -- @cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la -- @cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la - --# We would like to clean gmock when "make clean" is invoked. But we have to --# be careful because clean-local is also invoked during "make distclean", but --# "make distclean" already recurses into gmock because it's listed among the
[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: cda914d6219792457ad3039a816e064cb7171a25 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sun Jun 6 00:00:00 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Jun 6 17:04:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cda914d6 dev-libs/protobuf: Version bumps (3.17.*). Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Mike Gilbert gentoo.org> dev-libs/protobuf/Manifest | 3 + .../protobuf-3.17.0-disable_no-warning-test.patch | 19 .../files/protobuf-3.17.0-system_libraries.patch | 121 + ...protobuf-.ebuild => protobuf-3.17.0.ebuild} | 30 - ...protobuf-.ebuild => protobuf-3.17.1.ebuild} | 30 - ...protobuf-.ebuild => protobuf-3.17.2.ebuild} | 30 - dev-libs/protobuf/protobuf-.ebuild | 6 +- 7 files changed, 224 insertions(+), 15 deletions(-) diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index a4051caa640..3b64d73a457 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -8,3 +8,6 @@ DIST protobuf-3.15.6.tar.gz 5284018 BLAKE2B 5895f618e233edd5744253821036857aa23f DIST protobuf-3.15.7.tar.gz 5284817 BLAKE2B 43821bb283a0c1f87930593046a5c55f6efae3f644337289fd438c0612a9b7ef9531b61e48940b74dc5d20253ee1b6a805b902284a442dec2efe8c79f82c5aad SHA512 2b18ccba1ff8a0623c52abed0e0674bc6cfa2cd10d49764031a47e68f654f54083f4a4f9e3a94d833a6808426904ee642f173641063e79cb41a61fc348d603ac DIST protobuf-3.15.8.tar.gz 5285277 BLAKE2B 798fc011ac03cdc2406acf5845c667d8482082044bdace06c2c1d02b5b1b69c1b1f30e29774180dc1801a1d21d62e2ce50325105859564a1e36d3fe478e64d8b SHA512 56fc6df2dae14eee0fb67dd4204fc1ec54a18d994a69c9e42c7888d0cd50d269d1c5e1445d74f0fa705850d4ac86a22d86781e09769a716e5c6f829b15b05592 DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B 9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123 SHA512 0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5 +DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36 +DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8 +DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98 diff --git a/dev-libs/protobuf/files/protobuf-3.17.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.17.0-disable_no-warning-test.patch new file mode 100644 index 000..eb1598c945f --- /dev/null +++ b/dev-libs/protobuf/files/protobuf-3.17.0-disable_no-warning-test.patch @@ -0,0 +1,19 @@ +Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings. + +--- /src/Makefile.am /src/Makefile.am +@@ -713,7 +713,7 @@ + GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock + check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ + protobuf-lite-test test_plugin protobuf-lite-arena-test \ +- no-warning-test $(GZCHECKPROGRAMS) ++ $(GZCHECKPROGRAMS) + protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ + $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ + $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +@@ -900,4 +900,4 @@ + + TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ + google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \ +-protobuf-lite-arena-test no-warning-test ++protobuf-lite-arena-test diff --git a/dev-libs/protobuf/files/protobuf-3.17.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.17.0-system_libraries.patch new file mode 100644 index 000..3d5069dd147 --- /dev/null +++ b/dev-libs/protobuf/files/protobuf-3.17.0-system_libraries.patch @@ -0,0 +1,121 @@ +--- /Makefile.am /Makefile.am +@@ -11,28 +11,10 @@ + # Always include third_party directories in distributions. + DIST_SUBDIRS = src conformance benchmarks third_party/googletest + +-# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS +-#
[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: 8674b9ae5d43cf28bf1acbb121036c3ac5071ec1
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Sun Nov 22 04:00:00 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Nov 22 19:31:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8674b9ae
dev-libs/protobuf: Version bump (3.14.0).
Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org>
Signed-off-by: Mike Gilbert gentoo.org>
dev-libs/protobuf/Manifest | 1 +
...protobuf-3.14.0-protoc_input_output_files.patch | 268 +
...protobuf-.ebuild => protobuf-3.14.0.ebuild} | 14 +-
dev-libs/protobuf/protobuf-.ebuild | 2 +-
4 files changed, 282 insertions(+), 3 deletions(-)
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 579b5e38b3f..517abfc7f26 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -2,3 +2,4 @@ DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B
97b450c0623593efe6a42b66582ff183344b
DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B
6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f
SHA512
84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B
2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b
SHA512
c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B
168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2
SHA512
514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
+DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B
cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5
SHA512
9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
diff --git
a/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch
b/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch
new file mode 100644
index 000..a36bdcb734a
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch
@@ -0,0 +1,268 @@
+https://github.com/protocolbuffers/protobuf/pull/235
+
+--- /src/google/protobuf/compiler/command_line_interface.cc
/src/google/protobuf/compiler/command_line_interface.cc
+@@ -1109,6 +1109,28 @@
+ }
+
+ if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++bool success = false;
++int in_fd = STDIN_FILENO;
++int out_fd = STDOUT_FILENO;
++
++if (!protobuf_in_path_.empty()) {
++ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++ if (in_fd == -1) {
++std::cerr << protobuf_in_path_ << ": error: failed to open file." <<
std::endl;
++return 1;
++ }
++}
++if (!protobuf_out_path_.empty()) {
++ out_fd = open(protobuf_out_path_.c_str(),
++O_WRONLY | O_CREAT | O_TRUNC,
++0644);
++ if (out_fd == -1) {
++std::cerr << protobuf_out_path_ << ": error: failed to open file." <<
std::endl;
++close(in_fd);
++return 1;
++ }
++}
++
+ if (codec_type_.empty()) {
+ // HACK: Define an EmptyMessage type to use for decoding.
+ DescriptorPool pool;
+@@ -1117,13 +1139,20 @@
+ file.add_message_type()->set_name("EmptyMessage");
+ GOOGLE_CHECK(pool.BuildFile(file) != NULL);
+ codec_type_ = "EmptyMessage";
+- if (!EncodeOrDecode()) {
+-return 1;
+- }
++ success = EncodeOrDecode(, in_fd, out_fd);
+ } else {
+- if (!EncodeOrDecode(descriptor_pool.get())) {
+-return 1;
+- }
++ success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
++}
++
++if (in_fd != STDIN_FILENO) {
++ close(in_fd);
++}
++if (out_fd != STDOUT_FILENO) {
++ close(out_fd);
++}
++
++if (!success) {
++ return 1;
+ }
+ }
+
+@@ -1161,6 +1190,11 @@
+ for (int i = 0; i < proto_path_.size(); i++) {
+ source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
+ }
++ if (mode_ == MODE_COMPILE &&
++ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
++std::cerr << "--protobuf_in and --protobuf_out are only valid with "
++ << "decode operations. Ignoring.";
++ }
+
+ // Map input files to virtual paths if possible.
+ if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
+@@ -1904,6 +1938,12 @@
+ } else if (name == "--deterministic_output") {
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: e39c922037535c263b85013d0ecbfeb94dc1ddb1
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Thu Jul 2 12:44:28 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sat Jul 4 13:52:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e39c9220
dev-libs/protobuf: Version bump (3.12.2).
Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org>
Signed-off-by: Mike Gilbert gentoo.org>
dev-libs/protobuf/Manifest | 1 +
.../protobuf-3.12.0-disable_no-warning-test.patch | 19 ++
...protobuf-3.12.0-protoc_input_output_files.patch | 262 +
.../files/protobuf-3.12.0-system_libraries.patch | 121 ++
...protobuf-.ebuild => protobuf-3.12.2.ebuild} | 18 +-
dev-libs/protobuf/protobuf-.ebuild | 6 +-
6 files changed, 420 insertions(+), 7 deletions(-)
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 806addb1d66..4667b310046 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,2 +1,3 @@
DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B
1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f
SHA512
aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B
97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001
SHA512
777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
+DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B
6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f
SHA512
84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
diff --git
a/dev-libs/protobuf/files/protobuf-3.12.0-disable_no-warning-test.patch
b/dev-libs/protobuf/files/protobuf-3.12.0-disable_no-warning-test.patch
new file mode 100644
index 000..d7dd5b5b1bb
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.12.0-disable_no-warning-test.patch
@@ -0,0 +1,19 @@
+Disable no-warning-test which is compiled with -Werror option and whose only
purpose is checking if compilation results in any warnings.
+
+--- /src/Makefile.am
/src/Makefile.am
+@@ -717,7 +717,7 @@
+ GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+ protobuf-lite-test test_plugin protobuf-lite-arena-test \
+- no-warning-test $(GZCHECKPROGRAMS)
++ $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+ $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+ $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+@@ -904,4 +904,4 @@
+
+ TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
+ google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \
+-protobuf-lite-arena-test no-warning-test
++protobuf-lite-arena-test
diff --git
a/dev-libs/protobuf/files/protobuf-3.12.0-protoc_input_output_files.patch
b/dev-libs/protobuf/files/protobuf-3.12.0-protoc_input_output_files.patch
new file mode 100644
index 000..3123ae5b27b
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.12.0-protoc_input_output_files.patch
@@ -0,0 +1,262 @@
+https://github.com/protocolbuffers/protobuf/pull/235
+
+--- /src/google/protobuf/compiler/command_line_interface.cc
/src/google/protobuf/compiler/command_line_interface.cc
+@@ -997,6 +997,28 @@
+ }
+
+ if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++bool success = false;
++int in_fd = STDIN_FILENO;
++int out_fd = STDOUT_FILENO;
++
++if (!protobuf_in_path_.empty()) {
++ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++ if (in_fd == -1) {
++std::cerr << protobuf_in_path_ << ": error: failed to open file." <<
std::endl;
++return 1;
++ }
++}
++if (!protobuf_out_path_.empty()) {
++ out_fd = open(protobuf_out_path_.c_str(),
++O_WRONLY | O_CREAT | O_TRUNC,
++0644);
++ if (out_fd == -1) {
++std::cerr << protobuf_out_path_ << ": error: failed to open file." <<
std::endl;
++close(in_fd);
++return 1;
++ }
++}
++
+ if (codec_type_.empty()) {
+ // HACK: Define an EmptyMessage type to use for decoding.
+ DescriptorPool pool;
+@@ -1005,13 +1027,20 @@
+ file.add_message_type()->set_name("EmptyMessage");
+ GOOGLE_CHECK(pool.BuildFile(file) != NULL);
+ codec_type_ = "EmptyMessage";
+- if (!EncodeOrDecode()) {
+-return 1;
+-
[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: 20e78d282cc777dd80bbca0999a6f9c04217506d
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Mon Dec 23 20:43:39 2019 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Dec 29 19:31:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20e78d28
dev-libs/protobuf: Version bump (3.11.2).
Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org>
Signed-off-by: Mike Gilbert gentoo.org>
dev-libs/protobuf/Manifest | 1 +
.../protobuf-3.11.0-disable_no-warning-test.patch | 19 ++
...protobuf-3.11.0-protoc_input_output_files.patch | 262 +
.../files/protobuf-3.11.0-system_libraries.patch | 121 ++
...protobuf-.ebuild => protobuf-3.11.2.ebuild} | 18 +-
dev-libs/protobuf/protobuf-.ebuild | 10 +-
6 files changed, 420 insertions(+), 11 deletions(-)
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 7a362466e88..15ae0824bb2 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,4 +1,5 @@
DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B
1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f
SHA512
aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
+DIST protobuf-3.11.2.tar.gz 5133897 BLAKE2B
275ea52a072b4e0226e4b6dc476d4bc28e8f4f05bca0709eab51da91c02869e96c3b0ac9ab4cc46290f875d4eac6ac72374c5b45e27fa89ad3d58fd56a2c8b7e
SHA512
8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f
DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B
a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590
SHA512
7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B
4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe
SHA512
ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B
c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177
SHA512
9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
diff --git
a/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch
b/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch
new file mode 100644
index 000..ec043e3865c
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch
@@ -0,0 +1,19 @@
+Disable no-warning-test which is compiled with -Werror option and whose only
purpose is checking if compilation results in any warnings.
+
+--- /src/Makefile.am
/src/Makefile.am
+@@ -714,7 +714,7 @@
+ GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+ protobuf-lite-test test_plugin protobuf-lite-arena-test \
+- no-warning-test $(GZCHECKPROGRAMS)
++ $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+ $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+ $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+@@ -901,4 +901,4 @@
+
+ TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
+ google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \
+-protobuf-lite-arena-test no-warning-test
++protobuf-lite-arena-test
diff --git
a/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch
b/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch
new file mode 100644
index 000..0e22b34efc3
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch
@@ -0,0 +1,262 @@
+https://github.com/protocolbuffers/protobuf/pull/235
+
+--- /src/google/protobuf/compiler/command_line_interface.cc
/src/google/protobuf/compiler/command_line_interface.cc
+@@ -938,6 +938,28 @@
+ }
+
+ if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++bool success = false;
++int in_fd = STDIN_FILENO;
++int out_fd = STDOUT_FILENO;
++
++if (!protobuf_in_path_.empty()) {
++ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++ if (in_fd == -1) {
++std::cerr << protobuf_in_path_ << ": error: failed to open file." <<
std::endl;
++return 1;
++ }
++}
++if (!protobuf_out_path_.empty()) {
++ out_fd = open(protobuf_out_path_.c_str(),
++
[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: d23f80e9e13c1085de9777945f3f5fab67143d14
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Mon Dec 23 20:56:12 2019 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Dec 29 19:31:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d23f80e9
dev-libs/protobuf: Delete old version (3.7.1).
Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org>
Signed-off-by: Mike Gilbert gentoo.org>
dev-libs/protobuf/Manifest | 1 -
.../protobuf-3.7.0-disable_no-warning-test.patch | 19 --
.../protobuf-3.7.0-protoc_input_output_files.patch | 236 -
.../files/protobuf-3.7.1-system_libraries.patch| 121 ---
dev-libs/protobuf/protobuf-3.7.1.ebuild| 126 ---
5 files changed, 503 deletions(-)
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 15ae0824bb2..02aa678dff0 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,6 +1,5 @@
DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B
1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f
SHA512
aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
DIST protobuf-3.11.2.tar.gz 5133897 BLAKE2B
275ea52a072b4e0226e4b6dc476d4bc28e8f4f05bca0709eab51da91c02869e96c3b0ac9ab4cc46290f875d4eac6ac72374c5b45e27fa89ad3d58fd56a2c8b7e
SHA512
8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f
-DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B
a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590
SHA512
7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B
4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe
SHA512
ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B
c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177
SHA512
9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B
ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c
SHA512
510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
diff --git
a/dev-libs/protobuf/files/protobuf-3.7.0-disable_no-warning-test.patch
b/dev-libs/protobuf/files/protobuf-3.7.0-disable_no-warning-test.patch
deleted file mode 100644
index eadde9c04dc..000
--- a/dev-libs/protobuf/files/protobuf-3.7.0-disable_no-warning-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Disable no-warning-test which is compiled with -Werror option and whose only
purpose is checking if compilation results in any warnings.
-
/src/Makefile.am
-+++ /src/Makefile.am
-@@ -709,7 +709,7 @@
- GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
- protobuf-lite-test test_plugin protobuf-lite-arena-test \
-- no-warning-test $(GZCHECKPROGRAMS)
-+ $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-@@ -893,4 +893,4 @@
-
- TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
- google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \
--protobuf-lite-arena-test no-warning-test
-+protobuf-lite-arena-test
diff --git
a/dev-libs/protobuf/files/protobuf-3.7.0-protoc_input_output_files.patch
b/dev-libs/protobuf/files/protobuf-3.7.0-protoc_input_output_files.patch
deleted file mode 100644
index 54daa6de4ed..000
--- a/dev-libs/protobuf/files/protobuf-3.7.0-protoc_input_output_files.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-https://github.com/protocolbuffers/protobuf/pull/235
-
/src/google/protobuf/compiler/command_line_interface.cc
-+++ /src/google/protobuf/compiler/command_line_interface.cc
-@@ -951,6 +951,28 @@
- }
-
- if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
-+bool success = false;
-+int in_fd = STDIN_FILENO;
-+int out_fd = STDOUT_FILENO;
-+
-+if (!protobuf_in_path_.empty()) {
-+ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: c9478e3527ea47a3f080c7fabb90ab5a0b0102ea
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Thu Apr 18 19:12:09 2019 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Apr 19 16:39:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9478e35
dev-libs/protobuf: Version bump (3.7.1).
Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org>
Signed-off-by: Mike Gilbert gentoo.org>
dev-libs/protobuf/Manifest | 1 +
.../protobuf-3.7.0-disable_no-warning-test.patch | 19 ++
.../protobuf-3.7.0-protoc_input_output_files.patch | 236 +
.../files/protobuf-3.7.1-system_libraries.patch| 121 +++
dev-libs/protobuf/protobuf-3.7.1.ebuild| 118 +++
5 files changed, 495 insertions(+)
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index ac2f8a09268..766a6d89f8d 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1 +1,2 @@
DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B
5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963
SHA512
9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
+DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B
a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590
SHA512
7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
diff --git
a/dev-libs/protobuf/files/protobuf-3.7.0-disable_no-warning-test.patch
b/dev-libs/protobuf/files/protobuf-3.7.0-disable_no-warning-test.patch
new file mode 100644
index 000..eadde9c04dc
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.7.0-disable_no-warning-test.patch
@@ -0,0 +1,19 @@
+Disable no-warning-test which is compiled with -Werror option and whose only
purpose is checking if compilation results in any warnings.
+
+--- /src/Makefile.am
/src/Makefile.am
+@@ -709,7 +709,7 @@
+ GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+ protobuf-lite-test test_plugin protobuf-lite-arena-test \
+- no-warning-test $(GZCHECKPROGRAMS)
++ $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+ $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+ $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+@@ -893,4 +893,4 @@
+
+ TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
+ google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \
+-protobuf-lite-arena-test no-warning-test
++protobuf-lite-arena-test
diff --git
a/dev-libs/protobuf/files/protobuf-3.7.0-protoc_input_output_files.patch
b/dev-libs/protobuf/files/protobuf-3.7.0-protoc_input_output_files.patch
new file mode 100644
index 000..54daa6de4ed
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.7.0-protoc_input_output_files.patch
@@ -0,0 +1,236 @@
+https://github.com/protocolbuffers/protobuf/pull/235
+
+--- /src/google/protobuf/compiler/command_line_interface.cc
/src/google/protobuf/compiler/command_line_interface.cc
+@@ -951,6 +951,28 @@
+ }
+
+ if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++bool success = false;
++int in_fd = STDIN_FILENO;
++int out_fd = STDOUT_FILENO;
++
++if (!protobuf_in_path_.empty()) {
++ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++ if (in_fd == -1) {
++std::cerr << protobuf_in_path_ << ": error: failed to open file." <<
std::endl;
++return 1;
++ }
++}
++if (!protobuf_out_path_.empty()) {
++ out_fd = open(protobuf_out_path_.c_str(),
++O_WRONLY | O_CREAT | O_TRUNC,
++0644);
++ if (out_fd == -1) {
++std::cerr << protobuf_out_path_ << ": error: failed to open file." <<
std::endl;
++close(in_fd);
++return 1;
++ }
++}
++
+ if (codec_type_.empty()) {
+ // HACK: Define an EmptyMessage type to use for decoding.
+ DescriptorPool pool;
+@@ -959,13 +981,20 @@
+ file.add_message_type()->set_name("EmptyMessage");
+ GOOGLE_CHECK(pool.BuildFile(file) != NULL);
+ codec_type_ = "EmptyMessage";
+- if (!EncodeOrDecode()) {
+-return 1;
+- }
++ success = EncodeOrDecode(, in_fd, out_fd);
+ } else {
+- if (!EncodeOrDecode(descriptor_pool.get())) {
+-return 1;
+- }
++ success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
++}
++
++if (in_fd != STDIN_FILENO) {
++ close(in_fd);
++}
++if (out_fd != STDOUT_FILENO) {
++ close(out_fd);
++}
++
++if
[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: 78245b85a8d6b58f97f27a0bdb9526f2052fa7d0
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Thu Apr 18 19:16:35 2019 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Apr 19 16:39:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78245b85
dev-libs/protobuf: Add live ebuild.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org>
Signed-off-by: Mike Gilbert gentoo.org>
.../protobuf-3.8.0-protoc_input_output_files.patch | 262 +
dev-libs/protobuf/protobuf-.ebuild | 118 ++
2 files changed, 380 insertions(+)
diff --git
a/dev-libs/protobuf/files/protobuf-3.8.0-protoc_input_output_files.patch
b/dev-libs/protobuf/files/protobuf-3.8.0-protoc_input_output_files.patch
new file mode 100644
index 000..a60bd74f39a
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.8.0-protoc_input_output_files.patch
@@ -0,0 +1,262 @@
+https://github.com/protocolbuffers/protobuf/pull/235
+
+--- /src/google/protobuf/compiler/command_line_interface.cc
/src/google/protobuf/compiler/command_line_interface.cc
+@@ -949,6 +949,28 @@
+ }
+
+ if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++bool success = false;
++int in_fd = STDIN_FILENO;
++int out_fd = STDOUT_FILENO;
++
++if (!protobuf_in_path_.empty()) {
++ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++ if (in_fd == -1) {
++std::cerr << protobuf_in_path_ << ": error: failed to open file." <<
std::endl;
++return 1;
++ }
++}
++if (!protobuf_out_path_.empty()) {
++ out_fd = open(protobuf_out_path_.c_str(),
++O_WRONLY | O_CREAT | O_TRUNC,
++0644);
++ if (out_fd == -1) {
++std::cerr << protobuf_out_path_ << ": error: failed to open file." <<
std::endl;
++close(in_fd);
++return 1;
++ }
++}
++
+ if (codec_type_.empty()) {
+ // HACK: Define an EmptyMessage type to use for decoding.
+ DescriptorPool pool;
+@@ -957,13 +979,20 @@
+ file.add_message_type()->set_name("EmptyMessage");
+ GOOGLE_CHECK(pool.BuildFile(file) != NULL);
+ codec_type_ = "EmptyMessage";
+- if (!EncodeOrDecode()) {
+-return 1;
+- }
++ success = EncodeOrDecode(, in_fd, out_fd);
+ } else {
+- if (!EncodeOrDecode(descriptor_pool.get())) {
+-return 1;
+- }
++ success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
++}
++
++if (in_fd != STDIN_FILENO) {
++ close(in_fd);
++}
++if (out_fd != STDOUT_FILENO) {
++ close(out_fd);
++}
++
++if (!success) {
++ return 1;
+ }
+ }
+
+@@ -1001,6 +1030,11 @@
+ for (int i = 0; i < proto_path_.size(); i++) {
+ source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
+ }
++ if (mode_ == MODE_COMPILE &&
++ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
++std::cerr << "--protobuf_in and --protobuf_out are only valid with "
++ << "decode operations. Ignoring.";
++ }
+
+ // Map input files to virtual paths if possible.
+ if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
+@@ -1627,6 +1661,12 @@
+
+ codec_type_ = value;
+
++ } else if (name == "--protobuf_in") {
++protobuf_in_path_ = value;
++
++ } else if (name == "--protobuf_out") {
++protobuf_out_path_ = value;
++
+ } else if (name == "--error_format") {
+ if (value == "gcc") {
+ error_format_ = ERROR_FORMAT_GCC;
+@@ -1763,29 +1803,50 @@
+ " -h, --help Show this text and exit.\n"
+ " --encode=MESSAGE_TYPE Read a text-format message of the "
+ "given type\n"
+- " from standard input and write it in "
+- "binary\n"
+- " to standard output. The message type
"
+- "must\n"
++ " and write it in binary. The message "
++ "type must\n"
+ " be defined in PROTO_FILES or their "
+ "imports.\n"
++ " The input/output protobuf files are "
++ "specified\n"
++ " using the --protobuf_in and "
++ "--protobuf_out\n"
++ " command line flags.\n"
+ " --decode=MESSAGE_TYPE Read a binary message of the given "
+- "type from\n"
+- " standard input and write it in text "
+- "format\n"
+- " to standard output. The message type
"
+- "must\n"
+- " be defined in PROTO_FILES or their "
+- "imports.\n"
++ "type and\n"
++ " write it in text format. The message
"
++ "type\n"
++
[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: 52c7cd4159d9a0b9eda57de784e36c0aafb73fee
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Sun Jun 24 14:27:31 2018 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sat Jul 7 02:02:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52c7cd41
dev-libs/protobuf: Version bump (3.6.0.1).
dev-libs/protobuf/Manifest | 1 +
.../protobuf-3.6.0-disable_no-warning-test.patch | 19 ++
.../protobuf-3.6.0-protoc_input_output_files.patch | 233 +
.../files/protobuf-3.6.0-system_libraries.patch| 121 +++
dev-libs/protobuf/protobuf-3.6.0.1.ebuild | 105 ++
5 files changed, 479 insertions(+)
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index aa6d99043ce..f6e4af7f648 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,3 +1,4 @@
DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B
e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3
SHA512
471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B
995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591
SHA512
f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B
f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544
SHA512
09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
+DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B
8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235
SHA512
63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
diff --git
a/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch
b/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch
new file mode 100644
index 000..834f6b0d1ab
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch
@@ -0,0 +1,19 @@
+Disable no-warning-test which is compiled with -Werror option and whose only
purpose is checking if compilation results in any warnings.
+
+--- /src/Makefile.am
/src/Makefile.am
+@@ -717,7 +717,7 @@
+ GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+ protobuf-lite-test test_plugin protobuf-lite-arena-test \
+- no-warning-test $(GZCHECKPROGRAMS)
++ $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+ $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+ $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+@@ -900,4 +900,4 @@
+
+ TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
+ google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \
+-protobuf-lite-arena-test no-warning-test
++protobuf-lite-arena-test
diff --git
a/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
b/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
new file mode 100644
index 000..f515b6cd1a4
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
@@ -0,0 +1,233 @@
+https://github.com/google/protobuf/pull/235
+
+--- /src/google/protobuf/compiler/command_line_interface.cc
/src/google/protobuf/compiler/command_line_interface.cc
+@@ -931,6 +931,28 @@
+ }
+
+ if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++bool success = false;
++int in_fd = STDIN_FILENO;
++int out_fd = STDOUT_FILENO;
++
++if (!protobuf_in_path_.empty()) {
++ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++ if (in_fd == -1) {
++std::cerr << protobuf_in_path_ << ": error: failed to open file." <<
std::endl;
++return 1;
++ }
++}
++if (!protobuf_out_path_.empty()) {
++ out_fd = open(protobuf_out_path_.c_str(),
++O_WRONLY | O_CREAT | O_TRUNC,
++0644);
++ if (out_fd == -1) {
++std::cerr << protobuf_out_path_ << ": error: failed to open file." <<
std::endl;
++close(in_fd);
++return 1;
++ }
++}
++
+ if (codec_type_.empty()) {
+ // HACK: Define an EmptyMessage type to use for decoding.
+ DescriptorPool pool;
+@@ -939,13 +961,20 @@
+ file.add_message_type()->set_name("EmptyMessage");
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: b2c7ba6148506cd4af825034f56162527a1e12ed Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Wed Apr 25 18:15:29 2018 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Apr 26 15:12:16 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c7ba61 dev-libs/protobuf: Delete old versions (<3.4.0). dev-libs/protobuf/Manifest | 6 - .../protobuf/files/protobuf-2.3.0-asneeded-2.patch | 28 --- .../protobuf/files/protobuf-2.5.0-emacs-24.4.patch | 14 -- dev-libs/protobuf/files/protobuf-2.5.0-x32.patch | 15 -- .../files/protobuf-2.6.1-protoc-cmdline.patch | 256 - .../protobuf-3.0.0_beta2-disable-local-gmock.patch | 89 --- .../files/protobuf-3.0.2-disable-local-gmock.patch | 101 .../files/protobuf-3.3.0-disable-local-gmock.patch | 115 - dev-libs/protobuf/metadata.xml | 4 - dev-libs/protobuf/protobuf-2.5.0-r2.ebuild | 132 --- dev-libs/protobuf/protobuf-2.6.1-r3.ebuild | 158 - dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild | 107 - dev-libs/protobuf/protobuf-3.0.2.ebuild| 111 - dev-libs/protobuf/protobuf-3.1.0.ebuild| 110 - dev-libs/protobuf/protobuf-3.3.0.ebuild| 108 - 15 files changed, 1354 deletions(-) diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index d919674fdff..aa6d99043ce 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -1,9 +1,3 @@ -DIST protobuf-2.5.0.tar.bz2 1866763 BLAKE2B e4cece402bbeaff4400732ee2401f1a80bb0e70728eb41052da26b969b6fa6672b11ca80e28343d03a9df97c72bb8d8e2f890b9b730bad3c23c829aaf36ff701 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee -DIST protobuf-2.6.1.tar.bz2 2021416 BLAKE2B f58178a6081d58fff1582a907dfb9087f07b72e0701f19649b3adc9e1827a0f2670e25c6d177e60a59b965b3622b1eb11590b4b17083ee148c0da7eb07f02e55 SHA512 8b092b87fcd79223db199cd3d330f3d43689b47f345aa4e34028dcf1680d609a5d5a89ab08588e817b566d3b265834c38f1db580bc1c144b512ce74d35f2a174 -DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 BLAKE2B 44c6d0e42e92a822230b41fa732b58816d18e92e8466a59bb21de98cbb6cb3bcf6db29a7c5842ff8c754231c44626a95fd768f514f49bbb2ffc098618c7a50a2 SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b -DIST protobuf-3.0.2.tar.gz 3917853 BLAKE2B 542beb7b16de0da2cdc6f7981381b6de1ff2c01f229005727a74b4e5ff16db3f44e91c026eed323ccb1a2a2b3f834afa3686df80ff5f90d54f5f030cbaf601cf SHA512 28eb8814555b0fe2cd57da6caf46802697a9612fccb3bba3ae7a379352437f81a18c1f6ab7242a22abea59c1ff9b06dcb6e2b52a97aa1a15cea6485ffc3c10c2 -DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f62b01a694d37c0b069956ef5d658df1beef68514b00a22005a36293b4a8a18654b5656f8c614309f0a744039c2fb SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a -DIST protobuf-3.3.0.tar.gz 4336596 BLAKE2B 381b2961fe1de8a86225903d0cfe4c98c238336b8782e5191c57c6fcf60cf321f39163d50864bf9c119a90bd7796269dc7e34168a158f7affa7fa295ce5deae0 SHA512 0734a55ae92f0539dfb507e174539d290fd8e93633c1edd8810e0d51c37e67254337b75fc5ba9450316f6416e1f8f8cfb59415864657b55f2a1696fbcdfe7636 DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181 diff --git a/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch b/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch deleted file mode 100644 index 418622e547f..000 --- a/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fixing as-needed issue - -http://bugs.gentoo.org/show_bug.cgi?id=271509 - m4/acx_pthread.m4 -+++ m4/acx_pthread.m4 -@@ -278,7 +278,8 @@ - fi - fi - -- if test x"$done" = xno; then -+ if test x"$done" = xyes; then -+ done="no" - AC_MSG_CHECKING([whether
[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/
commit: 34f2b3a8006ca31bcc03364066ec7dcd68d2950e
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Wed Feb 21 17:57:00 2018 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Feb 21 20:32:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f2b3a8
dev-libs/protobuf: Fix building on IA64.
Closes: https://bugs.gentoo.org/648248
.../files/protobuf-3.5.0-atomic_operations.patch| 21 +
dev-libs/protobuf/protobuf-3.5.1.1.ebuild | 7 ++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
new file mode 100644
index 000..7a88e837950
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
@@ -0,0 +1,21 @@
+https://github.com/google/protobuf/issues/3937
+https://github.com/google/protobuf/pull/3955
+https://github.com/google/protobuf/commit/642e1ac635f2563b4a14c255374f02645ae85dac
+
+--- /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
+@@ -146,6 +146,14 @@
+ 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, _value, new_value, false,
++ __ATOMIC_RELEASE, __ATOMIC_ACQUIRE);
++ return old_value;
++}
++
+ #endif // defined(__LP64__)
+
+ } // namespace internal
diff --git a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
index 4f44ebc4d8c..97cbe92c922 100644
--- a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
@@ -23,16 +23,21 @@ PATCHES=(
"${FILESDIR}/${PN}-3.4.0-disable_no-warning-test.patch"
"${FILESDIR}/${PN}-3.4.0-system_libraries.patch"
"${FILESDIR}/${PN}-3.4.0-protoc_input_output_files.patch"
+ "${FILESDIR}/${PN}-3.5.0-atomic_operations.patch"
)
DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
src_prepare() {
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
default
eautoreconf
}
+src_configure() {
+ append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+ multilib-minimal_src_configure
+}
+
multilib_src_configure() {
local myeconfargs=(
$(use_enable static-libs static)
