rebuilt with protobuf 28.1 [release 1.5.0-2mamba;Wed Sep 18 2024]
This commit is contained in:
parent
1c37ebb212
commit
6b2ca54f17
118
protobuf-c-1.5.0-protobuf-26.patch
Normal file
118
protobuf-c-1.5.0-protobuf-26.patch
Normal file
@ -0,0 +1,118 @@
|
|||||||
|
From a6cf1aa386067e26d582cc1d1e327787595c9f13 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Robert Edmonds <edmonds@users.noreply.github.com>
|
||||||
|
Date: Wed, 20 Mar 2024 21:48:10 -0400
|
||||||
|
Subject: [PATCH 1/3] 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 <edmonds@users.noreply.github.com>
|
||||||
|
Date: Wed, 20 Mar 2024 22:25:54 -0400
|
||||||
|
Subject: [PATCH 2/3] 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 <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 @@ 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
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: protobuf-c
|
Name: protobuf-c
|
||||||
Version: 1.5.0
|
Version: 1.5.0
|
||||||
Release: 1mamba
|
Release: 2mamba
|
||||||
Summary: A C implementation of the Google Protocol Buffers data serialization format
|
Summary: A C implementation of the Google Protocol Buffers data serialization format
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
@ -8,13 +8,16 @@ Distribution: openmamba
|
|||||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||||
URL: https://github.com/protobuf-c
|
URL: https://github.com/protobuf-c
|
||||||
Source: https://github.com/protobuf-c/protobuf-c.git/v%{version}/protobuf-c-%{version}.tar.bz2
|
Source: https://github.com/protobuf-c/protobuf-c.git/v%{version}/protobuf-c-%{version}.tar.bz2
|
||||||
|
Patch0: protobuf-c-1.5.0-protobuf-26.patch
|
||||||
License: BSD
|
License: BSD
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
|
BuildRequires: libabseil-cpp-devel
|
||||||
BuildRequires: libgcc
|
BuildRequires: libgcc
|
||||||
BuildRequires: libprotobuf-devel
|
BuildRequires: libprotobuf-devel
|
||||||
BuildRequires: libstdc++6-devel
|
BuildRequires: libstdc++6-devel
|
||||||
## AUTOBUILDREQ-END
|
## AUTOBUILDREQ-END
|
||||||
|
BuildRequires: libprotobuf-devel >= 28.1
|
||||||
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -37,11 +40,12 @@ Requires: pkg-config
|
|||||||
%description -n lib%{name}-devel
|
%description -n lib%{name}-devel
|
||||||
This package contains libraries and header files for developing applications that use %{name}.
|
This package contains libraries and header files for developing applications that use %{name}.
|
||||||
|
|
||||||
|
|
||||||
%debug_package
|
%debug_package
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch 0 -p1 -b .protobuf-26
|
||||||
|
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -55,9 +59,6 @@ This package contains libraries and header files for developing applications tha
|
|||||||
%clean
|
%clean
|
||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
|
|
||||||
%post -n lib%{name} -p /sbin/ldconfig
|
|
||||||
%postun -n lib%{name} -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%files -n lib%{name}
|
%files -n lib%{name}
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libdir}/libprotobuf-c.so.*
|
%{_libdir}/libprotobuf-c.so.*
|
||||||
@ -78,6 +79,9 @@ This package contains libraries and header files for developing applications tha
|
|||||||
%doc CHANGELOG.md README.md TODO
|
%doc CHANGELOG.md README.md TODO
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 18 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.0-2mamba
|
||||||
|
- rebuilt with protobuf 28.1
|
||||||
|
|
||||||
* Fri Dec 01 2023 Automatic Build System <autodist@mambasoft.it> 1.5.0-1mamba
|
* Fri Dec 01 2023 Automatic Build System <autodist@mambasoft.it> 1.5.0-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user