vlc-debian-android-3.0: Fix protoc build with recent gcc

These are the same patches used in vlc 3.0 extras/tools.

vlc-debian-android-3.0/Dockerfile

@@ -5,6 +5,7 @@ MAINTAINER VideoLAN roots <roots@videolan.org>
 ENV IMAGE_DATE=202306200801
 
 COPY crossfiles/ /opt/crossfiles/
+COPY patches /patches
 
 ENV ANDROID_NDK="/sdk/android-ndk" \
     ANDROID_SDK="/sdk/android-sdk-linux"
@@ -64,6 +65,8 @@ RUN groupadd --gid ${VIDEOLAN_CI_UID} videolan && \
     echo $PROTOBUF_SHA256 protobuf-cpp-$PROTOBUF_VERSION.tar.gz | sha256sum -c && \
     tar xzfo protobuf-cpp-$PROTOBUF_VERSION.tar.gz && \
     cd protobuf-$PROTOBUF_VERSION && \
+    patch -p1 < /patches/protobuf-fix-build.patch && \
+    patch -p1 < /patches/protobuf-include-algorithm.patch && \
     ./configure --prefix=/opt/tools/ --disable-shared --enable-static && make -j$CORES && make install && \
     rm -rf /build
 

vlc-debian-android-3.0/patches/protobuf-fix-build.patch

+--- 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;
+     }

vlc-debian-android-3.0/patches/protobuf-include-algorithm.patch

+--- protobuf/src/google/protobuf/repeated_field.h.orig	2022-02-17 12:44:54.526527423 +0200
++++ protobuf/src/google/protobuf/repeated_field.h	2022-02-17 12:44:58.190446363 +0200
+@@ -46,11 +46,7 @@
+ #ifndef GOOGLE_PROTOBUF_REPEATED_FIELD_H__
+ #define GOOGLE_PROTOBUF_REPEATED_FIELD_H__
+ 
+-#ifdef _MSC_VER
+-// This is required for min/max on VS2013 only.
+ #include <algorithm>
+-#endif
+-
+ #include <string>
+ #include <iterator>
+ #include <google/protobuf/stubs/casts.h>