gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

kde-misc/basket: Fix build with >=dev-libs/libgit2-1.0.0-r1

Browse Source 
(Merged) upstream commits:
090ac46912025f94aca710355e51a8154df36a56
9a02338bfa60336b7349ff8ac1f85793515ff0e3

Reported-by: Dan Goodliffe <gentoo@randomdan.homeip.net>
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2020-04-10 16:00:18 +02:00
parent 3dc82838fd
commit 0c88696b35
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch
View File

@@ -1,15 +1,29 @@
From 094580f207b5ba9f44e9af00834f9c93f06fb440 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 27 Feb 2020 18:04:21 +0000
Subject: [PATCH] Use LIBGIT2_VER_MINOR for version test
From 090ac46912025f94aca710355e51a8154df36a56 Mon Sep 17 00:00:00 2001
From: Niccol Venerandi <niccolo@venerandi.com>
Date: Wed, 11 Mar 2020 18:46:07 +0100
Subject: [PATCH 1/2] Added support for libgit>=.99
Addresses compatibility with libgit2-0.99
Summary: LIBGIT2_SOVERSION no longer returns an integer in libgit>=.99; this adds support for that version and 1.0 to come.
Differential Revision: https://phabricator.kde.org/D27990
From 9a02338bfa60336b7349ff8ac1f85793515ff0e3 Mon Sep 17 00:00:00 2001
From: Niccol Venerandi <niccolo@venerandi.com>
Date: Thu, 12 Mar 2020 10:53:05 +0100
Subject: [PATCH 2/2] LIBGIT_VER_MINOR is supposed to be LIBGIT2_VER_MINOR
Reviewers: ognarb
Reviewed By: ognarb
Differential Revision: https://phabricator.kde.org/D28001
---
src/application.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/application.cpp b/src/application.cpp
index c52fb574..81fcd121 100644
index c52fb57..b673848 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -56,7 +56,7 @@ Application::Application(int &argc, char **argv)
@@ -17,7 +31,7 @@ index c52fb574..81fcd121 100644
#ifdef WITH_LIBGIT2
- #if LIBGIT2_SOVERSION >= 22
+ #if LIBGIT2_VER_MINOR >= 22
+ #if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 22)
git_libgit2_init();
#else
git_threads_init();
@@ -26,7 +40,9 @@ index c52fb574..81fcd121 100644
{
#ifdef WITH_LIBGIT2
- #if LIBGIT2_SOVERSION >= 22
+ #if LIBGIT2_VER_MINOR >= 22
+ #if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 22)
git_libgit2_shutdown();
#else
git_threads_shutdown();
--
2.26.0