Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits: c580054e by Hugo Beauzée-Luyssen at 2021-12-14T14:32:11+00:00 tools: Fix protobuf compiler build with recent compilers This is a manual backport of https://github.com/protocolbuffers/protobuf/commit/01a05a53f40ca2ac5f0af10c6cc0810bee39b792 - - - - - 2 changed files: - + extras/tools/protobuf-fix-build.patch - extras/tools/tools.mak Changes: ===================================== extras/tools/protobuf-fix-build.patch ===================================== @@ -0,0 +1,11 @@ +--- protobuf/src/google/protobuf/compiler/java/java_file.cc.old 2021-12-13 14:57:55.210153925 +0100 ++++ protobuf/src/google/protobuf/compiler/java/java_file.cc 2021-12-13 14:58:03.734181392 +0100 +@@ -65,7 +65,7 @@ + namespace { + + struct FieldDescriptorCompare { +- bool operator ()(const FieldDescriptor* f1, const FieldDescriptor* f2) { ++ bool operator ()(const FieldDescriptor* f1, const FieldDescriptor* f2) const { + if(f1 == NULL) { + return false; + } ===================================== extras/tools/tools.mak ===================================== @@ -315,6 +315,7 @@ protobuf-$(PROTOBUF_VERSION).tar.gz: protobuf: protobuf-$(PROTOBUF_VERSION).tar.gz $(UNPACK) + $(APPLY) $(TOOLS)/protobuf-fix-build.patch $(MOVE) .buildprotoc: protobuf View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/c580054e4f3a166f93c91f94416f97d89be83c16 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/c580054e4f3a166f93c91f94416f97d89be83c16 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
