From 55a39538d167c909ccd4365360ccf9bf1d88653f Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 29 May 2022 18:22:45 -0500
Subject: user/libgit2: Fix tests properly

The 'offline' suite was failing the revparse test due to an unexpected
passage of time.  (Upstream's words, not mine.)  Backport the fix for
this test from v1.4 to our release.

Fixes: #686
---
 user/libgit2/APKBUILD | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'user/libgit2/APKBUILD')

diff --git a/user/libgit2/APKBUILD b/user/libgit2/APKBUILD
index 0f1a6839d..68cee89a0 100644
--- a/user/libgit2/APKBUILD
+++ b/user/libgit2/APKBUILD
@@ -13,7 +13,9 @@ depends=""
 depends_dev="curl-dev libssh2-dev"
 makedepends="$depends_dev cmake http-parser-dev openssl-dev python3 zlib-dev"
 subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
+	test-fix.patch
+	"
 
 # secfixes:
 #   0.27.3-r0:
@@ -32,17 +34,19 @@ build() {
 	cmake \
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_C_FLAGS="$CFLAGS" .
+		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
+		.
 	make
 }
 
 check() {
 	# Don't run online tests by default.
-	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'o.*line'
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'online'
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="abfea885f46444b0304ae57c32c06f4252afb0093c924da5e1ba10aaed952824d1b84036adb79b5b8ad8bea56a6331a51c62f3b9839aead16c7b26cb4554b53a  libgit2-0.28.5.tar.gz"
+sha512sums="abfea885f46444b0304ae57c32c06f4252afb0093c924da5e1ba10aaed952824d1b84036adb79b5b8ad8bea56a6331a51c62f3b9839aead16c7b26cb4554b53a  libgit2-0.28.5.tar.gz
+0df17aeec1445cd88a4dc361e6f2c9451e1b547bc6d1d932a245382184a466422bb66be9e1bfc1aab9370de43b2f0c33a102bab710ba8e0fdb7fc8e8bd875546  test-fix.patch"
-- 
cgit v1.2.3-60-g2f50