diff --git a/dev-libs/libgit2/libgit2-1.5.0.recipe b/dev-libs/libgit2/libgit2-1.5.0.recipe index 8937ef5ca..052ce4aef 100644 --- a/dev-libs/libgit2/libgit2-1.5.0.recipe +++ b/dev-libs/libgit2/libgit2-1.5.0.recipe @@ -15,10 +15,11 @@ DESCRIPTION="The library provides: HOMEPAGE="https://libgit2.github.com/" COPYRIGHT="2005-2022 libgit2 project" LICENSE="GNU LGPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/libgit2/libgit2/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e" SOURCE_FILENAME="libgit2-$portVersion.tar.gz" +PATCHES="libgit2-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -71,7 +72,7 @@ REQUIRES_tools=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libcrypto$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix >= 3 devel:libcurl$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libpcre$secondaryArchSuffix @@ -91,7 +92,6 @@ BUILD_PREREQUIRES=" defineDebugInfoPackage libgit2$secondaryArchSuffix \ "$libDir"/libgit2.so.$libVersion - BUILD() { cmake -Bbuild -S. \ @@ -110,7 +110,8 @@ INSTALL() { make -C build install - prepareInstalledDevelLib libgit2 + prepareInstalledDevelLib \ + libgit2 fixPkgconfig packageEntries devel \ diff --git a/dev-libs/libgit2/patches/libgit2-1.5.0.patchset b/dev-libs/libgit2/patches/libgit2-1.5.0.patchset new file mode 100644 index 000000000..aa6cca4bc --- /dev/null +++ b/dev-libs/libgit2/patches/libgit2-1.5.0.patchset @@ -0,0 +1,22 @@ +From ff88baec5a92771eff80644cd2d46c5264d77218 Mon Sep 17 00:00:00 2001 +From: Schrijvers Luc +Date: Fri, 30 Aug 2024 21:26:31 +0200 +Subject: Haiku doesn't have GIT_RAND_GETENTROPY + + +diff --git a/src/util/rand.c b/src/util/rand.c +index d28e4aa..db343af 100644 +--- a/src/util/rand.c ++++ b/src/util/rand.c +@@ -10,7 +10,7 @@ See . */ + #include "rand.h" + #include "runtime.h" + +-#if defined(GIT_RAND_GETENTROPY) ++#if defined(GIT_RAND_GETENTROPY) && !defined(__HAIKU__) + # include + #endif + +-- +2.45.2 +