* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d319ec47f5a6b67406a332f9cff7fd7417d448e1
@ 2026-07-10 9:55 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-07-10 9:55 UTC (permalink / raw)
To: ipfire-scm
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via d319ec47f5a6b67406a332f9cff7fd7417d448e1 (commit)
via fb4cc28d268b546c0c34833e75a19e3ad68ca976 (commit)
via 8a1db091bb09049918c44a30d41b2461e1a25ce4 (commit)
from ae3e282197cce0fb3cf6b63c5aab462a470b2d28 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d319ec47f5a6b67406a332f9cff7fd7417d448e1
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Jul 10 09:55:23 2026 +0000
core204: Ship protobuf & protobuf-c
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit fb4cc28d268b546c0c34833e75a19e3ad68ca976
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Jul 9 14:25:19 2026 +0000
protobuf-c: Fix build against newer versions of protobuf
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 8a1db091bb09049918c44a30d41b2461e1a25ce4
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Jul 9 14:23:33 2026 +0000
protobuf: Update to 35.1
This also enables release mode when compiling so that we won't add any
superfluous debugging code which makes the build of protobuf-c crash on
riscv64.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/protobuf | 49 ++---
.../{oldcore/190 => core/204}/filelists/protobuf | 0
.../{oldcore/190 => core/204}/filelists/protobuf-c | 0
lfs/protobuf | 5 +-
lfs/protobuf-c | 1 +
src/patches/protobuf-c-PR797.patch | 205 +++++++++++++++++++++
6 files changed, 234 insertions(+), 26 deletions(-)
copy config/rootfiles/{oldcore/190 => core/204}/filelists/protobuf (100%)
copy config/rootfiles/{oldcore/190 => core/204}/filelists/protobuf-c (100%)
create mode 100644 src/patches/protobuf-c-PR797.patch
Difference in files:
diff --git a/config/rootfiles/common/protobuf b/config/rootfiles/common/protobuf
index 182ffd7bd..04491f21f 100644
--- a/config/rootfiles/common/protobuf
+++ b/config/rootfiles/common/protobuf
@@ -1,11 +1,11 @@
#usr/bin/protoc
-usr/bin/protoc-33.0.0
+#usr/bin/protoc-35.1.0
#usr/bin/protoc-gen-upb
-usr/bin/protoc-gen-upb-33.0.0
+#usr/bin/protoc-gen-upb-35.1.0
#usr/bin/protoc-gen-upb_minitable
-usr/bin/protoc-gen-upb_minitable-33.0.0
+#usr/bin/protoc-gen-upb_minitable-35.1.0
#usr/bin/protoc-gen-upbdefs
-usr/bin/protoc-gen-upbdefs-33.0.0
+#usr/bin/protoc-gen-upbdefs-35.1.0
#usr/include/google
#usr/include/google/protobuf
#usr/include/google/protobuf/any.h
@@ -19,17 +19,16 @@ usr/bin/protoc-gen-upbdefs-33.0.0
#usr/include/google/protobuf/arena_cleanup.h
#usr/include/google/protobuf/arenastring.h
#usr/include/google/protobuf/arenaz_sampler.h
+#usr/include/google/protobuf/c_sharp_features.proto
#usr/include/google/protobuf/compiler
#usr/include/google/protobuf/compiler/code_generator.h
#usr/include/google/protobuf/compiler/code_generator_lite.h
#usr/include/google/protobuf/compiler/command_line_interface.h
#usr/include/google/protobuf/compiler/cpp
-#usr/include/google/protobuf/compiler/cpp/generator.h
#usr/include/google/protobuf/compiler/cpp/helpers.h
#usr/include/google/protobuf/compiler/cpp/names.h
#usr/include/google/protobuf/compiler/cpp/options.h
#usr/include/google/protobuf/compiler/csharp
-#usr/include/google/protobuf/compiler/csharp/csharp_generator.h
#usr/include/google/protobuf/compiler/csharp/names.h
#usr/include/google/protobuf/compiler/importer.h
#usr/include/google/protobuf/compiler/java
@@ -41,27 +40,18 @@ usr/bin/protoc-gen-upbdefs-33.0.0
#usr/include/google/protobuf/compiler/java/names.h
#usr/include/google/protobuf/compiler/java/names_internal.h
#usr/include/google/protobuf/compiler/java/options.h
-#usr/include/google/protobuf/compiler/kotlin
-#usr/include/google/protobuf/compiler/kotlin/generator.h
#usr/include/google/protobuf/compiler/notices.h
#usr/include/google/protobuf/compiler/objectivec
-#usr/include/google/protobuf/compiler/objectivec/generator.h
#usr/include/google/protobuf/compiler/objectivec/line_consumer.h
#usr/include/google/protobuf/compiler/objectivec/names.h
#usr/include/google/protobuf/compiler/objectivec/nsobject_methods.h
#usr/include/google/protobuf/compiler/parser.h
#usr/include/google/protobuf/compiler/php
#usr/include/google/protobuf/compiler/php/names.h
-#usr/include/google/protobuf/compiler/php/php_generator.h
#usr/include/google/protobuf/compiler/plugin.h
#usr/include/google/protobuf/compiler/plugin.pb.h
#usr/include/google/protobuf/compiler/plugin.proto
-#usr/include/google/protobuf/compiler/python
-#usr/include/google/protobuf/compiler/python/generator.h
-#usr/include/google/protobuf/compiler/python/pyi_generator.h
#usr/include/google/protobuf/compiler/retention.h
-#usr/include/google/protobuf/compiler/ruby
-#usr/include/google/protobuf/compiler/ruby/ruby_generator.h
#usr/include/google/protobuf/compiler/scc.h
#usr/include/google/protobuf/compiler/subprocess.h
#usr/include/google/protobuf/compiler/versions.h
@@ -91,6 +81,7 @@ usr/bin/protoc-gen-upbdefs-33.0.0
#usr/include/google/protobuf/field_access_listener.h
#usr/include/google/protobuf/field_mask.pb.h
#usr/include/google/protobuf/field_mask.proto
+#usr/include/google/protobuf/field_with_arena.h
#usr/include/google/protobuf/generated_enum_reflection.h
#usr/include/google/protobuf/generated_enum_util.h
#usr/include/google/protobuf/generated_message_bases.h
@@ -104,6 +95,7 @@ usr/bin/protoc-gen-upbdefs-33.0.0
#usr/include/google/protobuf/implicit_weak_message.h
#usr/include/google/protobuf/inlined_string_field.h
#usr/include/google/protobuf/internal_feature_helper.h
+#usr/include/google/protobuf/internal_metadata_locator.h
#usr/include/google/protobuf/internal_visibility.h
#usr/include/google/protobuf/io
#usr/include/google/protobuf/io/coded_stream.h
@@ -154,6 +146,9 @@ usr/bin/protoc-gen-upbdefs-33.0.0
#usr/include/google/protobuf/reflection_visit_field_info.h
#usr/include/google/protobuf/reflection_visit_fields.h
#usr/include/google/protobuf/repeated_field.h
+#usr/include/google/protobuf/repeated_field_proxy.h
+#usr/include/google/protobuf/repeated_field_proxy_iterator.h
+#usr/include/google/protobuf/repeated_field_proxy_traits.h
#usr/include/google/protobuf/repeated_ptr_field.h
#usr/include/google/protobuf/runtime_version.h
#usr/include/google/protobuf/serial_arena.h
@@ -169,6 +164,7 @@ usr/bin/protoc-gen-upbdefs-33.0.0
#usr/include/google/protobuf/stubs/platform_macros.h
#usr/include/google/protobuf/stubs/port.h
#usr/include/google/protobuf/stubs/status_macros.h
+#usr/include/google/protobuf/symbol_checker.h
#usr/include/google/protobuf/text_format.h
#usr/include/google/protobuf/thread_safe_arena.h
#usr/include/google/protobuf/timestamp.pb.h
@@ -194,6 +190,7 @@ usr/bin/protoc-gen-upbdefs-33.0.0
#usr/include/upb
#usr/include/upb/base
#usr/include/upb/base/descriptor_constants.h
+#usr/include/upb/base/error_handler.h
#usr/include/upb/base/internal
#usr/include/upb/base/internal/endian.h
#usr/include/upb/base/internal/log2.h
@@ -204,6 +201,7 @@ usr/bin/protoc-gen-upbdefs-33.0.0
#usr/include/upb/generated_code_support.h
#usr/include/upb/hash
#usr/include/upb/hash/common.h
+#usr/include/upb/hash/ext_table.h
#usr/include/upb/hash/int_table.h
#usr/include/upb/hash/str_table.h
#usr/include/upb/json
@@ -236,13 +234,11 @@ usr/bin/protoc-gen-upbdefs-33.0.0
#usr/include/upb/message/internal/map_entry.h
#usr/include/upb/message/internal/map_sorter.h
#usr/include/upb/message/internal/message.h
-#usr/include/upb/message/internal/tagged_ptr.h
#usr/include/upb/message/internal/types.h
#usr/include/upb/message/map.h
#usr/include/upb/message/map_gencode_util.h
#usr/include/upb/message/merge.h
#usr/include/upb/message/message.h
-#usr/include/upb/message/tagged_ptr.h
#usr/include/upb/message/value.h
#usr/include/upb/mini_descriptor
#usr/include/upb/mini_descriptor/build_enum.h
@@ -256,16 +252,20 @@ usr/bin/protoc-gen-upbdefs-33.0.0
#usr/include/upb/mini_descriptor/internal/wire_constants.h
#usr/include/upb/mini_descriptor/link.h
#usr/include/upb/mini_table
+#usr/include/upb/mini_table/compat.h
+#usr/include/upb/mini_table/debug_string.h
#usr/include/upb/mini_table/enum.h
#usr/include/upb/mini_table/extension.h
#usr/include/upb/mini_table/extension_registry.h
#usr/include/upb/mini_table/field.h
#usr/include/upb/mini_table/file.h
+#usr/include/upb/mini_table/generated_registry.h
#usr/include/upb/mini_table/internal
#usr/include/upb/mini_table/internal/enum.h
#usr/include/upb/mini_table/internal/extension.h
#usr/include/upb/mini_table/internal/field.h
#usr/include/upb/mini_table/internal/file.h
+#usr/include/upb/mini_table/internal/generated_registry.h
#usr/include/upb/mini_table/internal/message.h
#usr/include/upb/mini_table/internal/size_log2.h
#usr/include/upb/mini_table/internal/sub.h
@@ -332,6 +332,7 @@ usr/bin/protoc-gen-upbdefs-33.0.0
#usr/include/upb/wire/eps_copy_input_stream.h
#usr/include/upb/wire/internal
#usr/include/upb/wire/internal/decoder.h
+#usr/include/upb/wire/internal/eps_copy_input_stream.h
#usr/include/upb/wire/internal/reader.h
#usr/include/upb/wire/reader.h
#usr/include/upb/wire/types.h
@@ -344,23 +345,23 @@ usr/bin/protoc-gen-upbdefs-33.0.0
#usr/lib/cmake/protobuf/protobuf-generate.cmake
#usr/lib/cmake/protobuf/protobuf-module.cmake
#usr/lib/cmake/protobuf/protobuf-options.cmake
-#usr/lib/cmake/protobuf/protobuf-targets-noconfig.cmake
+#usr/lib/cmake/protobuf/protobuf-targets-release.cmake
#usr/lib/cmake/protobuf/protobuf-targets.cmake
#usr/lib/cmake/utf8_range
#usr/lib/cmake/utf8_range/utf8_range-config.cmake
-#usr/lib/cmake/utf8_range/utf8_range-targets-noconfig.cmake
+#usr/lib/cmake/utf8_range/utf8_range-targets-release.cmake
#usr/lib/cmake/utf8_range/utf8_range-targets.cmake
#usr/lib/libprotobuf-lite.so
-usr/lib/libprotobuf-lite.so.33.0.0
+usr/lib/libprotobuf-lite.so.35.1.0
#usr/lib/libprotobuf.so
-usr/lib/libprotobuf.so.33.0.0
+usr/lib/libprotobuf.so.35.1.0
#usr/lib/libprotoc.so
-usr/lib/libprotoc.so.33.0.0
+usr/lib/libprotoc.so.35.1.0
#usr/lib/libupb.a
usr/lib/libutf8_range.so
-usr/lib/libutf8_range.so.33.0.0
+usr/lib/libutf8_range.so.35.1.0
usr/lib/libutf8_validity.so
-usr/lib/libutf8_validity.so.33.0.0
+usr/lib/libutf8_validity.so.35.1.0
#usr/lib/pkgconfig/protobuf-lite.pc
#usr/lib/pkgconfig/protobuf.pc
#usr/lib/pkgconfig/upb.pc
diff --git a/config/rootfiles/core/204/filelists/protobuf b/config/rootfiles/core/204/filelists/protobuf
new file mode 120000
index 000000000..e04ed90e7
--- /dev/null
+++ b/config/rootfiles/core/204/filelists/protobuf
@@ -0,0 +1 @@
+../../../common/protobuf
\ No newline at end of file
diff --git a/config/rootfiles/core/204/filelists/protobuf-c b/config/rootfiles/core/204/filelists/protobuf-c
new file mode 120000
index 000000000..5435540d5
--- /dev/null
+++ b/config/rootfiles/core/204/filelists/protobuf-c
@@ -0,0 +1 @@
+../../../common/protobuf-c
\ No newline at end of file
diff --git a/lfs/protobuf b/lfs/protobuf
index 8f40dc2fb..81e84ebb3 100644
--- a/lfs/protobuf
+++ b/lfs/protobuf
@@ -24,7 +24,7 @@
include Config
-VER = 33.0
+VER = 35.1
THISAPP = protobuf-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 5d456c000117b590dea5b7e721a8b8d00d9e7067ba2156f082e4959a17fcf8d4f2e306f90335aad97e1a94dfd2491544d67cb29670f0022034fde574140a8066
+$(DL_FILE)_BLAKE2 = d18d5c73537c0c08a729ebc91039d77a6e939c17f41c2a73c14cd165eb10113758e0dee812482045c19d34a1e839f6a316801ca367d971d43d13cb4403a27997
install : $(TARGET)
@@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && cmake . \
-D CMAKE_INSTALL_PREFIX=/usr \
+ -D CMAKE_BUILD_TYPE=Release \
-D protobuf_BUILD_TESTS=OFF \
-D protobuf_BUILD_SHARED_LIBS=ON \
-D protobuf_ABSL_PROVIDER=package
diff --git a/lfs/protobuf-c b/lfs/protobuf-c
index 7ed7b9346..73d0ccc4d 100644
--- a/lfs/protobuf-c
+++ b/lfs/protobuf-c
@@ -70,6 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/protobuf-c-PR797.patch
cd $(DIR_APP) && ./configure \
--prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/src/patches/protobuf-c-PR797.patch b/src/patches/protobuf-c-PR797.patch
new file mode 100644
index 000000000..bdb864fba
--- /dev/null
+++ b/src/patches/protobuf-c-PR797.patch
@@ -0,0 +1,205 @@
+From d39f001b4578966600de0aaf7fc665eec6e057e5 Mon Sep 17 00:00:00 2001
+From: Leon White <l.white@interstellarlab.earth>
+Date: Tue, 10 Mar 2026 10:37:18 +0100
+Subject: [PATCH] Fix compilation against protobuf v34
+
+---
+ protoc-gen-c/c_bytes_field.cc | 4 ++--
+ protoc-gen-c/c_enum_field.cc | 4 ++--
+ protoc-gen-c/c_field.cc | 10 +++++-----
+ protoc-gen-c/c_helpers.cc | 11 +++++++++++
+ protoc-gen-c/c_helpers.h | 5 +++++
+ protoc-gen-c/c_message_field.cc | 4 ++--
+ protoc-gen-c/c_primitive_field.cc | 4 ++--
+ protoc-gen-c/c_string_field.cc | 4 ++--
+ 8 files changed, 31 insertions(+), 15 deletions(-)
+
+diff --git a/protoc-gen-c/c_bytes_field.cc b/protoc-gen-c/c_bytes_field.cc
+index c8ac7725..ab101177 100644
+--- a/protoc-gen-c/c_bytes_field.cc
++++ b/protoc-gen-c/c_bytes_field.cc
+@@ -94,7 +94,7 @@ BytesFieldGenerator::~BytesFieldGenerator() {}
+
+ void BytesFieldGenerator::GenerateStructMembers(google::protobuf::io::Printer* printer) const
+ {
+- switch (descriptor_->label()) {
++ switch (FieldLabel(descriptor_)) {
+ case google::protobuf::FieldDescriptor::LABEL_REQUIRED:
+ printer->Print(variables_, "ProtobufCBinaryData $name$$deprecated$;\n");
+ break;
+@@ -135,7 +135,7 @@ std::string BytesFieldGenerator::GetDefaultValue(void) const
+ }
+ void BytesFieldGenerator::GenerateStaticInit(google::protobuf::io::Printer* printer) const
+ {
+- switch (descriptor_->label()) {
++ switch (FieldLabel(descriptor_)) {
+ case google::protobuf::FieldDescriptor::LABEL_REQUIRED:
+ printer->Print(variables_, "$default_value$");
+ break;
+diff --git a/protoc-gen-c/c_enum_field.cc b/protoc-gen-c/c_enum_field.cc
+index c3111f50..78ffb1c7 100644
+--- a/protoc-gen-c/c_enum_field.cc
++++ b/protoc-gen-c/c_enum_field.cc
+@@ -95,7 +95,7 @@ EnumFieldGenerator::~EnumFieldGenerator() {}
+
+ void EnumFieldGenerator::GenerateStructMembers(google::protobuf::io::Printer* printer) const
+ {
+- switch (descriptor_->label()) {
++ switch (FieldLabel(descriptor_)) {
+ case google::protobuf::FieldDescriptor::LABEL_REQUIRED:
+ printer->Print(variables_, "$type$ $name$$deprecated$;\n");
+ break;
+@@ -117,7 +117,7 @@ std::string EnumFieldGenerator::GetDefaultValue(void) const
+ }
+ void EnumFieldGenerator::GenerateStaticInit(google::protobuf::io::Printer* printer) const
+ {
+- switch (descriptor_->label()) {
++ switch (FieldLabel(descriptor_)) {
+ case google::protobuf::FieldDescriptor::LABEL_REQUIRED:
+ printer->Print(variables_, "$default$");
+ break;
+diff --git a/protoc-gen-c/c_field.cc b/protoc-gen-c/c_field.cc
+index 8d22343f..8f83e1b1 100644
+--- a/protoc-gen-c/c_field.cc
++++ b/protoc-gen-c/c_field.cc
+@@ -125,11 +125,11 @@ void FieldGenerator::GenerateDescriptorInitializerGeneric(google::protobuf::io::
+ variables["oneofname"] = CamelToLower(oneof->name());
+
+ if (FieldSyntax(descriptor_) == 3 &&
+- descriptor_->label() == google::protobuf::FieldDescriptor::LABEL_OPTIONAL) {
++ FieldLabel(descriptor_) == google::protobuf::FieldDescriptor::LABEL_OPTIONAL) {
+ variables["LABEL"] = "NONE";
+ optional_uses_has = false;
+ } else {
+- variables["LABEL"] = CamelToUpper(GetLabelName(descriptor_->label()));
++ variables["LABEL"] = CamelToUpper(GetLabelName(FieldLabel(descriptor_)));
+ }
+
+ if (descriptor_->has_default_value()) {
+@@ -145,11 +145,11 @@ void FieldGenerator::GenerateDescriptorInitializerGeneric(google::protobuf::io::
+
+ variables["flags"] = "0";
+
+- if (descriptor_->label() == google::protobuf::FieldDescriptor::LABEL_REPEATED
++ if (FieldLabel(descriptor_) == google::protobuf::FieldDescriptor::LABEL_REPEATED
+ && is_packable_type (descriptor_->type())
+ && descriptor_->options().packed()) {
+ variables["flags"] += " | PROTOBUF_C_FIELD_FLAG_PACKED";
+- } else if (descriptor_->label() == google::protobuf::FieldDescriptor::LABEL_REPEATED
++ } else if (FieldLabel(descriptor_) == google::protobuf::FieldDescriptor::LABEL_REPEATED
+ && is_packable_type (descriptor_->type())
+ && FieldSyntax(descriptor_) == 3
+ && !descriptor_->options().has_packed()) {
+@@ -179,7 +179,7 @@ void FieldGenerator::GenerateDescriptorInitializerGeneric(google::protobuf::io::
+ " $value$,\n"
+ " PROTOBUF_C_LABEL_$LABEL$,\n"
+ " PROTOBUF_C_TYPE_$TYPE$,\n");
+- switch (descriptor_->label()) {
++ switch (FieldLabel(descriptor_)) {
+ case google::protobuf::FieldDescriptor::LABEL_REQUIRED:
+ printer->Print(variables, " 0, /* quantifier_offset */\n");
+ break;
+diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
+index e5c177c9..fcfc2588 100644
+--- a/protoc-gen-c/c_helpers.cc
++++ b/protoc-gen-c/c_helpers.cc
+@@ -338,6 +338,17 @@ std::string GetLabelName(google::protobuf::FieldDescriptor::Label label) {
+ return "bad-label";
+ }
+
++google::protobuf::FieldDescriptor::Label FieldLabel(
++ const google::protobuf::FieldDescriptor* field) {
++ if (field->is_repeated()) {
++ return google::protobuf::FieldDescriptor::LABEL_REPEATED;
++ }
++ if (field->is_required()) {
++ return google::protobuf::FieldDescriptor::LABEL_REQUIRED;
++ }
++ return google::protobuf::FieldDescriptor::LABEL_OPTIONAL;
++}
++
+ unsigned
+ WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, compat::StringView name)
+ {
+diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
+index 69369997..210f17a9 100644
+--- a/protoc-gen-c/c_helpers.h
++++ b/protoc-gen-c/c_helpers.h
+@@ -153,6 +153,11 @@ std::string FilenameIdentifier(compat::StringView filename);
+ // return 'required', 'optional', or 'repeated'
+ std::string GetLabelName(google::protobuf::FieldDescriptor::Label label);
+
++// Returns the field label in a way that is compatible with protobuf versions
++// where FieldDescriptor::label() is unavailable.
++google::protobuf::FieldDescriptor::Label FieldLabel(
++ const google::protobuf::FieldDescriptor* field);
++
+ // write IntRanges entries for a bunch of sorted values.
+ // returns the number of ranges there are to bsearch.
+ unsigned WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, compat::StringView name);
+diff --git a/protoc-gen-c/c_message_field.cc b/protoc-gen-c/c_message_field.cc
+index 9fca9208..43661353 100644
+--- a/protoc-gen-c/c_message_field.cc
++++ b/protoc-gen-c/c_message_field.cc
+@@ -83,7 +83,7 @@ void MessageFieldGenerator::GenerateStructMembers(google::protobuf::io::Printer*
+ vars["name"] = FieldName(descriptor_);
+ vars["type"] = FullNameToC(descriptor_->message_type()->full_name(), descriptor_->message_type()->file());
+ vars["deprecated"] = FieldDeprecated(descriptor_);
+- switch (descriptor_->label()) {
++ switch (FieldLabel(descriptor_)) {
+ case google::protobuf::FieldDescriptor::LABEL_REQUIRED:
+ case google::protobuf::FieldDescriptor::LABEL_OPTIONAL:
+ printer->Print(vars, "$type$ *$name$$deprecated$;\n");
+@@ -103,7 +103,7 @@ std::string MessageFieldGenerator::GetDefaultValue(void) const
+ }
+ void MessageFieldGenerator::GenerateStaticInit(google::protobuf::io::Printer* printer) const
+ {
+- switch (descriptor_->label()) {
++ switch (FieldLabel(descriptor_)) {
+ case google::protobuf::FieldDescriptor::LABEL_REQUIRED:
+ case google::protobuf::FieldDescriptor::LABEL_OPTIONAL:
+ printer->Print("NULL");
+diff --git a/protoc-gen-c/c_primitive_field.cc b/protoc-gen-c/c_primitive_field.cc
+index 588f60e6..b3a4a46e 100644
+--- a/protoc-gen-c/c_primitive_field.cc
++++ b/protoc-gen-c/c_primitive_field.cc
+@@ -109,7 +109,7 @@ void PrimitiveFieldGenerator::GenerateStructMembers(google::protobuf::io::Printe
+ vars["name"] = FieldName(descriptor_);
+ vars["deprecated"] = FieldDeprecated(descriptor_);
+
+- switch (descriptor_->label()) {
++ switch (FieldLabel(descriptor_)) {
+ case google::protobuf::FieldDescriptor::LABEL_REQUIRED:
+ printer->Print(vars, "$c_type$ $name$$deprecated$;\n");
+ break;
+@@ -156,7 +156,7 @@ void PrimitiveFieldGenerator::GenerateStaticInit(google::protobuf::io::Printer*
+ } else {
+ vars["default_value"] = "0";
+ }
+- switch (descriptor_->label()) {
++ switch (FieldLabel(descriptor_)) {
+ case google::protobuf::FieldDescriptor::LABEL_REQUIRED:
+ printer->Print(vars, "$default_value$");
+ break;
+diff --git a/protoc-gen-c/c_string_field.cc b/protoc-gen-c/c_string_field.cc
+index 163f4246..6aea8dd3 100644
+--- a/protoc-gen-c/c_string_field.cc
++++ b/protoc-gen-c/c_string_field.cc
+@@ -94,7 +94,7 @@ void StringFieldGenerator::GenerateStructMembers(google::protobuf::io::Printer*
+ {
+ const ProtobufCFileOptions opt = descriptor_->file()->options().GetExtension(pb_c_file);
+
+- switch (descriptor_->label()) {
++ switch (FieldLabel(descriptor_)) {
+ case google::protobuf::FieldDescriptor::LABEL_REQUIRED:
+ case google::protobuf::FieldDescriptor::LABEL_OPTIONAL:
+ if (opt.const_strings())
+@@ -138,7 +138,7 @@ void StringFieldGenerator::GenerateStaticInit(google::protobuf::io::Printer* pri
+ } else {
+ vars["default"] = "(char *)protobuf_c_empty_string";
+ }
+- switch (descriptor_->label()) {
++ switch (FieldLabel(descriptor_)) {
+ case google::protobuf::FieldDescriptor::LABEL_REQUIRED:
+ case google::protobuf::FieldDescriptor::LABEL_OPTIONAL:
+ printer->Print(vars, "$default$");
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-10 9:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-10 9:55 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d319ec47f5a6b67406a332f9cff7fd7417d448e1 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox