[protobuf] Update to 3.14.0 (#14670)

* [protobuf] Update to 3.14.0

* Replace patch CRLF with LF

5 files changed, 4 insertions, 47 deletions

diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL
index 115b306c5..7d67ac742 100644
--- a/ports/protobuf/CONTROL
+++ b/ports/protobuf/CONTROL
@@ -1,6 +1,5 @@
 Source: protobuf
-Version: 3.13.0
-Port-Version: 2
+Version: 3.14.0
 Homepage: https://github.com/protocolbuffers/protobuf
 Description: Protocol Buffers - Google's data interchange format
 
diff --git a/ports/protobuf/fix-android-log.patch b/ports/protobuf/fix-android-log.patch
deleted file mode 100644
index 47a935078..000000000
--- a/ports/protobuf/fix-android-log.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake
-index 6bf86a277..424854798 100644
---- a/cmake/libprotobuf-lite.cmake
-+++ b/cmake/libprotobuf-lite.cmake
-@@ -67,6 +67,9 @@ target_link_libraries(libprotobuf-lite ${CMAKE_THREAD_LIBS_INIT})
- if(protobuf_LINK_LIBATOMIC)
-   target_link_libraries(libprotobuf-lite atomic)
- endif()
-+if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
-+       target_link_libraries(libprotobuf-lite log)
-+endif()
- target_include_directories(libprotobuf-lite PUBLIC ${protobuf_source_dir}/src)
- if(MSVC AND protobuf_BUILD_SHARED_LIBS)
-   target_compile_definitions(libprotobuf-lite
-diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake
-index 0c12596c2..a5be494fb 100644
---- a/cmake/libprotobuf.cmake
-+++ b/cmake/libprotobuf.cmake
-@@ -121,6 +121,9 @@ endif()
- if(protobuf_LINK_LIBATOMIC)
-   target_link_libraries(libprotobuf atomic)
- endif()
-+if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
-+       target_link_libraries(libprotobuf log)
-+endif()
- target_include_directories(libprotobuf PUBLIC ${protobuf_source_dir}/src)
- if(MSVC AND protobuf_BUILD_SHARED_LIBS)
-   target_compile_definitions(libprotobuf
diff --git a/ports/protobuf/fix-static-build.patch b/ports/protobuf/fix-static-build.patch
index 22d99435c..0ba4982fe 100644
--- a/ports/protobuf/fix-static-build.patch
+++ b/ports/protobuf/fix-static-build.patch
@@ -1,5 +1,5 @@
 diff --git a/cmake/install.cmake b/cmake/install.cmake
-index be47c54..8b1bd97 100644
+index 4091bc8..9850018 100644
 --- a/cmake/install.cmake
 +++ b/cmake/install.cmake
 @@ -31,7 +31,7 @@ endforeach()
diff --git a/ports/protobuf/fix-uwp.patch b/ports/protobuf/fix-uwp.patch
deleted file mode 100644
index 44f23579f..000000000
--- a/ports/protobuf/fix-uwp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt

-index 9ca31ac0b..237468c55 100644

---- a/cmake/CMakeLists.txt

-+++ b/cmake/CMakeLists.txt

-@@ -207,6 +207,7 @@ if (MSVC)

-     /wd4506 # no definition for inline function 'function'

-     /wd4800 # 'type' : forcing value to bool 'true' or 'false' (performance warning)

-     /wd4996 # The compiler encountered a deprecated declaration.

-+    /wd4703 # Potentially uninitialized local pointer variable 'name' used.

-   )

-   # Allow big object

-   add_definitions(/bigobj)

diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index 47510b550..d364878db 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -1,12 +1,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO protocolbuffers/protobuf
-    REF fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a    #v3.13.0
-    SHA512 b458410311a0905048c86d70ded263ae0cbb6693fd42cba730d3a95c69ca533cf453eb15c5f8bf8b00003ddc63fe96b3c4242907e2d6b00d5bec5d37b2ae1c5e
+    REF 2514f0bd7da7e2af1bed4c5d1b84f031c4d12c10    #v3.14.0
+    SHA512 765fd12786b405eb8b7365f1117fa16d0e268f8677e829e0a91635bb4278295c5e488949726394f84d0993f8ea8205ca66eb1f79c88cc89ad5ac4a2df483d473
     HEAD_REF master
     PATCHES
-        fix-uwp.patch
-        fix-android-log.patch
         fix-static-build.patch
 )