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

[sqlcipher] update to 4.5.2 #26262

Merged
merged 3 commits into from
Aug 10, 2022
Merged

Conversation

MSP-Greg
Copy link
Contributor

@MSP-Greg MSP-Greg commented Aug 9, 2022

Describe the pull request

  • What does your PR fix?

    Fixes / Updates sqlcipher to 4.5.2

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    no change

  • 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

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

@ghost
Copy link

ghost commented Aug 9, 2022

CLA assistant check
All CLA requirements met.

github-actions[bot]
github-actions bot previously approved these changes Aug 10, 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.

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/sqlcipher/portfile.cmake

You have modified or added at least one vcpkg.json where you should check the license field.

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

  • ports/sqlcipher/vcpkg.json

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

@Adela0814 Adela0814 added category:port-update The issue is with a library, which is requesting update new revision requires:author-response labels Aug 10, 2022
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT} TARGET_PATH share/${PORT})
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME ${PORT} CONFIG_PATH share/${PORT})

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you please add quotes around each path that starts with ${CURRENT_PACKAGES_DIR} or ${SOURCE_PATH}?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@BillyONeal BillyONeal dismissed Adela0814’s stale review August 10, 2022 18:32

The requested changes were done.

@BillyONeal BillyONeal merged commit e96c957 into microsoft:master Aug 10, 2022
@MSP-Greg MSP-Greg deleted the 00-sqlcipher-4.5.2 branch August 10, 2022 22:08
diegovelaz added a commit to diegovelaz/vcpkg that referenced this pull request Aug 10, 2022
Format and add version.

Update CI baseline.

Update port version.

[vcpkg] Fix cross compiling macOS (microsoft#26240)

This follows the pattern in the Windows toolchain with respect to
setting VCPKG_CMAKE_SYSTEM_VERSION and also how arm64 macOS can execute
x86_64 through Rosetta.

[buck-yeh-bux] fix clang-cl builds (microsoft#26248)

* [buck-yeh-bux] fix clang-cl

* v db

[cppcms] Fix narrowing for clang-cl builds (microsoft#26251)

* [cppcms] fix narrowing error with clang-cl

* v db

[crc32c] Clang-cl fix  (microsoft#26253)

* [crc32c] fix clang-cl builds.

* v db

[json-c] clang-cl fix. (microsoft#26254)

* [json-c] fix clang-cl builds

* v db

[cpr] disable werror (microsoft#26252)

* [cpr] disable werror

* v db

[sqlcipher] update to 4.5.2 (microsoft#26262)

* [sqlcipher] update to 4.5.2

* requested changes

* portfile.cmake - quote paths

[osgearth] Fix naming of target and exported variables (microsoft#26258)

* [osgearth] Fix target name and match exported variables

* Fix version SHA

Add port version to baseline.

Add x64-linux build expected to fail.

Add port 0 version.

Update version database

Specify supported CI so it only build dynamic.

Update SHA.
@Adela0814 Adela0814 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Aug 11, 2022
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:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants