gittyup: Fix build with GCC 14

GCC 14 turns transposed arguments to `calloc()` into an error.  The
affected file has been fixed upstream; patch it here to make things
work until the next release of `gittyup`.
This commit is contained in:
Philipp Joram
2025-01-09 11:35:55 +02:00
parent ddccad3800
commit e0298518cf
2 changed files with 31 additions and 0 deletions
@@ -0,0 +1,25 @@
From 687b5424128fd637555be4a0d18c72c4e870bd6f Mon Sep 17 00:00:00 2001
From: Alfie <30699769+AHSauge@users.noreply.github.com>
Date: Sat, 11 May 2024 13:11:08 +0200
Subject: [PATCH] Fix incorrect order of argument to calloc (#345)
---
src/zip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/zip.c b/src/zip.c
index b14f9e3..a7e5ef8 100644
--- a/test/dep/zip/src/zip.c
+++ b/test/dep/zip/src/zip.c
@@ -1874,7 +1874,7 @@ ssize_t zip_stream_copy(struct zip_t *zip, void **buf, size_t *bufsize) {
*bufsize = n;
}
- *buf = calloc(sizeof(unsigned char), n);
+ *buf = calloc(n, sizeof(unsigned char));
memcpy(*buf, zip->archive.m_pState->m_pMem, n);
return (ssize_t)n;
--
2.47.0
@@ -29,6 +29,12 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
# Fix GCC 14 build error (remove for next update)
# https://github.com/Murmele/Gittyup/pull/759
./0001-Fix-incorrect-order-of-argument-to-calloc-345.patch
];
cmakeFlags =
let
inherit (lib) cmakeBool;