diff --git a/contrib/src/protobuf/include-algorithm.patch b/contrib/src/protobuf/include-algorithm.patch new file mode 100644 index 0000000000..356c7239f4 --- /dev/null +++ b/contrib/src/protobuf/include-algorithm.patch @@ -0,0 +1,14 @@ +--- 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 +-#endif +- + #include + #include + #include diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak index 8f03c51ce8..e561e9d850 100644 --- a/contrib/src/protobuf/rules.mak +++ b/contrib/src/protobuf/rules.mak @@ -41,6 +41,7 @@ protoc: protoc-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protoc tar xvzfo "$<" -C $(UNPACK_DIR) --strip-components=1 $(APPLY) $(SRC)/protobuf/protobuf-disable-gmock.patch $(APPLY) $(SRC)/protobuf/protobuf-fix-build.patch + $(APPLY) $(SRC)/protobuf/include-algorithm.patch $(MOVE) .protoc: protoc @@ -55,6 +56,7 @@ protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protobuf $(APPLY) $(SRC)/protobuf/protobuf-disable-gmock.patch $(APPLY) $(SRC)/protobuf/dont-build-protoc.patch $(APPLY) $(SRC)/protobuf/protobuf-fix-build.patch + $(APPLY) $(SRC)/protobuf/include-algorithm.patch $(MOVE) .protobuf: protobuf