Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[protobuf] Update to version 3.19.3 #21485

Closed
wants to merge 20 commits into from
Closed

[protobuf] Update to version 3.19.3 #21485

wants to merge 20 commits into from

Conversation

LilyWangLL
Copy link
Contributor

@LilyWangLL LilyWangLL commented Nov 17, 2021

Describe the pull request

  1. Due to issue#[vcpkg-cmake] Failed when using vcpkg-cmake-configure to build uwp triples #19818, using vcpkg_cmake_configure will produce build error on triplet UWP, so I still use vcpkg_configure_cmake.

    -- Building x64-uwp-rel
    CMake Warning at scripts/cmake/vcpkg_copy_pdbs.cmake:70 (message):
      Could not find a matching pdb file for:
    
          E:/vcpkg/packages/protobuf_x64-uwp/bin/libprotobuf-lite.dll
          E:/vcpkg/packages/protobuf_x64-uwp/bin/libprotobuf.dll
    
  2. There are message in Source/cmake/CMakeLists.txt L187 as below, this port doesn't support triplet x64-windows-static-md

    # In case we are building static libraries, link also the runtime library statically
    # so that MSVCR*.DLL is not required at runtime.
    # https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx
    # This is achieved by replacing msvc option /MD with /MT and /MDd with /MTd
    # http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F
    
  3. Due to patch fix-uwp-build.patch has been merged into source, so remove this patch.

  • 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?

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

@LilyWangLL LilyWangLL added the info:internal This PR or Issue was filed by the vcpkg team. label Nov 17, 2021
@ghost
Copy link

ghost commented Nov 17, 2021

CLA assistant check
All CLA requirements met.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@JackBoosY JackBoosY added the category:port-update The issue is with a library, which is requesting update new revision label Nov 17, 2021
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@LilyWangLL
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Lily Wang added 3 commits January 17, 2022 23:41
…LilyWang/issue21365

# Conflicts:
#	ports/protobuf/portfile.cmake
#	ports/protobuf/vcpkg.json
#	versions/baseline.json
#	versions/p-/protobuf.json
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 4184491f0780d4fae34d00044073dc058a23264b -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 209b870..e20e9a7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5449,8 +5449,8 @@
       "port-version": 0
     },
     "protobuf": {
-      "baseline": "3.18.0",
-      "port-version": 1
+      "baseline": "3.19.1",
+      "port-version": 0
     },
     "protobuf-c": {
       "baseline": "1.4.0",
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index f780316..8faa408 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,15 +1,14 @@
 {
   "versions": [
     {
-<<<<<<< HEAD
-      "git-tree": "82eae78d59656624befad231ef7aa397f609e422",
+      "git-tree": "e312db11b26e40867bfb9be63c00b01a2891cf1c",
       "version-semver": "3.19.1",
       "port-version": 0
-=======
+    },
+    {
       "git-tree": "5f6aa04d94e184b89c1887946fb4684bc51c4611",
       "version-semver": "3.18.0",
       "port-version": 1
->>>>>>> 4184491f0780d4fae34d00044073dc058a23264b
     },
     {
       "git-tree": "19c2bf45c235e6126161bae36aa7ff7e1fcda479",

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

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 4184491f0780d4fae34d00044073dc058a23264b -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 209b870..e20e9a7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5449,8 +5449,8 @@
       "port-version": 0
     },
     "protobuf": {
-      "baseline": "3.18.0",
-      "port-version": 1
+      "baseline": "3.19.1",
+      "port-version": 0
     },
     "protobuf-c": {
       "baseline": "1.4.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

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 4184491f0780d4fae34d00044073dc058a23264b -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index 4a63514..6e4458d 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -5,11 +5,6 @@
       "version-semver": "3.19.3",
       "port-version": 0
     },
-    {
-      "git-tree": "6b0b1a514bc9662ac0b3f4d4e901a3b0422bd5bd",
-      "version-semver": "3.19.1",
-      "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

@LilyWangLL LilyWangLL added the depends:upstream-changes Waiting on a change to the upstream project label Jan 19, 2022
@LilyWangLL
Copy link
Contributor Author

Now brpc build failed with the latest version of protobuf, the upstream PR apache/brpc#1657 will fix it. Waiting upstream PR merged, I will sync the new change of brpc to VCPKG.

@LilyWangLL LilyWangLL changed the title [protobuf] Update to version 3.19.1 [protobuf] Update to version 3.19.3 Jan 19, 2022
@LilyWangLL LilyWangLL added depends:different-pr This PR or Issue depends on a PR which has been filed and removed depends:upstream-changes Waiting on a change to the upstream project labels Jan 21, 2022
@LilyWangLL
Copy link
Contributor Author

brpc build error fix in PR #22685.

@LilyWangLL LilyWangLL removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Jan 28, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 07e508359ca5488456988191d8709722484daccd -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index 4a63514..6e4458d 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -5,11 +5,6 @@
       "version-semver": "3.19.3",
       "port-version": 0
     },
-    {
-      "git-tree": "6b0b1a514bc9662ac0b3f4d4e901a3b0422bd5bd",
-      "version-semver": "3.19.1",
-      "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
  • ports/protozero/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 07e508359ca5488456988191d8709722484daccd -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index 4a63514..94295b7 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,15 +1,10 @@
 {
   "versions": [
     {
-      "git-tree": "d63921f9d99e0438f22c57c7daf095fd46df8c83",
+      "git-tree": "e6c7ad5d87cb46141707d9f4d09292ebb07e60df",
       "version-semver": "3.19.3",
       "port-version": 0
     },
-    {
-      "git-tree": "6b0b1a514bc9662ac0b3f4d4e901a3b0422bd5bd",
-      "version-semver": "3.19.1",
-      "port-version": 0
-    },
     {
       "git-tree": "5f6aa04d94e184b89c1887946fb4684bc51c4611",
       "version-semver": "3.18.0",
diff --git a/versions/p-/protozero.json b/versions/p-/protozero.json
index 9d48e71..bd82dac 100644
--- a/versions/p-/protozero.json
+++ b/versions/p-/protozero.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "b0d0b654e784dc81643bb1bb25edbbfd09ca5ffb",
+      "git-tree": "50ca21eda1bfb2821729951826fb42ce7ba28c8c",
       "version-semver": "1.7.0",
       "port-version": 1
     },

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

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 07e508359ca5488456988191d8709722484daccd -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index 3693526..94295b7 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -5,11 +5,6 @@
       "version-semver": "3.19.3",
       "port-version": 0
     },
-    {
-      "git-tree": "6b0b1a514bc9662ac0b3f4d4e901a3b0422bd5bd",
-      "version-semver": "3.19.1",
-      "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

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@LilyWangLL
Copy link
Contributor Author

Closing this PR since my fork is broken, I will fix this issue in another PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[protobuf] update to 3.19.1
2 participants