[protobuf] upgrade to latest release (v3.19.4) #23474

sphawk · 2022-03-10T04:49:20Z

Describe the pull request

What does your PR fix?

upgrade to latest release (v3.19.4)
Which triplets are supported/not supported? Have you updated the CI baseline?

unchanged, no
Does your PR follow the maintainer guide?

yes
If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

yes

most of the code from #21485

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 5a8a1dfff8e2dffd4c8cc2d1fc0da379ffd18b25 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index b778199..74817f5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5502,7 +5502,7 @@
     },
     "protobuf": {
       "baseline": "3.19.4",
-      "port-version": 0
+      "port-version": 1
     },
     "protobuf-c": {
       "baseline": "1.4.0",
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index e297e2f..2c47330 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,9 +1,9 @@
 {
   "versions": [
     {
-      "git-tree": "22d0e265de7d2b3d2e9a00d071313502e7d4cccf",
+      "git-tree": "a239bfdb6e9a1b0656b5db27384c0dd2cf09e835",
       "version-semver": "3.19.4",
-      "port-version": 0
+      "port-version": 1
     },
     {
       "git-tree": "5f6aa04d94e184b89c1887946fb4684bc51c4611",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/protobuf/portfile.cmake

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/protobuf/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json
index 3332a17..276f189 100644
--- a/ports/protobuf/vcpkg.json
+++ b/ports/protobuf/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "protobuf",
   "version-semver": "3.19.4",
-  "port-version": 0,
   "description": "Protocol Buffers - Google's data interchange format",
   "homepage": "https://github.com/protocolbuffers/protobuf",
   "dependencies": [

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 5a8a1dfff8e2dffd4c8cc2d1fc0da379ffd18b25 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index d87a108..b778199 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5501,8 +5501,8 @@
       "port-version": 0
     },
     "protobuf": {
-      "baseline": "3.18.0",
-      "port-version": 1
+      "baseline": "3.19.4",
+      "port-version": 0
     },
     "protobuf-c": {
       "baseline": "1.4.0",
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index e416cf2..d5dd8e8 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "011b0f865503e299164ccb69072fe8becf35f952",
+      "version-semver": "3.19.4",
+      "port-version": 0
+    },
     {
       "git-tree": "5f6aa04d94e184b89c1887946fb4684bc51c4611",
       "version-semver": "3.18.0",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/protobuf/portfile.cmake

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/protobuf/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 5a8a1dfff8e2dffd4c8cc2d1fc0da379ffd18b25 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index d87a108..b778199 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5501,8 +5501,8 @@
       "port-version": 0
     },
     "protobuf": {
-      "baseline": "3.18.0",
-      "port-version": 1
+      "baseline": "3.19.4",
+      "port-version": 0
     },
     "protobuf-c": {
       "baseline": "1.4.0",
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index e416cf2..d5dd8e8 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "011b0f865503e299164ccb69072fe8becf35f952",
+      "version-semver": "3.19.4",
+      "port-version": 0
+    },
     {
       "git-tree": "5f6aa04d94e184b89c1887946fb4684bc51c4611",
       "version-semver": "3.18.0",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/protobuf/portfile.cmake

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/protobuf/vcpkg.json

Valid values for the license field can be found in the documentation

JonLiu1993 · 2022-03-10T07:55:01Z

@sphawk, thanks for your PR, CI tests fail on many triples, but not all of them are related to your PR, I found that x64-osx triples test failures are related to your PR
Here is the error log, please see:
install-x64-osx-dbg-out.log

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 5a8a1dfff8e2dffd4c8cc2d1fc0da379ffd18b25 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index d87a108..057e6b8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5501,8 +5501,8 @@
       "port-version": 0
     },
     "protobuf": {
-      "baseline": "3.18.0",
-      "port-version": 1
+      "baseline": "3.19.4",
+      "port-version": 0
     },
     "protobuf-c": {
       "baseline": "1.4.0",
@@ -5514,7 +5514,7 @@
     },
     "protozero": {
       "baseline": "1.7.0",
-      "port-version": 0
+      "port-version": 1
     },
     "proxygen": {
       "baseline": "2022.01.31.00",
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index e416cf2..e31a12e 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "04d5715cb8419dd9a852976d54930edbcfa0461f",
+      "version-semver": "3.19.4",
+      "port-version": 0
+    },
     {
       "git-tree": "5f6aa04d94e184b89c1887946fb4684bc51c4611",
       "version-semver": "3.18.0",
diff --git a/versions/p-/protozero.json b/versions/p-/protozero.json
index d05d0ec..3283159 100644
--- a/versions/p-/protozero.json
+++ b/versions/p-/protozero.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4cd9d04357a883b1fd2aeefbcee86ae77bbb9fd7",
+      "version-semver": "1.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "23f6ec11be6bbf623dc7590b128027ccb7f69727",
       "version-semver": "1.7.0",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/protozero/portfile.cmake

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 5a8a1dfff8e2dffd4c8cc2d1fc0da379ffd18b25 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index d87a108..057e6b8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5501,8 +5501,8 @@
       "port-version": 0
     },
     "protobuf": {
-      "baseline": "3.18.0",
-      "port-version": 1
+      "baseline": "3.19.4",
+      "port-version": 0
     },
     "protobuf-c": {
       "baseline": "1.4.0",
@@ -5514,7 +5514,7 @@
     },
     "protozero": {
       "baseline": "1.7.0",
-      "port-version": 0
+      "port-version": 1
     },
     "proxygen": {
       "baseline": "2022.01.31.00",
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index e416cf2..e31a12e 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "04d5715cb8419dd9a852976d54930edbcfa0461f",
+      "version-semver": "3.19.4",
+      "port-version": 0
+    },
     {
       "git-tree": "5f6aa04d94e184b89c1887946fb4684bc51c4611",
       "version-semver": "3.18.0",
diff --git a/versions/p-/protozero.json b/versions/p-/protozero.json
index d05d0ec..16efeb2 100644
--- a/versions/p-/protozero.json
+++ b/versions/p-/protozero.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "15fc1b12547d105b954891804ff919ee6615112e",
+      "version-semver": "1.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "23f6ec11be6bbf623dc7590b128027ccb7f69727",
       "version-semver": "1.7.0",

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 5a8a1dfff8e2dffd4c8cc2d1fc0da379ffd18b25 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index d87a108..057e6b8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5501,8 +5501,8 @@
       "port-version": 0
     },
     "protobuf": {
-      "baseline": "3.18.0",
-      "port-version": 1
+      "baseline": "3.19.4",
+      "port-version": 0
     },
     "protobuf-c": {
       "baseline": "1.4.0",
@@ -5514,7 +5514,7 @@
     },
     "protozero": {
       "baseline": "1.7.0",
-      "port-version": 0
+      "port-version": 1
     },
     "proxygen": {
       "baseline": "2022.01.31.00",
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index e416cf2..8b58d18 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a40dc9ba13769cef9a17fae390911d3e7c7c7342",
+      "version-semver": "3.19.4",
+      "port-version": 0
+    },
     {
       "git-tree": "5f6aa04d94e184b89c1887946fb4684bc51c4611",
       "version-semver": "3.18.0",
diff --git a/versions/p-/protozero.json b/versions/p-/protozero.json
index d05d0ec..16efeb2 100644
--- a/versions/p-/protozero.json
+++ b/versions/p-/protozero.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "15fc1b12547d105b954891804ff919ee6615112e",
+      "version-semver": "1.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "23f6ec11be6bbf623dc7590b128027ccb7f69727",
       "version-semver": "1.7.0",

sphawk · 2022-03-11T01:34:49Z

@JonLiu1993 sorry for late response. I'm ready for review
take most of code #21485 + solve x64-windows-static-md problem.

ras0219-msft

Thanks for the PR!

ras0219-msft · 2022-03-11T01:55:14Z

ports/protobuf/fix-static-build.patch

+    if (MSVC AND protobuf_MSVC_STATIC_RUNTIME)
+      set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$<CONFIG:Debug>:Debug>)
+    elseif (MSVC AND NOT protobuf_MSVC_STATIC_RUNTIME)
+      set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$<CONFIG:Debug>:Debug>DLL)
+    endif ()


These should already be set via the triplet & toolchain, so we should be able to simply not set CMAKE_MSVC_RUNTIME_LIBRARY at all.

ok, I'll try remove all

@ras0219-msft done!

JonLiu1993 · 2022-03-14T08:39:06Z

Feature 'zlib' tested successfully in the following triplet:

x86-windows
x64-windows
x64-windows-static