diff --git a/protobuf-c/.signature b/protobuf-c/.signature index 2b16c5869..46439b43c 100644 --- a/protobuf-c/.signature +++ b/protobuf-c/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xjw5DG+1kySrJW/orMOI8QaWtguA/pG8Dp28p+hartrgp+3vIJvYP0oqZwWnxzPR4bPyrbznYlQ0p5SbltI8QI= -SHA256 (Pkgfile) = 8d3007c15fc13a4931e345138311cab6360316382faa471f86f47b956e9135e3 +RWSagIOpLGJF30f0YpCiCzW0n0uGRrVoDeCmKQqpB9j7L6CUjImK4fL1jOqtN3rp70Ai/61XTwUtBk62kLCL+Po7ckenHIRLfgc= +SHA256 (Pkgfile) = 04ebf3527ac71890f64b75b91ef66ffcc055160d3a69b9a329aaefed33e2d8c4 SHA256 (.footprint) = ae17effa541665aeacadca62795aa7150ee172bc7d52f9048612e7bdb788f803 SHA256 (protobuf-c-1.5.0.tar.gz) = 7b404c63361ed35b3667aec75cc37b54298d56dd2bcf369de3373212cc06fd98 +SHA256 (protobuf-c-1.5.0-Clean-CMake.patch) = 974677352e901509ce2115920098365122a5c1e269bb1ba92eb1a4bd096b372a diff --git a/protobuf-c/Pkgfile b/protobuf-c/Pkgfile index ff0145ee5..740d3c914 100644 --- a/protobuf-c/Pkgfile +++ b/protobuf-c/Pkgfile @@ -5,12 +5,16 @@ name=protobuf-c version=1.5.0 -release=1 -source=(https://github.com/protobuf-c/protobuf-c/releases/download/v$version/$name-$version.tar.gz) +release=2 +source=(https://github.com/protobuf-c/protobuf-c/releases/download/v$version/$name-$version.tar.gz + protobuf-c-1.5.0-Clean-CMake.patch) build() { cd $name-$version + patch -Np1 -i $SRC/protobuf-c-1.5.0-Clean-CMake.patch + autoreconf -fvi + ./configure --prefix=/usr \ --disable-static \ --disable-nls diff --git a/protobuf-c/protobuf-c-1.5.0-Clean-CMake.patch b/protobuf-c/protobuf-c-1.5.0-Clean-CMake.patch new file mode 100644 index 000000000..38a36b50c --- /dev/null +++ b/protobuf-c/protobuf-c-1.5.0-Clean-CMake.patch @@ -0,0 +1,117 @@ +From a6cf1aa386067e26d582cc1d1e327787595c9f13 Mon Sep 17 00:00:00 2001 +From: Robert Edmonds +Date: Wed, 20 Mar 2024 21:48:10 -0400 +Subject: [PATCH 01/11] FileGenerator::GenerateHeader(): Set + `min_header_version` unconditionally + +Previously, we were conditionally trying to set `min_header_version` to +the lowest possible value, and relying on a "legacy" Google interface to +determine the file descriptor's syntax version as part of that +determination. + +Instead, simply bump the minimum version to 1003000 (1.3.0). This +release was almost 7 years ago. In practice protobuf-c users should not +be shipping pre-compiled .pb-c.c/.pb-c.h files, anyway. +--- + protoc-c/c_file.cc | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/protoc-c/c_file.cc b/protoc-c/c_file.cc +index ca0ad34e..c6d8a240 100644 +--- a/protoc-c/c_file.cc ++++ b/protoc-c/c_file.cc +@@ -117,14 +117,7 @@ FileGenerator::~FileGenerator() {} + void FileGenerator::GenerateHeader(io::Printer* printer) { + std::string filename_identifier = FilenameIdentifier(file_->name()); + +- int min_header_version = 1000000; +-#if GOOGLE_PROTOBUF_VERSION >= 4023000 +- if (FileDescriptorLegacy(file_).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3) { +-#else +- if (file_->syntax() == FileDescriptor::SYNTAX_PROTO3) { +-#endif +- min_header_version = 1003000; +- } ++ const int min_header_version = 1003000; + + // Generate top of header. + printer->Print( + +From ee3d9e5423c93ee6b828fdda8e7fef13a77634eb Mon Sep 17 00:00:00 2001 +From: Robert Edmonds +Date: Wed, 20 Mar 2024 22:25:54 -0400 +Subject: [PATCH 02/11] Reimplement FieldSyntax() to maximize compatibility + across protobuf versions + +Recent versions of Google protobuf have broken the interfaces for +determining the syntax version of a .proto file. The current protobuf-c +1.5.0 release does not compile with Google protobuf 26.0 due to the most +recentage breakage. There is a possible workaround involving the Google +protobuf `FileDescriptorLegacy` class, which is documented as: + +// TODO Remove this deprecated API entirely. + +So we probably shouldn't rely on it. + +Instead, this commit obtains the `FileDescriptorProto` corresponding +to the passed in `FieldDescriptor` and interrogates the `syntax` field +directly. This is a single implementation with no version-specific +workarounds. Hopefully this won't break in the next Google protobuf +release. + +I tested the `FieldSyntax()` implementation in this commit across a +number of different Google protobuf releases and found that it worked +(`make && make check`) on all of them: + +- Google protobuf 3.6.1.3 (Ubuntu 20.04) +- Google protobuf 3.12.4 (Ubuntu 22.04) +- Google protobuf 3.21.12 (Debian 12 + Debian unstable) +- Google protobuf 3.25.2 (Debian experimental) +- Google protobuf 26.1-dev +--- + protoc-c/c_helpers.h | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +diff --git a/protoc-c/c_helpers.h b/protoc-c/c_helpers.h +index 062d330b..be28b601 100644 +--- a/protoc-c/c_helpers.h ++++ b/protoc-c/c_helpers.h +@@ -70,10 +70,6 @@ + #include + #include + +-#if GOOGLE_PROTOBUF_VERSION >= 4023000 +-# include +-#endif +- + namespace google { + namespace protobuf { + namespace compiler { +@@ -173,13 +169,21 @@ struct NameIndex + int compare_name_indices_by_name(const void*, const void*); + + // Return the syntax version of the file containing the field. +-// This wrapper is needed to be able to compile against protobuf2. + inline int FieldSyntax(const FieldDescriptor* field) { +-#if GOOGLE_PROTOBUF_VERSION >= 4023000 +- return FileDescriptorLegacy(field->file()).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3 ? 3 : 2; +-#else +- return field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ? 3 : 2; +-#endif ++ auto proto = FileDescriptorProto(); ++ field->file()->CopyTo(&proto); ++ ++ if (proto.has_syntax()) { ++ auto syntax = proto.syntax(); ++ assert(syntax == "proto2" || syntax == "proto3"); ++ if (syntax == "proto2") { ++ return 2; ++ } else if (syntax == "proto3") { ++ return 3; ++ } ++ } ++ ++ return 2; + } + + // Work around changes in protobuf >= 22.x without breaking compilation against