pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/52231: pkgsrc/devel/protobuf has bad distinfo
The following reply was made to PR pkg/52231; it has been noted by GNATS.
From: coypu%sdf.org@localhost
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: pkg/52231: pkgsrc/devel/protobuf has bad distinfo
Date: Fri, 12 May 2017 14:04:54 +0000
--NzB8fVQJ5HfG6fxh
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
For the record, this seems to originate in the github setup
the new distfile includes this commit:
https://github.com/google/protobuf/commit/3a5a0724f300e9c7de98851a0bbaaa4363981486
made after the release, to the v3.3.x branch.
old distfile (matching):
http://mirror.sobukus.de/files/src/protobuf/protobuf-cpp-3.3.0.tar.gz
Attached is a diff between the two distfiles.
--NzB8fVQJ5HfG6fxh
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="protobuf.diff"
diff -ru proto1/protobuf-3.3.0/BUILD proto2/protobuf-3.3.0/BUILD
--- proto1/protobuf-3.3.0/BUILD 2017-05-05 01:42:32.000000000 +0300
+++ proto2/protobuf-3.3.0/BUILD 2017-03-31 23:50:18.000000000 +0300
@@ -128,7 +128,6 @@
"src/google/protobuf/extension_set_heavy.cc",
"src/google/protobuf/field_mask.pb.cc",
"src/google/protobuf/generated_message_reflection.cc",
- "src/google/protobuf/generated_message_table_driven.cc",
"src/google/protobuf/io/gzip_stream.cc",
"src/google/protobuf/io/printer.cc",
"src/google/protobuf/io/strtod.cc",
diff -ru proto1/protobuf-3.3.0/cmake/extract_includes.bat.in proto2/protobuf-3.3.0/cmake/extract_includes.bat.in
--- proto1/protobuf-3.3.0/cmake/extract_includes.bat.in 2017-05-05 01:42:32.000000000 +0300
+++ proto2/protobuf-3.3.0/cmake/extract_includes.bat.in 2017-03-31 23:50:18.000000000 +0300
@@ -50,7 +50,6 @@
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_enum_reflection.h" include\google\protobuf\generated_enum_reflection.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_enum_util.h" include\google\protobuf\generated_enum_util.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_reflection.h" include\google\protobuf\generated_message_reflection.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_table_driven.h" include\google\protobuf\generated_message_table_driven.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_util.h" include\google\protobuf\generated_message_util.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\has_bits.h" include\google\protobuf\has_bits.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\io\coded_stream.h" include\google\protobuf\io\coded_stream.h
@@ -71,7 +70,6 @@
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\message.h" include\google\protobuf\message.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\message_lite.h" include\google\protobuf\message_lite.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\metadata.h" include\google\protobuf\metadata.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\metadata_lite.h" include\google\protobuf\metadata_lite.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\reflection.h" include\google\protobuf\reflection.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\reflection_ops.h" include\google\protobuf\reflection_ops.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\repeated_field.h" include\google\protobuf\repeated_field.h
diff -ru proto1/protobuf-3.3.0/cmake/libprotobuf.cmake proto2/protobuf-3.3.0/cmake/libprotobuf.cmake
--- proto1/protobuf-3.3.0/cmake/libprotobuf.cmake 2017-05-05 01:42:32.000000000 +0300
+++ proto2/protobuf-3.3.0/cmake/libprotobuf.cmake 2017-03-30 00:03:23.000000000 +0300
@@ -13,7 +13,6 @@
${protobuf_source_dir}/src/google/protobuf/extension_set_heavy.cc
${protobuf_source_dir}/src/google/protobuf/field_mask.pb.cc
${protobuf_source_dir}/src/google/protobuf/generated_message_reflection.cc
- ${protobuf_source_dir}/src/google/protobuf/generated_message_table_driven.cc
${protobuf_source_dir}/src/google/protobuf/io/gzip_stream.cc
${protobuf_source_dir}/src/google/protobuf/io/printer.cc
${protobuf_source_dir}/src/google/protobuf/io/strtod.cc
diff -ru proto1/protobuf-3.3.0/src/Makefile.am proto2/protobuf-3.3.0/src/Makefile.am
--- proto1/protobuf-3.3.0/src/Makefile.am 2017-05-05 01:42:32.000000000 +0300
+++ proto2/protobuf-3.3.0/src/Makefile.am 2017-04-06 03:07:30.000000000 +0300
@@ -250,7 +250,6 @@
google/protobuf/extension_set_heavy.cc \
google/protobuf/field_mask.pb.cc \
google/protobuf/generated_message_reflection.cc \
- google/protobuf/generated_message_table_driven.cc \
google/protobuf/map_field.cc \
google/protobuf/message.cc \
google/protobuf/reflection_internal.h \
diff -ru proto1/protobuf-3.3.0/src/Makefile.in proto2/protobuf-3.3.0/src/Makefile.in
--- proto1/protobuf-3.3.0/src/Makefile.in 2017-05-05 01:42:42.000000000 +0300
+++ proto2/protobuf-3.3.0/src/Makefile.in 2017-04-06 03:37:54.000000000 +0300
@@ -211,7 +211,6 @@
google/protobuf/extension_set_heavy.lo \
google/protobuf/field_mask.pb.lo \
google/protobuf/generated_message_reflection.lo \
- google/protobuf/generated_message_table_driven.lo \
google/protobuf/map_field.lo google/protobuf/message.lo \
google/protobuf/reflection_ops.lo google/protobuf/service.lo \
google/protobuf/source_context.pb.lo \
@@ -1439,7 +1438,6 @@
google/protobuf/extension_set_heavy.cc \
google/protobuf/field_mask.pb.cc \
google/protobuf/generated_message_reflection.cc \
- google/protobuf/generated_message_table_driven.cc \
google/protobuf/map_field.cc \
google/protobuf/message.cc \
google/protobuf/reflection_internal.h \
@@ -2256,9 +2254,6 @@
google/protobuf/generated_message_reflection.lo: \
google/protobuf/$(am__dirstamp) \
google/protobuf/$(DEPDIR)/$(am__dirstamp)
-google/protobuf/generated_message_table_driven.lo: \
- google/protobuf/$(am__dirstamp) \
- google/protobuf/$(DEPDIR)/$(am__dirstamp)
google/protobuf/map_field.lo: google/protobuf/$(am__dirstamp) \
google/protobuf/$(DEPDIR)/$(am__dirstamp)
google/protobuf/message.lo: google/protobuf/$(am__dirstamp) \
@@ -3640,7 +3635,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@google/protobuf/$(DEPDIR)/extension_set_heavy.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@google/protobuf/$(DEPDIR)/field_mask.pb.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@google/protobuf/$(DEPDIR)/generated_message_reflection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@google/protobuf/$(DEPDIR)/generated_message_table_driven.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@google/protobuf/$(DEPDIR)/generated_message_util.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@google/protobuf/$(DEPDIR)/map_field.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@google/protobuf/$(DEPDIR)/message.Plo@am__quote@
diff -ru proto1/protobuf-3.3.0/src/google/protobuf/compiler/code_generator.h proto2/protobuf-3.3.0/src/google/protobuf/compiler/code_generator.h
--- proto1/protobuf-3.3.0/src/google/protobuf/compiler/code_generator.h 2017-05-05 01:42:32.000000000 +0300
+++ proto2/protobuf-3.3.0/src/google/protobuf/compiler/code_generator.h 2017-03-31 23:50:18.000000000 +0300
@@ -162,8 +162,8 @@
// "foo=bar,baz,qux=corge"
// parses to the pairs:
// ("foo", "bar"), ("baz", ""), ("qux", "corge")
-LIBPROTOC_EXPORT void ParseGeneratorParameter(
- const string&, std::vector<std::pair<string, string> >*);
+extern void ParseGeneratorParameter(const string&,
+ std::vector<std::pair<string, string> >*);
} // namespace compiler
} // namespace protobuf
diff -ru proto1/protobuf-3.3.0/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc proto2/protobuf-3.3.0/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc
--- proto1/protobuf-3.3.0/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc 2017-05-05 01:42:32.000000000 +0300
+++ proto2/protobuf-3.3.0/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc 2017-03-29 23:41:24.000000000 +0300
@@ -134,14 +134,6 @@
};
TEST(CsharpBootstrapTest, GeneratedCsharpDescriptorMatches) {
- // Skip this whole test if the csharp directory doesn't exist (i.e., a C++11
- // only distribution).
- string descriptor_file_name =
- "../csharp/src/Google.Protobuf/Reflection/Descriptor.cs";
- if (!File::Exists(TestSourceDir() + "/" + descriptor_file_name)) {
- return;
- }
-
MockErrorCollector error_collector;
DiskSourceTree source_tree;
Importer importer(&source_tree, &error_collector);
diff -ru proto1/protobuf-3.3.0/src/google/protobuf/compiler/mock_code_generator.cc proto2/protobuf-3.3.0/src/google/protobuf/compiler/mock_code_generator.cc
--- proto1/protobuf-3.3.0/src/google/protobuf/compiler/mock_code_generator.cc 2017-05-05 01:42:32.000000000 +0300
+++ proto2/protobuf-3.3.0/src/google/protobuf/compiler/mock_code_generator.cc 2017-03-31 23:50:18.000000000 +0300
@@ -55,13 +55,6 @@
#include <google/protobuf/stubs/substitute.h>
#include <gtest/gtest.h>
-#ifdef major
-#undef major
-#endif
-#ifdef minor
-#undef minor
-#endif
-
namespace google {
namespace protobuf {
namespace compiler {
Only in proto1/protobuf-3.3.0/src/google/protobuf: generated_message_table_driven.cc
Binary files proto1/protobuf-cpp-3.3.0.tar.gz and proto2/protobuf-cpp-3.3.0.tar.gz differ
--NzB8fVQJ5HfG6fxh--
Home |
Main Index |
Thread Index |
Old Index