From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- dev-libs/protobuf/Manifest | 23 +- .../protobuf-3.4.0-disable_no-warning-test.patch | 19 -- .../protobuf-3.4.0-protoc_input_output_files.patch | 233 ------------------ .../files/protobuf-3.4.0-system_libraries.patch | 117 --------- .../files/protobuf-3.5.0-atomic_operations.patch | 21 -- .../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 ++++++++++ .../protobuf-3.8.0-protoc_input_output_files.patch | 262 +++++++++++++++++++++ dev-libs/protobuf/protobuf-3.5.1.1.ebuild | 106 --------- dev-libs/protobuf/protobuf-3.5.2.ebuild | 104 -------- dev-libs/protobuf/protobuf-3.6.0.1.ebuild | 105 --------- dev-libs/protobuf/protobuf-3.6.1.1.ebuild | 108 --------- dev-libs/protobuf/protobuf-3.6.1.2.ebuild | 108 --------- dev-libs/protobuf/protobuf-3.6.1.ebuild | 106 --------- dev-libs/protobuf/protobuf-3.7.1.ebuild | 118 ++++++++++ dev-libs/protobuf/protobuf-9999.ebuild | 118 ++++++++++ 17 files changed, 881 insertions(+), 1043 deletions(-) delete mode 100644 dev-libs/protobuf/files/protobuf-3.4.0-disable_no-warning-test.patch delete mode 100644 dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch delete mode 100644 dev-libs/protobuf/files/protobuf-3.4.0-system_libraries.patch delete mode 100644 dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch create mode 100644 dev-libs/protobuf/files/protobuf-3.7.0-disable_no-warning-test.patch create mode 100644 dev-libs/protobuf/files/protobuf-3.7.0-protoc_input_output_files.patch create mode 100644 dev-libs/protobuf/files/protobuf-3.7.1-system_libraries.patch create mode 100644 dev-libs/protobuf/files/protobuf-3.8.0-protoc_input_output_files.patch delete mode 100644 dev-libs/protobuf/protobuf-3.5.1.1.ebuild delete mode 100644 dev-libs/protobuf/protobuf-3.5.2.ebuild delete mode 100644 dev-libs/protobuf/protobuf-3.6.0.1.ebuild delete mode 100644 dev-libs/protobuf/protobuf-3.6.1.1.ebuild delete mode 100644 dev-libs/protobuf/protobuf-3.6.1.2.ebuild delete mode 100644 dev-libs/protobuf/protobuf-3.6.1.ebuild create mode 100644 dev-libs/protobuf/protobuf-3.7.1.ebuild create mode 100644 dev-libs/protobuf/protobuf-9999.ebuild (limited to 'dev-libs/protobuf') diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index cf3c7c256b35..32f1f0fd6fa9 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -1,25 +1,16 @@ AUX 70protobuf-gentoo.el 170 BLAKE2B 6d9a92bd3310ca09d18dd762bc0bbd4b0b36184c17f95c80c02183c457fe4ff1142ca1e3207e5a77c078fe5f768cb3e85abc712abc1f4c85774ca1ebf178059b SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08d4c553af2805962a6d6609fbdad4a2644bf9cecd1e771a557f138111ad2c0be959b497ee9 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e -AUX protobuf-3.4.0-disable_no-warning-test.patch 900 BLAKE2B 6187eeba1912f1bc6732d944eba4617ab99946efa429b3a96bb3b984af7ef45098885ce6bcdada1bb8995aee4a61cde404175459975242acf263a57d2d74c7fc SHA512 6d0687d17b626493e7e57dcb3e34095c9a450ecb8e538e9ad7cab69bdaf19ba52fbf5d70187c773bee0ee28496850e5ab0f56dcd571797e62434d865bd8761c2 -AUX protobuf-3.4.0-protoc_input_output_files.patch 9645 BLAKE2B 56911d89826684d39e9590a7577e10b036794f42bfa899896ba8311002632ea511057280c2676c1755ade71c8b698693b27fdd08cf4866d6673dc6cbcc17ffa2 SHA512 52894a8886386c5d9db45d78b777d7874b2bee3bf66315b27dcdd5d0ccb387fc25a47f547cbaca6630aae120ea78dc052ae5cdadb2219adbcc3b52612a5cd1ae -AUX protobuf-3.4.0-system_libraries.patch 5788 BLAKE2B e82517985065f53793ba5f4914317a6c2dbd7bd2c1e3bdb0796c85c402f4ec7e9d6645c1ccb7f73bf0b559d44db14ace9657c059c07948c3baf11c4b450bb572 SHA512 f8b54087e755ab6ae07630e99ca542b5690429ed7c9801c04219b016fd361b39a01d9e4d594f5c5820a0ec90f02f7ef4aeaf864e1ea2b770078a198daf928db3 -AUX protobuf-3.5.0-atomic_operations.patch 812 BLAKE2B f55d364fa5b7ee405d7cb9b08e6ce1a3446a9604a39002f915bdaca2cd527bc7c173aefd898f473b1666eff55c1473db9699b4dc3c992ab3bdc8ae18855cb1b1 SHA512 c7ed996f106bd9632c9979c2e5665759c18c46f64f05bf5b8b9efc5c896b6a072375a657df7f5372b8089aad38791f768765ac1118c2aeed1785f040aea310ee AUX protobuf-3.6.0-disable_no-warning-test.patch 965 BLAKE2B 6ec0b1fc9d9d0be4f6dc9bc023d65b6b04c98d624ca4d1926cff0554d774d7cffd8d3597383acff1b7aca1a92dff4dd8368d5d86f1612aace16ede836f025af5 SHA512 82e601a26e51903e6b193c50960024240aecd3ddeeba8b29f437c550ad0bd277573ea4f83bcd70b2a4187c7df2b25af2790de22fb6f009640c403a9502d703be AUX protobuf-3.6.0-protoc_input_output_files.patch 9632 BLAKE2B 6466f6f6cf08e7a9a89ced8281790593fa9ea85e029d59ff20bba8c9add16bbb039a44d1839516bb109b9a2b269773640b43e6137fb9ccf5f100ef4109ad2b8d SHA512 8ac3c42684869e1b45d0d1ec70912610eaaa6962bc14d9a89b1244f424af7d638b4905b6dbd7445cd5f54bc4520fc1fbae88c66d9f4a9169db879abd1fba2faf AUX protobuf-3.6.0-system_libraries.patch 6323 BLAKE2B 0fb8e389a58b76c592b592782900b48bb6c68e85fc159d4b9a59a43ab5a116916f7d9ef15cca392e5751f015a887f855631abb124b4d4109d51f6ba401059549 SHA512 ab58b9aa9d1398a15346d6e85611ad826f8e52744aa137ca4f138348b4738afc7c6cd27129f925f5142edac7e272d56da880a83b216b2ce264804d6967997728 AUX protobuf-3.6.1-libatomic_linking.patch 1753 BLAKE2B 50f8ac92dfada973ebcd187fa508a46ddd5d4e034e2eade2a3fcbb35ffab771578b241fa9a5343b46e91c90c4507e1d3a75a1bebc3426dbb1694c0fbb8cc03bf SHA512 c8bcb885dcf7d2871136a6410750aad69a61450b5a4bc80df56246a5875e1e9895d2d63e9e9e6deda3c4e516cd07344b92619457ef41f4f2ff0710c774957466 -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 -DIST protobuf-3.6.1.1.tar.gz 4489116 BLAKE2B 4ed5da3dcb56245b3ce2f979142d5e77837e8e1fbc2f0af27be48664b8b7dfa2ec44382cf75678d226dd665c289f81d95bf04c5f2795fcdd759aa8ec630dba1f SHA512 df59ed966047471d7296883a4500d657eee5e7d8713dd7e44f3f2e0b8c4400e85cb511b316f2fa8518620f1074fd0cad8ee9538c063ac371d6b59358de81ee88 -DIST protobuf-3.6.1.2.tar.gz 4490331 BLAKE2B be5fac5a38369b21941c3c615a97cf35d05a24ee03536b6ea6c1c797a82a0a7f8ecc3630b62af7728f063c850c4faac8ae670171a18bacd44e2a2fb38b2e6fce SHA512 557ffb1216f663df94a16cd8e51e20acf42378913d656f56402c6653cb58ce6a83f77a6050bd846460c7dcac59bb41ad03ac003b0b06250df6a97fd17f8a2c7c +AUX protobuf-3.7.0-disable_no-warning-test.patch 965 BLAKE2B 25bd6deb1ed863826b6e940af58b8cfdae6259ef49172cdbc9bdd9625098401680329e07c53c50f1f777b496415face4c69cf4dacc908fabeb0e10d268f96800 SHA512 195edc8144ef7bc53c00d3327c56b3e6e389ea9a79f5059d15e1d1d78ca5ccdbd0567f32a0226047eb9e93eea1dc6cb36fc210833cf99415a698d4cfbaba23e8 +AUX protobuf-3.7.0-protoc_input_output_files.patch 9901 BLAKE2B ea663e63bee282e33066c03b1e73222eccc7cc20afea62ebe9745f67fcbee44a41ec750f1db7a822c65a62fcf1b454a3ade625ad56ec0241f499c7314f8575b3 SHA512 bbe6562afc1bbdb9cd641cc25a00092ac53734c194a32d21a974084af01f0836c515f6e00e730c307491b5ffa31b872154c50e67cfe16f0caecbc707d8d87527 +AUX protobuf-3.7.1-system_libraries.patch 6352 BLAKE2B a5c09076c28aefd951847da75dc280c05f7da9c408ea3c1da9b2f08a2ce92a6cd57e684dc0b516b31283619399c96d288bdf3a44e126a45113fd695af4122a51 SHA512 0633a1ad4dfb5be879e11abe4ed769e9d6c08a505f45c6d302f80a4706b0234e0e11d90d77356f09a640657eed353c48e0ce4ba0816cda84c3ab3f21c8252245 +AUX protobuf-3.8.0-protoc_input_output_files.patch 10351 BLAKE2B a584aa7ba199888bbaf2cd5842cff21c0b2cf76727443842d981455de1c812863de45c4f1b4958259f4100211bd4087523618bee138c9a10043c195e2e1d2040 SHA512 639accc5b1b6bc664775392c27718444a7aef3e82565e6794d93404ca7d6afab7dc00e8f76008d893bc7da9217e7568c3a704c693ac83039c481e4c611ac46f3 DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e -DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839 -EBUILD protobuf-3.5.1.1.ebuild 2621 BLAKE2B f5d279625735d30a1025c414b20f60dd0385c7d8449fde3e45e6540fc1dcc90614c7e5d3c22c26ef89e7c0374f112ea84a5702ef679d01448923bfccb3364133 SHA512 fe1689582cbd86d2cb31bf85e44a1968524350b7fe62d2f97b20ec368e3046d567c746c26d7d773cba6f1d498f2527ad59dbb749e738458912e90b8b44d7e070 -EBUILD protobuf-3.5.2.ebuild 2490 BLAKE2B ce32a12becfa87d89686be239ba8231aae5cd3b7ac2392b88985d4f9474378e5409274be69e139bbcdf9a5bd7f6ccab5e3c39dc1240e7b5cd3aff9851520aa31 SHA512 b1269cc5d0bbf8e5bb5b6e9410b0ea2d4c4c1c9d50203edb5b3e73b2d40c636f50ca180f67a9eb0f90e2f583f1a6480a141e176bb924669de5d0f43332a1cd60 -EBUILD protobuf-3.6.0.1.ebuild 2491 BLAKE2B 00444b7406baff1560defc88f3e3cde102cd24db454684fb2a919141fae3ba9000486b062f9a8128e0627930794af0f825555526d5a822363d944f2d064c7c52 SHA512 98ebec7694e6a0a47fa98b52371f74ca538f00ae649973e82eed51e4a3600e44c385a028dc3156c0a6c2232a305e317a95b389249090ebba6c77f77375ce49c1 -EBUILD protobuf-3.6.1.1.ebuild 2643 BLAKE2B 1a310c148f1b997319700f1f264337ffb4af2d201c509ce5a834767aece1255707f6d167dc5ac56f0c158c288ce7b7ccf717e2ae34bd727c9d2c2bdeea4dedb3 SHA512 d63065c8833053e8c9702fda577249a0dcd9491b2dd8d9165e90f44a1b6d812f693262cc0c996bfb18ba0f4b7be643825627347ffc19c7bdfc7baff698be1723 -EBUILD protobuf-3.6.1.2.ebuild 2643 BLAKE2B 1a310c148f1b997319700f1f264337ffb4af2d201c509ce5a834767aece1255707f6d167dc5ac56f0c158c288ce7b7ccf717e2ae34bd727c9d2c2bdeea4dedb3 SHA512 d63065c8833053e8c9702fda577249a0dcd9491b2dd8d9165e90f44a1b6d812f693262cc0c996bfb18ba0f4b7be643825627347ffc19c7bdfc7baff698be1723 +DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f EBUILD protobuf-3.6.1.3.ebuild 2632 BLAKE2B a56bc323756a435869076bb5e85d7aec0c777b1709dde5ba78c40cceac648802366710d00508296928cb8b7f8b3fe9f089a38c4bea32d3b877902970cb6a9c82 SHA512 afec4771997a723c61c223465fa7b18d4d8c66676dcc606a1e2d7ca06dc45f7b16c2fc12c816a08507e09c6b98d0271154310125849356e72ddc7b28b9d84a3c -EBUILD protobuf-3.6.1.ebuild 2537 BLAKE2B 690379408bdd2f3f2c4385d1d0edb3a5ecc7a782fe25ad2ef477201d06a803ea9bfb7ba2529d0ae3e4f820ef98783b4655c5f2eba1571d2e8cc5dedbe4bb188c SHA512 f827ab7dc346f9fb5f70a10fa38840a8483d6a30d16f8c4bf1803585eed430e0064a8733f9a269cd350934356b826cfd90bee489d61599b957555ff3d563b972 +EBUILD protobuf-3.7.1.ebuild 2813 BLAKE2B db579630b53b54753cdc46ad648bddec60aab59a04008b75eac5019627c10c2bec53b2db6b3518f4eb0c5bdd4484a0735c157f358f5e3532b61183bf908410a4 SHA512 354ccd689b4d6cca0a19e1b079e86614a32c6f864613d20708a11965e56ba589a2df21617e77a24b862c6d9110a0fa7a2b670daea92192ecc376d2ca4576e23f +EBUILD protobuf-9999.ebuild 2690 BLAKE2B ad5800f08fb9261e1d4e6c6807e482fd942ac0f8a612ab9fdc81e4709945814c41fe767c217a2fbb6ddb618436f53d7bc13d23305b8038d83cb9dd61bca27524 SHA512 2de41fc7ed7d12115211136a898f97f0f233c20217aa407b811f128389937ed5b30432a3cbe8ec50c900e3255e333d91172b517fe2668ee121fa6c418e6a0c97 MISC metadata.xml 543 BLAKE2B 43724e6d32707c62de4e1daffe50ba943c66286f6fe2357ec7171dad9feb7407049c26da517442957d61c11229617bd639d60bf070e7eedab8c871956cb3577a SHA512 f5a65ed219ff9f36c9d7bfdfe3bfe080ce0920e72f31f69820cc16822a04cdb38ec3c5d6b776b3c6cfde0bfc74c474558d048b706ac89e9405376e88504b8983 diff --git a/dev-libs/protobuf/files/protobuf-3.4.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.4.0-disable_no-warning-test.patch deleted file mode 100644 index 373dc7935a89..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.4.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 -@@ -750,7 +750,7 @@ - - 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 \ - ../gmock/gtest/lib/libgtest.la \ - ../gmock/lib/libgmock.la \ -@@ -931,4 +931,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.4.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch deleted file mode 100644 index 75c4dc28ee4a..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch +++ /dev/null @@ -1,233 +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 -@@ -942,6 +942,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; -@@ -950,13 +972,20 @@ - file.add_message_type()->set_name("EmptyMessage"); - GOOGLE_CHECK(pool.BuildFile(file) != NULL); - codec_type_ = "EmptyMessage"; -- if (!EncodeOrDecode(&pool)) { -- return 1; -- } -+ success = EncodeOrDecode(&pool, 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; - } - } - -@@ -994,6 +1023,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)) { -@@ -1561,6 +1595,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; -@@ -1684,18 +1724,29 @@ - " --version Show version info and exit.\n" - " -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" --" be defined in PROTO_FILES or their imports.\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" -+" an write it in binary. The message type must\n" - " be defined in PROTO_FILES or their imports.\n" --" --decode_raw Read an arbitrary protocol message from\n" --" standard input and write the raw tag/value\n" --" pairs in text format to standard output. No\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 and\n" -+" write it in text format. The message type\n" -+" must be defined in PROTO_FILES or their\n" -+" imports. The input/output protobuf files are\n" -+" specified using the --protobuf_in and \n" -+" --protobuf_out command line flags.\n" -+" --decode_raw Read an arbitrary protocol message and write\n" -+" the raw tag/value pairs in text format. No\n" - " PROTO_FILES should be given when using this\n" --" flag.\n" -+" flag. The input/output protobuf files are\n" -+" specified using the --protobuf_in and \n" -+" --protobuf_out command line flags.\n" -+" --protobuf_in Absolute path to the protobuf file to read to\n" -+" encode/decode. If omitted, file will be read\n" -+" from STDIN.\n" -+" --protobuf_out Absolute path to the protobuf file to write to\n" -+" after encode/decode operation. If omitted,\n" -+" output is written to STDOUT.\n" - " --descriptor_set_in=FILES Specifies a delimited list of FILES\n" - " each containing a FileDescriptorSet (a\n" - " protocol buffer defined in descriptor.proto).\n" -@@ -1957,7 +2008,9 @@ - return true; - } - --bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { -+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool, -+ int in_fd, -+ int out_fd) { - // Look up the type. - const Descriptor* type = pool->FindMessageTypeByName(codec_type_); - if (type == NULL) { -@@ -1969,15 +2022,15 @@ - google::protobuf::scoped_ptr message(dynamic_factory.GetPrototype(type)->New()); - - if (mode_ == MODE_ENCODE) { -- SetFdToTextMode(STDIN_FILENO); -- SetFdToBinaryMode(STDOUT_FILENO); -+ SetFdToTextMode(in_fd); -+ SetFdToBinaryMode(out_fd); - } else { -- SetFdToBinaryMode(STDIN_FILENO); -- SetFdToTextMode(STDOUT_FILENO); -+ SetFdToBinaryMode(in_fd); -+ SetFdToTextMode(out_fd); - } - -- io::FileInputStream in(STDIN_FILENO); -- io::FileOutputStream out(STDOUT_FILENO); -+ io::FileInputStream in(in_fd); -+ io::FileOutputStream out(out_fd); - - if (mode_ == MODE_ENCODE) { - // Input is text. ---- /src/google/protobuf/compiler/command_line_interface.h -+++ /src/google/protobuf/compiler/command_line_interface.h -@@ -269,7 +269,9 @@ - GeneratorContext* generator_context, string* error); - - // Implements --encode and --decode. -- bool EncodeOrDecode(const DescriptorPool* pool); -+ bool EncodeOrDecode(const DescriptorPool* pool, -+ int in_fd, -+ int out_fd); - - // Implements the --descriptor_set_out option. - bool WriteDescriptorSet( -@@ -402,6 +404,13 @@ - // parsed FileDescriptorSets to be used for loading protos. Otherwise, empty. - std::vector descriptor_set_in_names_; - -+ // When using --encode / --decode / --decode_raw absolute path to the output -+ // file. (Empty string indicates write to STDOUT). -+ string protobuf_out_path_; -+ // When using --encode / --decode / --decode_raw, absolute path to the input -+ // file. (Empty string indicates read from STDIN). -+ string protobuf_in_path_; -+ - // If --descriptor_set_out was given, this is the filename to which the - // FileDescriptorSet should be written. Otherwise, empty. - string descriptor_set_out_name_; ---- /src/google/protobuf/compiler/command_line_interface_unittest.cc -+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc -@@ -95,7 +95,7 @@ - virtual void SetUp(); - virtual void TearDown(); - -- // Runs the CommandLineInterface with the given command line. The -+ // Run the CommandLineInterface with the given command line. The - // command is automatically split on spaces, and the string "$tmpdir" - // is replaced with TestTempDir(). - void Run(const string& command); -@@ -2308,6 +2308,17 @@ - EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_)); - } - -+ void ExpectBinaryFilesMatch(const string &expected_file, -+ const string &actual_file) { -+ string expected_output, actual_output; -+ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output)); -+ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output)); -+ -+ // Don't use EXPECT_EQ because we don't want to print raw binary data to -+ // stdout on failure. -+ EXPECT_TRUE(expected_output == actual_output); -+ } -+ - private: - void WriteUnittestProtoDescriptorSet() { - unittest_proto_descriptor_set_filename_ = -@@ -2398,6 +2409,18 @@ - "google/protobuf/no_such_file.proto: No such file or directory\n"); - } - -+TEST_P(EncodeDecodeTest, RedirectInputOutput) { -+ string out_file = TestTempDir() + "/golden_message_out.pbf"; -+ string cmd = ""; -+ cmd += "google/protobuf/unittest.proto "; -+ cmd += "--encode=protobuf_unittest.TestAllTypes "; -+ cmd += "--protobuf_in=" + TestSourceDir() + -+ "/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt "; -+ cmd += "--protobuf_out=" + out_file; -+ EXPECT_TRUE(Run(cmd)); -+ ExpectBinaryFilesMatch(out_file, TestSourceDir() + "/google/protobuf/testdata/golden_message_oneof_implemented"); -+} -+ - INSTANTIATE_TEST_CASE_P(FileDescriptorSetSource, - EncodeDecodeTest, - testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN)); diff --git a/dev-libs/protobuf/files/protobuf-3.4.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.4.0-system_libraries.patch deleted file mode 100644 index 424ad5ff58c3..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.4.0-system_libraries.patch +++ /dev/null @@ -1,117 +0,0 @@ ---- /Makefile.am -+++ /Makefile.am -@@ -8,31 +8,12 @@ - # the right time. - SUBDIRS = . src - --# Always include gmock in distributions. --DIST_SUBDIRS = $(subdirs) src conformance benchmarks -+DIST_SUBDIRS = src conformance benchmarks - --# 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 gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la -- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_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 --# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to --# cd to the directory again and "make clean" it will fail. So, check that the --# Makefile exists before recursing. - clean-local: -- @if test -e gmock/Makefile; then \ -- echo "Making clean in gmock"; \ -- cd gmock && $(MAKE) $(AM_MAKEFLAGS) clean; \ -- fi; \ -- if test -e conformance/Makefile; then \ -+ @if test -e conformance/Makefile; then \ - echo "Making clean in conformance"; \ - cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \ - fi; \ ---- /configure.ac -+++ /configure.ac -@@ -200,12 +200,5 @@ - - AX_CXX_COMPILE_STDCXX([11], [noext], [optional]) - --# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, --# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock --# too. --export CFLAGS --export CXXFLAGS --AC_CONFIG_SUBDIRS([gmock]) -- - AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) - AC_OUTPUT ---- /src/Makefile.am -+++ /src/Makefile.am -@@ -752,11 +752,7 @@ - protobuf-lite-test test_plugin protobuf-lite-arena-test \ - no-warning-test $(GZCHECKPROGRAMS) - protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \ -- -I$(srcdir)/../gmock/include -+ -lgtest -lgmock -lgmock_main - # Disable optimization for tests unless the user explicitly asked for it, - # since test_util.cc takes forever to compile with optimization (with GCC). - # See configure.ac for more info. -@@ -843,12 +839,8 @@ - # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. - protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ - libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include \ -- -DPROTOBUF_TEST_NO_DESCRIPTORS -+ -lgtest -lgmock -lgmock_main -+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS - protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lazy_descriptor_test_SOURCES = \ - google/protobuf/compiler/cpp/cpp_unittest.cc \ -@@ -868,11 +860,7 @@ - # full runtime and we want to make sure this test builds without full - # runtime. - protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lite_test_CPPFLAGS= -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include -+ -lgtest -lgmock -lgmock_main - protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lite_test_SOURCES = \ - google/protobuf/lite_unittest.cc \ -@@ -883,11 +871,7 @@ - # gtest when building the test internally our memory sanitizer doesn't detect - # memory leaks (don't know why). - protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include -+ -lgtest -lgmock -lgmock_main - protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lite_arena_test_SOURCES = \ - google/protobuf/lite_arena_unittest.cc \ -@@ -896,8 +880,7 @@ - - # Test plugin binary. - test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la --test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include -+ -lgtest - test_plugin_SOURCES = \ - google/protobuf/compiler/mock_code_generator.cc \ - google/protobuf/testing/file.cc \ 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 deleted file mode 100644 index 9582431d41f6..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/protocolbuffers/protobuf/issues/3937 -https://github.com/protocolbuffers/protobuf/pull/3955 -https://github.com/protocolbuffers/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, &old_value, new_value, false, -+ __ATOMIC_RELEASE, __ATOMIC_ACQUIRE); -+ return old_value; -+} -+ - #endif // defined(__LP64__) - - } // namespace internal 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 000000000000..eadde9c04dc7 --- /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 000000000000..54daa6de4ed2 --- /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(&pool)) { +- return 1; +- } ++ success = EncodeOrDecode(&pool, 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; + } + } + +@@ -1003,6 +1032,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)) { +@@ -1622,6 +1656,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; +@@ -1749,18 +1789,31 @@ + " --version Show version info and exit.\n" + " -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" +-" be defined in PROTO_FILES or their imports.\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" ++" and write it in binary. The message type must\n" + " be defined in PROTO_FILES or their imports.\n" +-" --decode_raw Read an arbitrary protocol message from\n" +-" standard input and write the raw tag/value\n" +-" pairs in text format to standard output. No\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 and\n" ++" write it in text format. The message type\n" ++" must 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_raw Read an arbitrary protocol message and write\n" ++" the raw tag/value pairs in text format. No\n" + " PROTO_FILES should be given when using this\n" +-" flag.\n" ++" flag. The input/output protobuf files are\n" ++" specified using the --protobuf_in and\n" ++" --protobuf_out command line flags.\n" ++" --protobuf_in=FILE Absolute path to the protobuf file from which\n" ++" input of encoding/decoding operation will be\n" ++" read. If omitted, input will be read from\n" ++" standard input.\n" ++" --protobuf_out=FILE Absolute path to the protobuf file to which\n" ++" output of encoding/decoding operation will be\n" ++" written. If omitted, output will be written to\n" ++" standard output.\n" + " --descriptor_set_in=FILES Specifies a delimited list of FILES\n" + " each containing a FileDescriptorSet (a\n" + " protocol buffer defined in descriptor.proto).\n" +@@ -2039,7 +2092,9 @@ + return true; + } + +-bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { ++bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool, ++ int in_fd, ++ int out_fd) { + // Look up the type. + const Descriptor* type = pool->FindMessageTypeByName(codec_type_); + if (type == NULL) { +@@ -2051,15 +2106,15 @@ + std::unique_ptr message(dynamic_factory.GetPrototype(type)->New()); + + if (mode_ == MODE_ENCODE) { +- SetFdToTextMode(STDIN_FILENO); +- SetFdToBinaryMode(STDOUT_FILENO); ++ SetFdToTextMode(in_fd); ++ SetFdToBinaryMode(out_fd); + } else { +- SetFdToBinaryMode(STDIN_FILENO); +- SetFdToTextMode(STDOUT_FILENO); ++ SetFdToBinaryMode(in_fd); ++ SetFdToTextMode(out_fd); + } + +- io::FileInputStream in(STDIN_FILENO); +- io::FileOutputStream out(STDOUT_FILENO); ++ io::FileInputStream in(in_fd); ++ io::FileOutputStream out(out_fd); + + if (mode_ == MODE_ENCODE) { + // Input is text. +--- /src/google/protobuf/compiler/command_line_interface.h ++++ /src/google/protobuf/compiler/command_line_interface.h +@@ -285,7 +285,9 @@ + GeneratorContext* generator_context, std::string* error); + + // Implements --encode and --decode. +- bool EncodeOrDecode(const DescriptorPool* pool); ++ bool EncodeOrDecode(const DescriptorPool* pool, ++ int in_fd, ++ int out_fd); + + // Implements the --descriptor_set_out option. + bool WriteDescriptorSet( +@@ -418,6 +420,13 @@ + // parsed FileDescriptorSets to be used for loading protos. Otherwise, empty. + std::vector descriptor_set_in_names_; + ++ // When using --encode / --decode / --decode_raw absolute path to the output ++ // file. (Empty string indicates write to STDOUT). ++ std::string protobuf_out_path_; ++ // When using --encode / --decode / --decode_raw, absolute path to the input ++ // file. (Empty string indicates read from STDIN). ++ std::string protobuf_in_path_; ++ + // If --descriptor_set_out was given, this is the filename to which the + // FileDescriptorSet should be written. Otherwise, empty. + std::string descriptor_set_out_name_; +--- /src/google/protobuf/compiler/command_line_interface_unittest.cc ++++ /src/google/protobuf/compiler/command_line_interface_unittest.cc +@@ -95,7 +95,7 @@ + virtual void SetUp(); + virtual void TearDown(); + +- // Runs the CommandLineInterface with the given command line. The ++ // Run the CommandLineInterface with the given command line. The + // command is automatically split on spaces, and the string "$tmpdir" + // is replaced with TestTempDir(). + void Run(const string& command); +@@ -2367,6 +2367,17 @@ + EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_)); + } + ++ void ExpectBinaryFilesMatch(const string &expected_file, ++ const string &actual_file) { ++ string expected_output, actual_output; ++ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output)); ++ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output)); ++ ++ // Don't use EXPECT_EQ because we don't want to print raw binary data to ++ // stdout on failure. ++ EXPECT_TRUE(expected_output == actual_output); ++ } ++ + private: + void WriteUnittestProtoDescriptorSet() { + unittest_proto_descriptor_set_filename_ = +@@ -2463,6 +2474,19 @@ + "net/proto2/internal/no_such_file.proto: No such file or directory\n"); + } + ++TEST_P(EncodeDecodeTest, RedirectInputOutput) { ++ string out_file = TestTempDir() + "/golden_message_out.pbf"; ++ EXPECT_TRUE( ++ Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") + ++ " --encode=protobuf_unittest.TestAllTypes" + ++ " --protobuf_in=" + TestUtil::GetTestDataPath( ++ "net/proto2/internal/" ++ "testdata/text_format_unittest_data_oneof_implemented.txt") + ++ " --protobuf_out=" + out_file)); ++ ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath( ++ "net/proto2/internal/testdata/golden_message_oneof_implemented")); ++} ++ + INSTANTIATE_TEST_CASE_P(FileDescriptorSetSource, + EncodeDecodeTest, + testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN)); diff --git a/dev-libs/protobuf/files/protobuf-3.7.1-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.7.1-system_libraries.patch new file mode 100644 index 000000000000..3ae92e2b87a5 --- /dev/null +++ b/dev-libs/protobuf/files/protobuf-3.7.1-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 +-# 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 +-# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to +-# cd to the directory again and "make clean" it will fail. So, check that the +-# Makefile exists before recursing. + clean-local: +- @if test -e third_party/googletest/Makefile; then \ +- echo "Making clean in googletest"; \ +- cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \ +- fi; \ +- if test -e conformance/Makefile; then \ ++ @if test -e conformance/Makefile; then \ + echo "Making clean in conformance"; \ + cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \ + fi; \ +--- /configure.ac ++++ /configure.ac +@@ -218,12 +218,5 @@ + esac + AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1]) + +-# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, +-# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock +-# too. +-export CFLAGS +-export CXXFLAGS +-AC_CONFIG_SUBDIRS([third_party/googletest]) +- + AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) + AC_OUTPUT +--- /src/Makefile.am ++++ /src/Makefile.am +@@ -703,19 +703,11 @@ + google/protobuf/testing/file.cc \ + google/protobuf/testing/file.h + +-GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest +-GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock +-GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest +-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 \ + $(GZCHECKPROGRAMS) + protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la +-protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \ +- -I$(GOOGLEMOCK_SRC_DIR)/include ++ -lgtest -lgmock -lgmock_main + # Disable optimization for tests unless the user explicitly asked for it, + # since test_util.cc takes forever to compile with optimization (with GCC). + # See configure.ac for more info. +@@ -804,12 +796,8 @@ + # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. + protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ + libprotoc.la \ +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la +-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ +- -I$(GOOGLETEST_SRC_DIR)/include \ +- -DPROTOBUF_TEST_NO_DESCRIPTORS ++ -lgtest -lgmock -lgmock_main ++protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS + protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) + protobuf_lazy_descriptor_test_SOURCES = \ + google/protobuf/compiler/cpp/cpp_unittest.cc \ +@@ -830,11 +818,7 @@ + # full runtime and we want to make sure this test builds without full + # runtime. + protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la +-protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \ +- -I$(GOOGLETEST_SRC_DIR)/include ++ -lgtest -lgmock -lgmock_main + protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) + protobuf_lite_test_SOURCES = \ + google/protobuf/lite_unittest.cc \ +@@ -846,11 +830,7 @@ + # gtest when building the test internally our memory sanitizer doesn't detect + # memory leaks (don't know why). + protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la +-protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ +- -I$(GOOGLETEST_SRC_DIR)/include ++ -lgtest -lgmock -lgmock_main + protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) + protobuf_lite_arena_test_SOURCES = \ + google/protobuf/lite_arena_unittest.cc \ +@@ -860,8 +840,7 @@ + + # Test plugin binary. + test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la +-test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include ++ -lgtest + test_plugin_SOURCES = \ + google/protobuf/compiler/mock_code_generator.cc \ + google/protobuf/testing/file.cc \ 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 000000000000..a60bd74f39a1 --- /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(&pool)) { +- return 1; +- } ++ success = EncodeOrDecode(&pool, 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" ++ " must 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_raw Read an arbitrary protocol message " +- "from\n" +- " standard input and write the raw " +- "tag/value\n" +- " pairs in text format to standard " +- "output. No\n" ++ "and write\n" ++ " the raw tag/value pairs in text format." ++ " No\n" + " PROTO_FILES should be given when using " + "this\n" +- " flag.\n" ++ " flag. The input/output protobuf files " ++ "are\n" ++ " specified using the --protobuf_in and\n" ++ " --protobuf_out command line flags.\n" ++ " --protobuf_in=FILE Absolute path to the protobuf file " ++ "from which\n" ++ " input of encoding/decoding operation " ++ "will be\n" ++ " read. If omitted, input will be read " ++ "from\n" ++ " standard input.\n" ++ " --protobuf_out=FILE Absolute path to the protobuf file " ++ "to which\n" ++ " output of encoding/decoding operation " ++ "will be\n" ++ " written. If omitted, output will be " ++ "written to\n" ++ " standard output.\n" + " --descriptor_set_in=FILES Specifies a delimited list of FILES\n" + " each containing a FileDescriptorSet " + "(a\n" +@@ -2101,7 +2162,9 @@ + return true; + } + +-bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { ++bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool, ++ int in_fd, ++ int out_fd) { + // Look up the type. + const Descriptor* type = pool->FindMessageTypeByName(codec_type_); + if (type == NULL) { +@@ -2113,15 +2176,15 @@ + std::unique_ptr message(dynamic_factory.GetPrototype(type)->New()); + + if (mode_ == MODE_ENCODE) { +- SetFdToTextMode(STDIN_FILENO); +- SetFdToBinaryMode(STDOUT_FILENO); ++ SetFdToTextMode(in_fd); ++ SetFdToBinaryMode(out_fd); + } else { +- SetFdToBinaryMode(STDIN_FILENO); +- SetFdToTextMode(STDOUT_FILENO); ++ SetFdToBinaryMode(in_fd); ++ SetFdToTextMode(out_fd); + } + +- io::FileInputStream in(STDIN_FILENO); +- io::FileOutputStream out(STDOUT_FILENO); ++ io::FileInputStream in(in_fd); ++ io::FileOutputStream out(out_fd); + + if (mode_ == MODE_ENCODE) { + // Input is text. +--- /src/google/protobuf/compiler/command_line_interface.h ++++ /src/google/protobuf/compiler/command_line_interface.h +@@ -286,7 +286,9 @@ + GeneratorContext* generator_context, std::string* error); + + // Implements --encode and --decode. +- bool EncodeOrDecode(const DescriptorPool* pool); ++ bool EncodeOrDecode(const DescriptorPool* pool, ++ int in_fd, ++ int out_fd); + + // Implements the --descriptor_set_out option. + bool WriteDescriptorSet( +@@ -418,6 +420,13 @@ + // parsed FileDescriptorSets to be used for loading protos. Otherwise, empty. + std::vector descriptor_set_in_names_; + ++ // When using --encode / --decode / --decode_raw absolute path to the output ++ // file. (Empty string indicates write to STDOUT). ++ std::string protobuf_out_path_; ++ // When using --encode / --decode / --decode_raw, absolute path to the input ++ // file. (Empty string indicates read from STDIN). ++ std::string protobuf_in_path_; ++ + // If --descriptor_set_out was given, this is the filename to which the + // FileDescriptorSet should be written. Otherwise, empty. + std::string descriptor_set_out_name_; +--- /src/google/protobuf/compiler/command_line_interface_unittest.cc ++++ /src/google/protobuf/compiler/command_line_interface_unittest.cc +@@ -95,7 +95,7 @@ + virtual void SetUp(); + virtual void TearDown(); + +- // Runs the CommandLineInterface with the given command line. The ++ // Run the CommandLineInterface with the given command line. The + // command is automatically split on spaces, and the string "$tmpdir" + // is replaced with TestTempDir(). + void Run(const std::string& command); +@@ -2337,6 +2337,17 @@ + EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_)); + } + ++ void ExpectBinaryFilesMatch(const string &expected_file, ++ const string &actual_file) { ++ string expected_output, actual_output; ++ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output)); ++ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output)); ++ ++ // Don't use EXPECT_EQ because we don't want to print raw binary data to ++ // stdout on failure. ++ EXPECT_TRUE(expected_output == actual_output); ++ } ++ + private: + void WriteUnittestProtoDescriptorSet() { + unittest_proto_descriptor_set_filename_ = +@@ -2431,6 +2442,19 @@ + "net/proto2/internal/no_such_file.proto: No such file or directory\n"); + } + ++TEST_P(EncodeDecodeTest, RedirectInputOutput) { ++ string out_file = TestTempDir() + "/golden_message_out.pbf"; ++ EXPECT_TRUE( ++ Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") + ++ " --encode=protobuf_unittest.TestAllTypes" + ++ " --protobuf_in=" + TestUtil::GetTestDataPath( ++ "net/proto2/internal/" ++ "testdata/text_format_unittest_data_oneof_implemented.txt") + ++ " --protobuf_out=" + out_file)); ++ ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath( ++ "net/proto2/internal/testdata/golden_message_oneof_implemented")); ++} ++ + INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest, + testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN)); + } // anonymous namespace diff --git a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild deleted file mode 100644 index b64b56a4da19..000000000000 --- a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" -HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" -SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/15" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples static-libs test zlib" - -RDEPEND="emacs? ( virtual/emacs ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" - -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() { - default - eautoreconf -} - -src_configure() { - append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - $(use_with zlib) - ) - - if tc-is-cross-compiler; then - # The build system wants `protoc` when building, so we need a copy that - # runs on the host. This is more hermetic than relying on the version - # installed in the host being the exact same version. - mkdir -p "${WORKDIR}/build" || die - pushd "${WORKDIR}/build" > /dev/null || die - ECONF_SOURCE="${S}" econf_build "${myeconfargs[@]}" - myeconfargs+=(--with-protoc="${PWD}"/src/protoc) - popd > /dev/null || die - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -src_compile() { - multilib-minimal_src_compile - - if use emacs; then - elisp-compile editors/protobuf-mode.el - fi -} - -multilib_src_compile() { - if tc-is-cross-compiler; then - emake -C "${WORKDIR}/build/src" protoc - fi - - default -} - -multilib_src_test() { - emake check -} - -multilib_src_install_all() { - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/proto.vim" - - if use emacs; then - elisp-install ${PN} editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" - fi - - if use examples; then - DOCS+=(examples) - docompress -x /usr/share/doc/${PF}/examples - fi - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/protobuf/protobuf-3.5.2.ebuild b/dev-libs/protobuf/protobuf-3.5.2.ebuild deleted file mode 100644 index 0ed30529f285..000000000000 --- a/dev-libs/protobuf/protobuf-3.5.2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" -HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" -SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/15" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples static-libs test zlib" - -RDEPEND="emacs? ( virtual/emacs ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" - -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() { - default - eautoreconf -} - -src_configure() { - append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI - multilib-minimal_src_configure -} - -multilib_src_configure() { - local options=( - $(use_enable static-libs static) - $(use_with zlib) - ) - - if tc-is-cross-compiler; then - # Build system uses protoc when building, so protoc copy runnable on host is needed. - mkdir -p "${WORKDIR}/build" || die - pushd "${WORKDIR}/build" > /dev/null || die - ECONF_SOURCE="${S}" econf_build "${options[@]}" - options+=(--with-protoc="$(pwd)/src/protoc") - popd > /dev/null || die - fi - - ECONF_SOURCE="${S}" econf "${options[@]}" -} - -src_compile() { - multilib-minimal_src_compile - - if use emacs; then - elisp-compile editors/protobuf-mode.el - fi -} - -multilib_src_compile() { - if tc-is-cross-compiler; then - emake -C "${WORKDIR}/build/src" protoc - fi - - default -} - -multilib_src_test() { - emake check -} - -multilib_src_install_all() { - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/proto.vim" - - if use emacs; then - elisp-install ${PN} editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" - fi - - if use examples; then - DOCS+=(examples) - docompress -x /usr/share/doc/${PF}/examples - fi - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/protobuf/protobuf-3.6.0.1.ebuild b/dev-libs/protobuf/protobuf-3.6.0.1.ebuild deleted file mode 100644 index fc490f98194c..000000000000 --- a/dev-libs/protobuf/protobuf-3.6.0.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" -HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" -SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/16" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples static-libs test zlib" - -RDEPEND="emacs? ( virtual/emacs ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch" - "${FILESDIR}/${PN}-3.6.0-system_libraries.patch" - "${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch" -) - -DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI - multilib-minimal_src_configure -} - -multilib_src_configure() { - local options=( - $(use_enable static-libs static) - $(use_with zlib) - ) - - if tc-is-cross-compiler; then - # Build system uses protoc when building, so protoc copy runnable on host is needed. - mkdir -p "${WORKDIR}/build" || die - pushd "${WORKDIR}/build" > /dev/null || die - ECONF_SOURCE="${S}" econf_build "${options[@]}" - options+=(--with-protoc="$(pwd)/src/protoc") - popd > /dev/null || die - fi - - ECONF_SOURCE="${S}" econf "${options[@]}" -} - -src_compile() { - multilib-minimal_src_compile - - if use emacs; then - elisp-compile editors/protobuf-mode.el - fi -} - -multilib_src_compile() { - if tc-is-cross-compiler; then - emake -C "${WORKDIR}/build/src" protoc - fi - - default -} - -multilib_src_test() { - emake check -} - -multilib_src_install_all() { - find "${D}" -name "*.la" -delete || die - - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/proto.vim" - - if use emacs; then - elisp-install ${PN} editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" - fi - - if use examples; then - DOCS+=(examples) - docompress -x /usr/share/doc/${PF}/examples - fi - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/protobuf/protobuf-3.6.1.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.1.ebuild deleted file mode 100644 index 1d00ee9032f4..000000000000 --- a/dev-libs/protobuf/protobuf-3.6.1.1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 2008-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" -HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" -SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/17" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples static-libs test zlib" -RESTRICT="!test? ( test )" - -BDEPEND="emacs? ( virtual/emacs )" -DEPEND="test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" -RDEPEND="emacs? ( virtual/emacs ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch" - "${FILESDIR}/${PN}-3.6.0-system_libraries.patch" - "${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch" - "${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch" -) - -DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI - multilib-minimal_src_configure -} - -multilib_src_configure() { - local options=( - $(use_enable static-libs static) - $(use_with zlib) - ) - - if tc-is-cross-compiler; then - # Build system uses protoc when building, so protoc copy runnable on host is needed. - mkdir -p "${WORKDIR}/build" || die - pushd "${WORKDIR}/build" > /dev/null || die - ECONF_SOURCE="${S}" econf_build "${options[@]}" - options+=(--with-protoc="$(pwd)/src/protoc") - popd > /dev/null || die - fi - - ECONF_SOURCE="${S}" econf "${options[@]}" -} - -src_compile() { - multilib-minimal_src_compile - - if use emacs; then - elisp-compile editors/protobuf-mode.el - fi -} - -multilib_src_compile() { - if tc-is-cross-compiler; then - emake -C "${WORKDIR}/build/src" protoc - fi - - default -} - -multilib_src_test() { - emake check -} - -multilib_src_install_all() { - find "${D}" -name "*.la" -delete || die - - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/proto.vim" - - if use emacs; then - elisp-install ${PN} editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" - fi - - if use examples; then - DOCS+=(examples) - docompress -x /usr/share/doc/${PF}/examples - fi - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/protobuf/protobuf-3.6.1.2.ebuild b/dev-libs/protobuf/protobuf-3.6.1.2.ebuild deleted file mode 100644 index 1d00ee9032f4..000000000000 --- a/dev-libs/protobuf/protobuf-3.6.1.2.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 2008-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" -HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" -SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/17" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples static-libs test zlib" -RESTRICT="!test? ( test )" - -BDEPEND="emacs? ( virtual/emacs )" -DEPEND="test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" -RDEPEND="emacs? ( virtual/emacs ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch" - "${FILESDIR}/${PN}-3.6.0-system_libraries.patch" - "${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch" - "${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch" -) - -DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI - multilib-minimal_src_configure -} - -multilib_src_configure() { - local options=( - $(use_enable static-libs static) - $(use_with zlib) - ) - - if tc-is-cross-compiler; then - # Build system uses protoc when building, so protoc copy runnable on host is needed. - mkdir -p "${WORKDIR}/build" || die - pushd "${WORKDIR}/build" > /dev/null || die - ECONF_SOURCE="${S}" econf_build "${options[@]}" - options+=(--with-protoc="$(pwd)/src/protoc") - popd > /dev/null || die - fi - - ECONF_SOURCE="${S}" econf "${options[@]}" -} - -src_compile() { - multilib-minimal_src_compile - - if use emacs; then - elisp-compile editors/protobuf-mode.el - fi -} - -multilib_src_compile() { - if tc-is-cross-compiler; then - emake -C "${WORKDIR}/build/src" protoc - fi - - default -} - -multilib_src_test() { - emake check -} - -multilib_src_install_all() { - find "${D}" -name "*.la" -delete || die - - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/proto.vim" - - if use emacs; then - elisp-install ${PN} editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" - fi - - if use examples; then - DOCS+=(examples) - docompress -x /usr/share/doc/${PF}/examples - fi - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/protobuf/protobuf-3.6.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.ebuild deleted file mode 100644 index c8c5f7d7e2f3..000000000000 --- a/dev-libs/protobuf/protobuf-3.6.1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" -HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" -SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/17" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples static-libs test zlib" - -RDEPEND="emacs? ( virtual/emacs ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch" - "${FILESDIR}/${PN}-3.6.0-system_libraries.patch" - "${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch" - "${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch" -) - -DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI - multilib-minimal_src_configure -} - -multilib_src_configure() { - local options=( - $(use_enable static-libs static) - $(use_with zlib) - ) - - if tc-is-cross-compiler; then - # Build system uses protoc when building, so protoc copy runnable on host is needed. - mkdir -p "${WORKDIR}/build" || die - pushd "${WORKDIR}/build" > /dev/null || die - ECONF_SOURCE="${S}" econf_build "${options[@]}" - options+=(--with-protoc="$(pwd)/src/protoc") - popd > /dev/null || die - fi - - ECONF_SOURCE="${S}" econf "${options[@]}" -} - -src_compile() { - multilib-minimal_src_compile - - if use emacs; then - elisp-compile editors/protobuf-mode.el - fi -} - -multilib_src_compile() { - if tc-is-cross-compiler; then - emake -C "${WORKDIR}/build/src" protoc - fi - - default -} - -multilib_src_test() { - emake check -} - -multilib_src_install_all() { - find "${D}" -name "*.la" -delete || die - - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/proto.vim" - - if use emacs; then - elisp-install ${PN} editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" - fi - - if use examples; then - DOCS+=(examples) - docompress -x /usr/share/doc/${PF}/examples - fi - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/protobuf/protobuf-3.7.1.ebuild b/dev-libs/protobuf/protobuf-3.7.1.ebuild new file mode 100644 index 000000000000..f28a36c024b2 --- /dev/null +++ b/dev-libs/protobuf/protobuf-3.7.1.ebuild @@ -0,0 +1,118 @@ +# Copyright 2008-2019 Arfrever Frehtes Taifersar Arahesis and others +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf" + EGIT_SUBMODULES=() +fi + +DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" +HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="BSD" +SLOT="0/18" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +IUSE="emacs examples static-libs test zlib" +RESTRICT="!test? ( test )" + +BDEPEND="emacs? ( virtual/emacs )" +DEPEND="test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" +RDEPEND="emacs? ( virtual/emacs ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" + +PATCHES=( + "${FILESDIR}/${PN}-3.7.0-disable_no-warning-test.patch" + "${FILESDIR}/${PN}-3.7.1-system_libraries.patch" + "${FILESDIR}/${PN}-3.7.0-protoc_input_output_files.patch" +) + +DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI + multilib-minimal_src_configure +} + +multilib_src_configure() { + local options=( + $(use_enable static-libs static) + $(use_with zlib) + ) + + if tc-is-cross-compiler; then + # Build system uses protoc when building, so protoc copy runnable on host is needed. + mkdir -p "${WORKDIR}/build" || die + pushd "${WORKDIR}/build" > /dev/null || die + ECONF_SOURCE="${S}" econf_build "${options[@]}" + options+=(--with-protoc="$(pwd)/src/protoc") + popd > /dev/null || die + fi + + ECONF_SOURCE="${S}" econf "${options[@]}" +} + +src_compile() { + multilib-minimal_src_compile + + if use emacs; then + elisp-compile editors/protobuf-mode.el + fi +} + +multilib_src_compile() { + if tc-is-cross-compiler; then + emake -C "${WORKDIR}/build/src" protoc + fi + + default +} + +multilib_src_test() { + emake check +} + +multilib_src_install_all() { + find "${D}" -name "*.la" -delete || die + + insinto /usr/share/vim/vimfiles/syntax + doins editors/proto.vim + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/proto.vim" + + if use emacs; then + elisp-install ${PN} editors/protobuf-mode.el* + elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" + fi + + if use examples; then + DOCS+=(examples) + docompress -x /usr/share/doc/${PF}/examples + fi + + einstalldocs +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild new file mode 100644 index 000000000000..ab63263883b6 --- /dev/null +++ b/dev-libs/protobuf/protobuf-9999.ebuild @@ -0,0 +1,118 @@ +# Copyright 2008-2019 Arfrever Frehtes Taifersar Arahesis and others +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf" + EGIT_SUBMODULES=() +fi + +DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" +HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="BSD" +SLOT="0/18" +KEYWORDS="" +IUSE="emacs examples static-libs test zlib" +RESTRICT="!test? ( test )" + +BDEPEND="emacs? ( virtual/emacs )" +DEPEND="test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" +RDEPEND="emacs? ( virtual/emacs ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" + +PATCHES=( + "${FILESDIR}/${PN}-3.7.0-disable_no-warning-test.patch" + "${FILESDIR}/${PN}-3.7.1-system_libraries.patch" + "${FILESDIR}/${PN}-3.8.0-protoc_input_output_files.patch" +) + +DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI + multilib-minimal_src_configure +} + +multilib_src_configure() { + local options=( + $(use_enable static-libs static) + $(use_with zlib) + ) + + if tc-is-cross-compiler; then + # Build system uses protoc when building, so protoc copy runnable on host is needed. + mkdir -p "${WORKDIR}/build" || die + pushd "${WORKDIR}/build" > /dev/null || die + ECONF_SOURCE="${S}" econf_build "${options[@]}" + options+=(--with-protoc="$(pwd)/src/protoc") + popd > /dev/null || die + fi + + ECONF_SOURCE="${S}" econf "${options[@]}" +} + +src_compile() { + multilib-minimal_src_compile + + if use emacs; then + elisp-compile editors/protobuf-mode.el + fi +} + +multilib_src_compile() { + if tc-is-cross-compiler; then + emake -C "${WORKDIR}/build/src" protoc + fi + + default +} + +multilib_src_test() { + emake check +} + +multilib_src_install_all() { + find "${D}" -name "*.la" -delete || die + + insinto /usr/share/vim/vimfiles/syntax + doins editors/proto.vim + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/proto.vim" + + if use emacs; then + elisp-install ${PN} editors/protobuf-mode.el* + elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" + fi + + if use examples; then + DOCS+=(examples) + docompress -x /usr/share/doc/${PF}/examples + fi + + einstalldocs +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} -- cgit v1.2.3