[vlc-devel] [PATCH v2 09/13] contrib: protobuf: remove protoc disabling patch

[Steve Lhomme]

When using --with-protoc protoc is not built anyway.
---
 contrib/src/protobuf/dont-build-protoc.patch | 24 --------------------
 contrib/src/protobuf/rules.mak               |  1 -
 2 files changed, 25 deletions(-)
 delete mode 100644 contrib/src/protobuf/dont-build-protoc.patch

diff --git a/contrib/src/protobuf/dont-build-protoc.patch b/contrib/src/protobuf/dont-build-protoc.patch
deleted file mode 100644
index 88bcca5e05..0000000000
--- a/contrib/src/protobuf/dont-build-protoc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- protobuf/src/Makefile.am.old	2017-04-20 17:58:28.941775687 +0200
-+++ protobuf/src/Makefile.am	2017-04-20 17:57:40.629763450 +0200
-@@ -481,7 +481,10 @@
-   google/protobuf/compiler/csharp/csharp_wrapper_field.cc      \
-   google/protobuf/compiler/csharp/csharp_wrapper_field.h
- 
-+EXTRA_PROGRAMS = protoc
-+if !USE_EXTERNAL_PROTOC
- bin_PROGRAMS = protoc
-+endif
- protoc_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la
- protoc_SOURCES = google/protobuf/compiler/main.cc
- 
---- protobuf/src/Makefile.am.old	2018-03-14 15:00:19.974044729 +0100
-+++ protobuf/src/Makefile.am	2018-03-14 15:01:03.158043968 +0100
-@@ -174,7 +174,7 @@
-   google/protobuf/util/type_resolver_util.h                     \
-   google/protobuf/util/message_differencer.h
- 
--lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
-+lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la
- 
- libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
- libprotobuf_lite_la_LDFLAGS = -version-info 11:0:0 -export-dynamic -no-undefined
diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak
index dde5c378ea..96904f5962 100644
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -38,7 +38,6 @@ protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protobuf
 	$(UNPACK)
 	mv protobuf-$(PROTOBUF_VERSION) protobuf-$(PROTOBUF_VERSION)-cpp
 	$(APPLY) $(SRC)/protobuf/protobuf-disable-gmock.patch
-	$(APPLY) $(SRC)/protobuf/dont-build-protoc.patch
 	$(MOVE)
 
 .protobuf: protobuf
-- 
2.17.1