[vlc-devel] [PATCH v2 06/13] contrib: protobuf: remove dead patch

[Steve Lhomme]

The patch doesn't apply and is discarded. A similar fix exists in the version
we use.
---
 contrib/src/protobuf/protobuf-win32.patch | 12 ------------
 contrib/src/protobuf/rules.mak            |  1 -
 2 files changed, 13 deletions(-)
 delete mode 100644 contrib/src/protobuf/protobuf-win32.patch

diff --git a/contrib/src/protobuf/protobuf-win32.patch b/contrib/src/protobuf/protobuf-win32.patch
deleted file mode 100644
index 8d061370ca..0000000000
--- a/contrib/src/protobuf/protobuf-win32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- protobuf/src/google/protobuf/stubs/time.h	2018-05-14 12:03:13.005476200 +0200
-+++ protobuf/src/google/protobuf/stubs/time.h.win32	2018-05-14 12:02:22.476842900 +0200
-@@ -54,6 +54,9 @@ bool LIBPROTOBUF_EXPORT SecondsToDateTim
- // Returns false if the DateTime is not valid or is not in the valid range.
- bool LIBPROTOBUF_EXPORT DateTimeToSeconds(const DateTime& time, int64* seconds);
- 
-+#ifdef GetCurrentTime
-+#undef GetCurrentTime  // Windows has macro GetCurrentTime
-+#endif
- void LIBPROTOBUF_EXPORT GetCurrentTime(int64* seconds, int32* nanos);
- 
- // Formats a time string in RFC3339 fromat.
diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak
index c505ef7548..e997b69526 100644
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -36,7 +36,6 @@ protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protobuf
 	$(UNPACK)
 	mv protobuf-$(PROTOBUF_VERSION) protobuf-$(PROTOBUF_VERSION)-cpp
 	$(APPLY) $(SRC)/protobuf/dont-build-protoc.patch
-	$(APPLY) $(SRC)/protobuf/protobuf-win32.patch
 	$(MOVE)
 
 .protobuf: protobuf
-- 
2.17.1