Merge branch 'master' into vcpkg_nuget

4 files changed, 18 insertions, 64 deletions

diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL
index bce258d24..b0fd79627 100644
--- a/ports/protobuf/CONTROL
+++ b/ports/protobuf/CONTROL
@@ -1,5 +1,5 @@
 Source: protobuf
-Version: 3.8.0
+Version: 3.10.0
 Homepage: https://github.com/google/protobuf
 Description: Protocol Buffers - Google's data interchange format
 
diff --git a/ports/protobuf/disable-lite.patch b/ports/protobuf/disable-lite.patch
deleted file mode 100644
index 3a372e68f..000000000
--- a/ports/protobuf/disable-lite.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/cmake/install.cmake b/cmake/install.cmake

-index 9b2ae93c..7c9670a3 100644

---- a/cmake/install.cmake

-+++ b/cmake/install.cmake

-@@ -22,10 +22,12 @@ foreach(_library ${_protobuf_libraries})

-     set_property(TARGET ${_library}

-       PROPERTY INSTALL_RPATH "@loader_path")

-   endif()

-+  if(NOT "${_library}" STREQUAL "libprotobuf-lite")

-   install(TARGETS ${_library} EXPORT protobuf-targets

-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${_library}

-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${_library}

-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${_library})

-+  endif()

- endforeach()

- 

- if (protobuf_BUILD_PROTOC_BINARIES)

-@@ -40,7 +42,7 @@ if (protobuf_BUILD_PROTOC_BINARIES)

-   endif()

- endif (protobuf_BUILD_PROTOC_BINARIES)

- 

--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc ${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")

-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")

- 

- file(STRINGS extract_includes.bat.in _extract_strings

-   REGEX "^copy")

-@@ -121,12 +123,12 @@ configure_file(protobuf-options.cmake

- # Allows the build directory to be used as a find directory.

- 

- if (protobuf_BUILD_PROTOC_BINARIES)

--  export(TARGETS libprotobuf-lite libprotobuf libprotoc protoc

-+  export(TARGETS libprotobuf libprotoc protoc

-     NAMESPACE protobuf::

-     FILE ${CMAKE_INSTALL_CMAKEDIR}/protobuf-targets.cmake

-   )

- else (protobuf_BUILD_PROTOC_BINARIES)

--  export(TARGETS libprotobuf-lite libprotobuf

-+  export(TARGETS libprotobuf

-     NAMESPACE protobuf::

-     FILE ${CMAKE_INSTALL_CMAKEDIR}/protobuf-targets.cmake

-   )

diff --git a/ports/protobuf/fix-uwp.patch b/ports/protobuf/fix-uwp.patch
index ba09d5913..7a993c5c0 100644
--- a/ports/protobuf/fix-uwp.patch
+++ b/ports/protobuf/fix-uwp.patch
@@ -1,8 +1,8 @@
 diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt

-index 3afe376..1a0b6a7 100644

+index f87b0928e..5102a10e3 100644

 --- a/cmake/CMakeLists.txt

 +++ b/cmake/CMakeLists.txt

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

+@@ -190,6 +190,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.

diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index 982345db1..0e149a3b2 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -2,13 +2,12 @@ include(vcpkg_common_functions)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/protobuf
-    REF v3.8.0
-    SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
+    REPO protocolbuffers/protobuf
+    REF v3.10.0
+    SHA512 0dcba6d21486fdc162f57119754b47b4a2fb605af878d5b96a32df55895321535cffb5b804566fd90ee7c36e20106d0cd4f5d9f3c652dc9c4dfca96be41a1977
     HEAD_REF master
     PATCHES
         fix-uwp.patch
-        disable-lite.patch
 )
 
 if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
@@ -24,15 +23,15 @@ if(NOT protobuf_BUILD_PROTOC_BINARIES AND NOT EXISTS ${CURRENT_INSTALLED_DIR}/..
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    set(protobuf_BUILD_SHARED_LIBS ON)
+  set(VCPKG_BUILD_SHARED_LIBS ON)
 else()
-    set(protobuf_BUILD_SHARED_LIBS OFF)
+  set(VCPKG_BUILD_SHARED_LIBS OFF)
 endif()
 
-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    set(protobuf_MSVC_STATIC_RUNTIME ON)
+if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+  set(VCPKG_BUILD_STATIC_CRT OFF)
 else()
-    set(protobuf_MSVC_STATIC_RUNTIME OFF)
+  set(VCPKG_BUILD_STATIC_CRT ON)
 endif()
 
 if("zlib" IN_LIST FEATURES)
@@ -45,8 +44,8 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/cmake
     PREFER_NINJA
     OPTIONS
-        -Dprotobuf_BUILD_SHARED_LIBS=${protobuf_BUILD_SHARED_LIBS}
-        -Dprotobuf_MSVC_STATIC_RUNTIME=${protobuf_MSVC_STATIC_RUNTIME}
+        -Dprotobuf_BUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS}
+        -Dprotobuf_MSVC_STATIC_RUNTIME=${VCPKG_BUILD_STATIC_CRT}
         -Dprotobuf_WITH_ZLIB=${protobuf_WITH_ZLIB}
         -Dprotobuf_BUILD_TESTS=OFF
         -DCMAKE_INSTALL_CMAKEDIR:STRING=share/protobuf
@@ -91,10 +90,10 @@ protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/share)
 
 if(CMAKE_HOST_WIN32)
     if(protobuf_BUILD_PROTOC_BINARIES)
-        file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/protoc.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/protobuf)
-        vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/protobuf)
+        file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/protoc.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+        vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
     else()
-        file(COPY ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/protobuf DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+        file(COPY ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
     endif()
 
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -107,22 +106,18 @@ if(CMAKE_HOST_WIN32)
 else()
     file(GLOB EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/protoc*)
     foreach(E IN LISTS EXECUTABLES)
-        file(INSTALL ${E} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/protobuf
+        file(INSTALL ${E} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}
                 PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ)
     endforeach()
     protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin)
     protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin)
 endif()
 
-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/libprotobuf-lite.lib)
-    message(FATAL_ERROR "Expected to not build the lite runtime because it contains some of the same symbols as the full runtime.")
-endif()
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     file(READ ${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h _contents)
     string(REPLACE "\#endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" "\#define PROTOBUF_USE_DLLS\n\#endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" _contents "${_contents}")
     file(WRITE ${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h "${_contents}")
 endif()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/protobuf RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 vcpkg_copy_pdbs()