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

[libgit2] Update version to 1.9.0 #43306

Merged
merged 4 commits into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 10 additions & 23 deletions ports/libgit2/c-standard.diff
Original file line number Diff line number Diff line change
@@ -1,26 +1,13 @@
diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt
index c2a97e1..8c5b2ea 100644
index a7d3c7c..2a7f111 100644
--- a/src/libgit2/CMakeLists.txt
+++ b/src/libgit2/CMakeLists.txt
@@ -2,7 +2,7 @@
# git library functionality.

add_library(libgit2 OBJECT)
-set_target_properties(libgit2 PROPERTIES C_STANDARD 90)
+set_target_properties(libgit2 PROPERTIES C_STANDARD 99)
set_target_properties(libgit2 PROPERTIES C_EXTENSIONS OFF)

include(PkgBuildConfig)
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index ee35eb9..158fac2 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,7 +1,7 @@
# util: a shared library for common utility functions for libgit2 projects

add_library(util OBJECT)
-set_target_properties(util PROPERTIES C_STANDARD 90)
+set_target_properties(util PROPERTIES C_STANDARD 99)
set_target_properties(util PROPERTIES C_EXTENSIONS OFF)

configure_file(git2_features.h.in git2_features.h)
@@ -60,7 +60,7 @@ target_link_libraries(libgit2package ${LIBGIT2_SYSTEM_LIBS})
target_include_directories(libgit2package SYSTEM PRIVATE ${LIBGIT2_INCLUDES})
target_include_directories(libgit2package INTERFACE $<INSTALL_INTERFACE:./include/git2>)

-set_target_properties(libgit2package PROPERTIES C_STANDARD 90)
+set_target_properties(libgit2package PROPERTIES C_STANDARD 99)
set_target_properties(libgit2package PROPERTIES C_EXTENSIONS OFF)
set_target_properties(libgit2package PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
set_target_properties(libgit2package PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
17 changes: 0 additions & 17 deletions ports/libgit2/fix-arm64-windows.patch

This file was deleted.

13 changes: 3 additions & 10 deletions ports/libgit2/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libgit2/libgit2
REF v1.8.0
SHA512 e5634267bd9c6a594c9a954d09c657e7b8aadf213609bf7dd83b99863d0d0c7109a5277617dd508abc2da54ea3f12c2af1908d1aeb73c000e94056e2f3653144
REF "v${VERSION}"
SHA512 38547ace676b933a3146c2a00405fc6815063a7af923b9f2c09c536ec717be77d19c513b383939054913ce617d7917c100a5cbd3378d101fcdb5eacd1d14f687
HEAD_REF main
PATCHES
c-standard.diff # for 'inline' in system headers
cli-include-dirs.diff
dependencies.diff
mingw-winhttp.diff
unofficial-config-export.diff
fix-arm64-windows.patch
)
file(REMOVE_RECURSE
"${SOURCE_PATH}/cmake/FindPCRE.cmake"
Expand Down Expand Up @@ -95,19 +93,14 @@ vcpkg_cmake_configure(

vcpkg_cmake_install()
vcpkg_fixup_pkgconfig()

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-git2-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-git2")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-libgit2-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-libgit2")
vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libgit2 CONFIG_PATH share/unofficial-libgit2)
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")

if("tools" IN_LIST FEATURES)
vcpkg_copy_tools(TOOL_NAMES git2 AUTO_CLEAN)
endif()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

set(file_list "${SOURCE_PATH}/COPYING")
if(NOT VCPKG_TARGET_IS_WINDOWS)
file(WRITE "${CURRENT_BUILDTREES_DIR}/Notice for ntlmclient" [[
Expand Down
21 changes: 0 additions & 21 deletions ports/libgit2/unofficial-config-export.diff

This file was deleted.

6 changes: 0 additions & 6 deletions ports/libgit2/unofficial-git2-config.cmake

This file was deleted.

3 changes: 0 additions & 3 deletions ports/libgit2/unofficial-libgit2-config.cmake

This file was deleted.

11 changes: 0 additions & 11 deletions ports/libgit2/usage

This file was deleted.

3 changes: 1 addition & 2 deletions ports/libgit2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "libgit2",
"version-semver": "1.8.0",
"port-version": 1,
"version-semver": "1.9.0",
"description": "A C library implementing the Git core methods with a solid API",
"homepage": "https://github.com/libgit2/libgit2",
"license": null,
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4593,8 +4593,8 @@
"port-version": 0
},
"libgit2": {
"baseline": "1.8.0",
"port-version": 1
"baseline": "1.9.0",
"port-version": 0
},
"libgme": {
"baseline": "0.6.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libgit2.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "102403456a0c59d10e9949dc2513b9176d6f02d2",
"version-semver": "1.9.0",
"port-version": 0
},
{
"git-tree": "2584fc140e3c1406fe30f6ad62973df7cc8c573c",
"version-semver": "1.8.0",
Expand Down