diff options
Diffstat (limited to 'community/guile-git/0001-Improve-compatibility-with-libgit2.patch')
| -rw-r--r-- | community/guile-git/0001-Improve-compatibility-with-libgit2.patch | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/community/guile-git/0001-Improve-compatibility-with-libgit2.patch b/community/guile-git/0001-Improve-compatibility-with-libgit2.patch index 61affe8dc5b..e2be857e855 100644 --- a/community/guile-git/0001-Improve-compatibility-with-libgit2.patch +++ b/community/guile-git/0001-Improve-compatibility-with-libgit2.patch @@ -1,6 +1,6 @@ -From e26c4d29ca2b62a31706ef9c00fcab018a9cd905 Mon Sep 17 00:00:00 2001 +From 9a098922c430024ce552d8c3844aada4058e4812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> -Date: Fri, 4 Aug 2023 08:29:09 +0200 +Date: Wed, 27 Dec 2023 07:41:53 +0100 Subject: [PATCH] Improve compatibility with libgit2 This fixes various struct layout mismatches with libgit 1.7.0. These @@ -8,11 +8,11 @@ mismatches actually results in test failures on *some* architectures. See also: https://gitlab.com/guile-git/guile-git/-/merge_requests/32 --- - git/structs.scm | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) + git/structs.scm | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/git/structs.scm b/git/structs.scm -index ca51728..2c5282c 100644 +index ca51728..181e77a 100644 --- a/git/structs.scm +++ b/git/structs.scm @@ -135,7 +135,8 @@ @@ -62,3 +62,11 @@ index ca51728..2c5282c 100644 (custom-headers ,%strarray)))) (define-record-type <fetch-options> +@@ -1002,6 +1008,7 @@ indexer progress record. PROC can cancel the on-going transfer by returning + (payload ,(bs:pointer void)) + (context-lines ,uint32) + (interhunk-lines ,uint32) ++ (oid-type ,int) + (id-abbrev ,uint16) + (max-size ,int64) ;git_off_t + (old-prefix ,(bs:pointer uint8)) ;char* |