commit: 34f8f2b233bcf437aa08a2d48838645b50e77d16 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Mar 1 22:01:05 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Mar 1 22:02:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f8f2b2
kde-misc/basket: Fix build against >=dev-libs/libgit2-0.99 Thanks-to: Dan Goodliffe <gentoo <AT> randomdan.homeip.net> Closes: https://bugs.gentoo.org/710832 Package-Manager: Portage-2.3.90, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-misc/basket/basket-2.49b.ebuild | 5 +++- .../files/basket-2.49b-libgit2-0.99-compat.patch | 32 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/kde-misc/basket/basket-2.49b.ebuild b/kde-misc/basket/basket-2.49b.ebuild index 6a9fcbf3e6a..bbcfe4d1009 100644 --- a/kde-misc/basket/basket-2.49b.ebuild +++ b/kde-misc/basket/basket-2.49b.ebuild @@ -57,7 +57,10 @@ DEPEND="${RDEPEND} >=dev-qt/qtconcurrent-${QTMIN}:5 " -PATCHES=( "${FILESDIR}/${P}-xdg_mime_install_dir.patch" ) +PATCHES=( + "${FILESDIR}/${P}-xdg_mime_install_dir.patch" + "${FILESDIR}/${P}-libgit2-0.99-compat.patch" # bug #710832 +) src_prepare() { ecm_src_prepare diff --git a/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch b/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch new file mode 100644 index 00000000000..94793a090f1 --- /dev/null +++ b/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch @@ -0,0 +1,32 @@ +From 094580f207b5ba9f44e9af00834f9c93f06fb440 Mon Sep 17 00:00:00 2001 +From: Dan Goodliffe <[email protected]> +Date: Thu, 27 Feb 2020 18:04:21 +0000 +Subject: [PATCH] Use LIBGIT2_VER_MINOR for version test + +Addresses compatibility with libgit2-0.99 +--- + 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 +--- a/src/application.cpp ++++ b/src/application.cpp +@@ -56,7 +56,7 @@ Application::Application(int &argc, char **argv) + + + #ifdef WITH_LIBGIT2 +- #if LIBGIT2_SOVERSION >= 22 ++ #if LIBGIT2_VER_MINOR >= 22 + git_libgit2_init(); + #else + git_threads_init(); +@@ -67,7 +67,7 @@ Application::Application(int &argc, char **argv) + Application::~Application() + { + #ifdef WITH_LIBGIT2 +- #if LIBGIT2_SOVERSION >= 22 ++ #if LIBGIT2_VER_MINOR >= 22 + git_libgit2_shutdown(); + #else + git_threads_shutdown();
