jengelh/protobuf-c
SHA256
1
0
Fork 0
forked from pool/protobuf-c
Code Pull Requests Activity

Accepting request 1216992 from devel:tools:building

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1216992
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/protobuf-c?expand=0&rev=30
This commit is contained in:
Ana Guerrero 2024-10-27 10:24:04 +00:00 committed by Git OBS Bridge
parent 270fe1482d
commit 16dccf6ba8
3 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
711.patch Normal file
View File

@ -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 <protobuf-c/protobuf-c.pb.h>
#include <google/protobuf/io/printer.h>
-#if GOOGLE_PROTOBUF_VERSION >= 4023000
-# include <google/protobuf/descriptor_legacy.h>
-#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

17
protobuf-c.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Oct 22 08:48:51 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>
- 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 <andreas.stieger@gmx.de>

1
protobuf-c.spec
View File

@ -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