diff --git a/711.patch b/711.patch new file mode 100644 index 0000000..353b832 --- /dev/null +++ b/711.patch @@ -0,0 +1,59 @@ +--- protobuf-c-1.5.0/protoc-c/c_file.cc 2024-10-21 20:22:31.574369622 +0200 ++++ protobuf-c-1.5.0/protoc-c/c_file.cc 2024-10-21 20:22:43.064450125 +0200 +@@ -117,14 +117,7 @@ + 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( +--- protobuf-c-1.5.0/protoc-c/c_helpers.h 2024-10-21 20:22:31.574369622 +0200 ++++ protobuf-c-1.5.0/protoc-c/c_helpers.h 2024-10-21 20:22:43.064450125 +0200 +@@ -70,10 +70,6 @@ + #include + #include + +-#if GOOGLE_PROTOBUF_VERSION >= 4023000 +-# include +-#endif +- + namespace google { + namespace protobuf { + namespace compiler { +@@ -173,13 +169,21 @@ + 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 diff --git a/protobuf-c.changes b/protobuf-c.changes index f037c72..a1c5b66 100644 --- a/protobuf-c.changes +++ b/protobuf-c.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Oct 22 08:48:51 UTC 2024 - Fridrich Strba + +- Modified patch: + * 711.patch + + Drop a hunk that was creating problems when the protoc-c + was called directly and not just as a plugin to protoc + +------------------------------------------------------------------- +Mon Oct 21 18:20:27 UTC 2024 - Fridrich Strba + +- Added patch: + * 711.patch + + Backport the changes from the pull request #711 + https://github.com/protobuf-c/protobuf-c/pull/711 fixing + build with protobuf 26.0+ + ------------------------------------------------------------------- Mon Aug 12 21:14:32 UTC 2024 - Andreas Stieger diff --git a/protobuf-c.spec b/protobuf-c.spec index 628a46c..adfcb77 100644 --- a/protobuf-c.spec +++ b/protobuf-c.spec @@ -27,6 +27,7 @@ License: BSD-3-Clause Group: Development/Tools/Other URL: https://github.com/protobuf-c/protobuf-c Source: https://github.com/protobuf-c/protobuf-c/releases/download/v%version/%name-%version.tar.gz +Patch0: 711.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: c++_compiler