mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-17 02:38:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9911cb74a1
vcpkg/ports/curl/0012-fix-dependency-idn2.patch

22 lines
655 B
Diff
Raw Normal View History

[curl] Add feature idn2 (#14807) Thanks for fixing phantom dependencies!
2020-12-23 15:19:50 +08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
[curl] update to 8.5.0 (#35806)
2024-01-03 06:32:00 +08:00
index a54c2ff..3b83a7f 100644
[curl] Add feature idn2 (#14807) Thanks for fixing phantom dependencies!
2020-12-23 15:19:50 +08:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
[curl] add psl feature (#38345) <!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> <!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. --> - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. <!-- If this PR adds a new port, please uncomment and fill out this checklist: - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines. - [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html). - [ ] The versioning scheme in `vcpkg.json` matches what upstream says. - [ ] The license declaration in `vcpkg.json` matches what upstream says. - [ ] The installed as the "copyright" file matches what upstream says. - [ ] The source code of the component installed comes from an authoritative source. - [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [ ] Only one version is in the new port's versions file. - [ ] Only one version is added to each modified port's versions file. END OF NEW PORT CHECKLIST (delete this line) -->
2024-04-24 22:57:12 +08:00
@@ -852,11 +852,11 @@ endif()
[curl] Update to 7.84.0 (#25515) * Update to 7.84.0 * Update versions * Ignore libpsl system lib * ENABLE_DEBUG only affects debug build * Remove obsolete variables * Update versions * Remove obsolete CURL_STATICLIB variable * Drop obsolete Perl option * Update versions
2022-07-06 05:57:47 +08:00
# Check for idn2
[curl] Update (#18971) * Modernize portfile * Don't export implicit link libraries * Revise osx framework handling * Fix exported per-config location of dependencies * Move curl-config to tools, incl. debug variant * Update to 7.77.0 * Add WinIDN support and default IDN selection * Use pkgconfig for libidn2 configuration * Update to 0.78.0 * Remove obsolete nghttp2 staticlib patch * Fix libs duplication in pc file * Resolve transitive deps for pc file/curl-config * x-add-version * Fix winssl dependencies * Add winldap feature, not default * Update git-tree Co-authored-by: past-due <30942300+past-due@users.noreply.github.com>
2021-08-12 10:38:08 +08:00
option(USE_LIBIDN2 "Use libidn2 for IDN support" ON)
if(USE_LIBIDN2)
[curl] update to 8.5.0 (#35806)
2024-01-03 06:32:00 +08:00
- check_library_exists("idn2" "idn2_lookup_ul" "" HAVE_LIBIDN2)
- if(HAVE_LIBIDN2)
- set(CURL_LIBS "idn2;${CURL_LIBS}")
- check_include_file_concat("idn2.h" HAVE_IDN2_H)
- endif()
[curl] add psl feature (#38345) <!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> <!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. --> - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. <!-- If this PR adds a new port, please uncomment and fill out this checklist: - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines. - [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html). - [ ] The versioning scheme in `vcpkg.json` matches what upstream says. - [ ] The license declaration in `vcpkg.json` matches what upstream says. - [ ] The installed as the "copyright" file matches what upstream says. - [ ] The source code of the component installed comes from an authoritative source. - [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [ ] Only one version is in the new port's versions file. - [ ] Only one version is added to each modified port's versions file. END OF NEW PORT CHECKLIST (delete this line) -->
2024-04-24 22:57:12 +08:00
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(LIBIDN2 REQUIRED libidn2)
[curl] Update (#18971) * Modernize portfile * Don't export implicit link libraries * Revise osx framework handling * Fix exported per-config location of dependencies * Move curl-config to tools, incl. debug variant * Update to 7.77.0 * Add WinIDN support and default IDN selection * Use pkgconfig for libidn2 configuration * Update to 0.78.0 * Remove obsolete nghttp2 staticlib patch * Fix libs duplication in pc file * Resolve transitive deps for pc file/curl-config * x-add-version * Fix winssl dependencies * Add winldap feature, not default * Update git-tree Co-authored-by: past-due <30942300+past-due@users.noreply.github.com>
2021-08-12 10:38:08 +08:00
+ set(HAVE_LIBIDN2 TRUE)
[curl] Update to 7.81.0 (#22445) * Update to 7.81.0 * Revise curl wrapper, fix `COMPONENTS` * Update versions * Add fix for multi-ssl config * [skip actions] CI feature test * Refactor lib export fixup Handle Debug/Release/IMPORTED_*... * Fix libssh2 lookup * Fix libidn2.pc for windows * Fix libidn2 import * Fix mbedtls import * Simplify options * [skip actions] CI feature test * Revert CI feature test configuration * Update versions * Limit import lib fixup to WIN32 * Update versions
2022-01-20 01:15:16 +08:00
+ list(INSERT CURL_LIBS 0 ${LIBIDN2_LINK_LIBRARIES})
[curl] fix idn2 dependency (#38160) <!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> <!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. --> - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. When you install curl[tool,idn2] with vcpkg, and the you do: ``` curl --version ``` You can see the lib that it install with, and even you install the feature idn2, it missing. I fix it. It should look similar to that: ``` curl 8.7.0-DEV (Linux) libcurl/8.7.0-DEV ... libidn2/2.3.4 ... ```
2024-04-16 01:43:14 +08:00
+ set(HAVE_IDN2_H TRUE)
[curl] Update to 7.84.0 (#25515) * Update to 7.84.0 * Update versions * Ignore libpsl system lib * ENABLE_DEBUG only affects debug build * Remove obsolete variables * Update versions * Remove obsolete CURL_STATICLIB variable * Drop obsolete Perl option * Update versions
2022-07-06 05:57:47 +08:00
else()
set(HAVE_LIBIDN2 OFF)
[curl] Add feature idn2 (#14807) Thanks for fixing phantom dependencies!
2020-12-23 15:19:50 +08:00
endif()
Reference in New Issue Copy Permalink