From 273d22bb070089c1f90ff96878323438892c357d Mon Sep 17 00:00:00 2001 From: "U-DESKTOP-I3132OC\\fairlyblank" Date: Thu, 22 Jul 2021 13:55:20 +0800 Subject: [PATCH 1/4] [protobuf] add support for mingw subsystem --- ports/protobuf/portfile.cmake | 2 ++ versions/baseline.json | 2 +- versions/p-/protobuf.json | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 8f7c3b119de57b..0e0fa2cdb555ab 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -78,6 +78,8 @@ protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/share) if(protobuf_BUILD_PROTOC_BINARIES) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN) + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") + vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN) else() vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.15.8.0 AUTO_CLEAN) endif() diff --git a/versions/baseline.json b/versions/baseline.json index 39b7e720d33b68..acd4fa291cf1e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5014,7 +5014,7 @@ }, "protobuf": { "baseline": "3.15.8", - "port-version": 3 + "port-version": 4 }, "protobuf-c": { "baseline": "1.3.2-2", diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index 547ba83f2e6606..e7f9dc2571706a 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "380656b3e8c63b04974e8834f18b04f045d6395e", + "version-semver": "3.15.8", + "port-version": 4 + }, { "git-tree": "88066eeef097b56edc3bff316ce292d57c132d12", "version-semver": "3.15.8", From 7acbc5f3ad5f0c0e5eabb4143fc68fcebf9846e7 Mon Sep 17 00:00:00 2001 From: "U-DESKTOP-I3132OC\\fairlyblank" Date: Thu, 22 Jul 2021 18:27:42 +0800 Subject: [PATCH 2/4] [protobuf] support for mingw --- ports/protobuf/portfile.cmake | 4 +--- versions/p-/protobuf.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 0e0fa2cdb555ab..a645866c94aba2 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -76,9 +76,7 @@ endif() protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/share) if(protobuf_BUILD_PROTOC_BINARIES) - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) - vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN) - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") + if(VCPKG_TARGET_IS_WINDOWS) vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN) else() vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.15.8.0 AUTO_CLEAN) diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index e7f9dc2571706a..5fbae0d5f03644 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "380656b3e8c63b04974e8834f18b04f045d6395e", + "git-tree": "93fcd8322c487400e72309a2f4776c7d08bf3d7f", "version-semver": "3.15.8", "port-version": 4 }, From b6914f61d86a83ef05db11254cf950dbfd8d83ad Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 28 Jul 2021 02:31:13 -0700 Subject: [PATCH 3/4] Update the port version --- ports/protobuf/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index 0e85e376c0ca9e..40b557dd3c30b7 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "protobuf", "version-semver": "3.15.8", - "port-version": 3, + "port-version": 4, "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "dependencies": [ From 537c16c98ce6b161c5624fed54fcd15d77e14687 Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 28 Jul 2021 02:31:48 -0700 Subject: [PATCH 4/4] Update the baseline version --- versions/p-/protobuf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index 5fbae0d5f03644..bc2dcdeadbe6c9 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "93fcd8322c487400e72309a2f4776c7d08bf3d7f", + "git-tree": "6204194eaf9d8ff0fe78d498f77fee57cd19ce59", "version-semver": "3.15.8", "port-version": 4 },