[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgit2/files/, dev-libs/libgit2/

[Michał Górny]

commit:     62b8f6febfd78798a960c68a2173c0fba893f0f4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 05:29:49 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 28 05:36:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62b8f6fe

dev-libs/libgit2: Fix test regression due to time passing

Closes: https://bugs.gentoo.org/847835
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/libgit2/files/libgit2-1.4.3-test.patch | 30 +++++++++++++++++++++++++
 dev-libs/libgit2/libgit2-1.4.3.ebuild           |  4 ++++
 2 files changed, 34 insertions(+)

diff --git a/dev-libs/libgit2/files/libgit2-1.4.3-test.patch b/dev-libs/libgit2/files/libgit2-1.4.3-test.patch
new file mode 100644
index 000000000000..23349e6307ef
--- /dev/null
+++ b/dev-libs/libgit2/files/libgit2-1.4.3-test.patch
@@ -0,0 +1,30 @@
+From c013fca6b091e36805659ebb26ccaaffae8806dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <carlosmn@××××××.com>
+Date: Tue, 3 May 2022 09:28:43 +0200
+Subject: [PATCH] revparse: adjust reflog test as we move away from the dates
+
+The dates we use in `refs::revparse::date` has just passed the ten years, so
+now everything is beyond ten years, leading to an unexpected commit being
+returned.
+
+Adjust it to 11 years so it all looks fine again.
+---
+ tests/refs/revparse.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/refs/revparse.c b/tests/refs/revparse.c
+index 0bd2ae5bc..93d7ce6db 100644
+--- a/tests/refs/revparse.c
++++ b/tests/refs/revparse.c
+@@ -399,7 +399,7 @@ void test_refs_revparse__date(void)
+ 	 * a65fedf HEAD@{1335806603 -0900}: commit:
+ 	 * be3563a HEAD@{1335806563 -0700}: clone: from /Users/ben/src/libgit2/tests/resour
+ 	 */
+-	test_object("HEAD@{10 years ago}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
++	test_object("HEAD@{11 years ago}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
+ 
+ 	test_object("HEAD@{1 second}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
+ 	test_object("HEAD@{1 second ago}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
+-- 
+2.35.1
+

diff --git a/dev-libs/libgit2/libgit2-1.4.3.ebuild b/dev-libs/libgit2/libgit2-1.4.3.ebuild
index bc04415f6bc1..15e6de4156f8 100644
--- a/dev-libs/libgit2/libgit2-1.4.3.ebuild
+++ b/dev-libs/libgit2/libgit2-1.4.3.ebuild
@@ -35,6 +35,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 	# relying on forked http-parser to support some obscure URI form