[libgit2] Update to 1.8.0 (#38169)

- [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.

---------

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
This commit is contained in:
Raziel Anarki 2024-04-30 02:20:16 +02:00 committed by GitHub
parent 142fa5b08b
commit c561d1ec13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 31 additions and 19 deletions

View File

@ -24,18 +24,20 @@ index 2a3a91b..523fa72 100644
list(APPEND LIBGIT2_SYSTEM_LIBS ${PCRE_LIBRARIES})
list(APPEND LIBGIT2_PC_REQUIRES "libpcre")
diff --git a/cmake/SelectSSH.cmake b/cmake/SelectSSH.cmake
index 23dfc97..f481527 100644
index 079857f50..a2e2bd212 100644
--- a/cmake/SelectSSH.cmake
+++ b/cmake/SelectSSH.cmake
@@ -1,6 +1,10 @@
# Optional external dependency: libssh2
if(USE_SSH)
@@ -4,7 +4,11 @@ if(USE_SSH STREQUAL "exec")
add_feature_info(SSH ON "using OpenSSH exec support")
elseif(USE_SSH STREQUAL ON OR USE_SSH STREQUAL "libssh2")
- find_pkglibraries(LIBSSH2 libssh2)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(LIBSSH2 REQUIRED libssh2)
+ set(LIBSSH2_LIBRARIES "${LIBSSH2_LINK_LIBRARIES}")
+ set(LIBSSH2_LDFLAGS "")
+ list(APPEND LIBGIT2_PC_REQUIRES "libssh2")
if(NOT LIBSSH2_FOUND)
find_package(LibSSH2)
set(LIBSSH2_INCLUDE_DIRS ${LIBSSH2_INCLUDE_DIR})

View File

@ -1,8 +1,8 @@
diff --git a/cmake/SelectWinHTTP.cmake b/cmake/SelectWinHTTP.cmake
index 96e0bdb..31c3a56 100644
--- a/cmake/SelectWinHTTP.cmake
+++ b/cmake/SelectWinHTTP.cmake
@@ -3,7 +3,7 @@ if(WIN32 AND USE_WINHTTP)
diff --git a/cmake/SelectHTTPSBackend.cmake b/cmake/SelectHTTPSBackend.cmake
index d293001f5..108b8767c 100644
--- a/cmake/SelectHTTPSBackend.cmake
+++ b/cmake/SelectHTTPSBackend.cmake
@@ -120,7 +120,7 @@ if(USE_HTTPS)
# Since MinGW does not come with headers or an import library for winhttp,
# we have to include a private header and generate our own import library

View File

@ -1,9 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libgit2/libgit2
REF v1.6.4
SHA512 fd73df91710f19b0d6c3765c37c7f529233196da91cf4d58028a8d3840244f11df44abafabd74a8ed1cbe4826d1afd6ff9f01316d183ace0924c65e7cf0eb8d5
HEAD_REF maint/v1.6
REF v1.8.0
SHA512 e5634267bd9c6a594c9a954d09c657e7b8aadf213609bf7dd83b99863d0d0c7109a5277617dd508abc2da54ea3f12c2af1908d1aeb73c000e94056e2f3653144
HEAD_REF main
PATCHES
c-standard.diff # for 'inline' in system headers
cli-include-dirs.diff
@ -25,6 +25,7 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
set(REGEX_BACKEND OFF)
set(USE_HTTPS OFF)
set(USE_SSH OFF)
function(set_regex_backend VALUE)
if(REGEX_BACKEND)
@ -53,6 +54,11 @@ foreach(GIT2_FEATURE ${FEATURES})
set_tls_backend("SecureTransport")
elseif(GIT2_FEATURE STREQUAL "mbedtls")
set_tls_backend("mbedTLS")
elseif(GIT2_FEATURE STREQUAL "ssh")
set(USE_SSH ON)
message(STATUS "This version of `libgit2` uses the default (`libssh2`) backend. To use the newer backend which utilizes the `ssh` CLI from a local install of OpenSSH instead, create an overlay port of this with USE_SSH set to 'exec' and the `libssh2` dependency removed.")
message(STATUS "This recipe is at ${CMAKE_CURRENT_LIST_DIR}")
message(STATUS "See the overlay ports documentation at https://learn.microsoft.com/vcpkg/concepts/overlay-ports")
endif()
endforeach()
@ -64,8 +70,7 @@ vcpkg_find_acquire_program(PKGCONFIG)
vcpkg_check_features(
OUT_FEATURE_OPTIONS GIT2_FEATURES
FEATURES
ssh USE_SSH
FEATURES
tools BUILD_CLI
)
@ -76,6 +81,7 @@ vcpkg_cmake_configure(
-DUSE_HTTP_PARSER=system
-DUSE_HTTPS=${USE_HTTPS}
-DREGEX_BACKEND=${REGEX_BACKEND}
-DUSE_SSH=${USE_SSH}
-DSTATIC_CRT=${STATIC_CRT}
"-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
-DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI:BOOL=ON

View File

@ -1,7 +1,6 @@
{
"name": "libgit2",
"version-semver": "1.6.4",
"port-version": 1,
"version-semver": "1.8.0",
"description": "A C library implementing the Git core methods with a solid API",
"homepage": "https://github.com/libgit2/libgit2",
"license": null,

View File

@ -4433,8 +4433,8 @@
"port-version": 0
},
"libgit2": {
"baseline": "1.6.4",
"port-version": 1
"baseline": "1.8.0",
"port-version": 0
},
"libgme": {
"baseline": "0.6.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "83d6bb1f73f67956eebce5f63e024790b12c0f39",
"version-semver": "1.8.0",
"port-version": 0
},
{
"git-tree": "7a3e64338633f5a89dca3586094f3f156f5a0a42",
"version-semver": "1.6.4",