[gentoo-commits] proj/kde:master commit in: kde-misc/basket/, kde-misc/basket/files/

[Andreas Sturmlechner]

commit:     764400c6e7668baba409c5862f88b7157fa3efc3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 18:04:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 11 22:33:40 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=764400c6

kde-misc/basket: Drop obsolete patch

Upstream commit 090ac46912025f94aca710355e51a8154df36a56

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-misc/basket/basket-9999.ebuild                 |  6 +---
 .../files/basket-2.49b-libgit2-0.99-compat.patch   | 32 ----------------------
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/kde-misc/basket/basket-9999.ebuild 
b/kde-misc/basket/basket-9999.ebuild
index 0a5c8dfa20..0036ef6b46 100644
--- a/kde-misc/basket/basket-9999.ebuild
+++ b/kde-misc/basket/basket-9999.ebuild
@@ -60,11 +60,7 @@ DEPEND="${RDEPEND}
        >=dev-qt/qtconcurrent-${QTMIN}:5
 "
 
-PATCHES=(
-       # TODO: upstream
-       "${FILESDIR}/${PN}-2.49b-xdg_mime_install_dir.patch"
-       "${FILESDIR}/${PN}-2.49b-libgit2-0.99-compat.patch" # bug #710832
-)
+PATCHES=( "${FILESDIR}/${PN}-2.49b-xdg_mime_install_dir.patch" ) # TODO: 
upstream
 
 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
deleted file mode 100644
index 94793a090f..0000000000
--- a/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 094580f207b5ba9f44e9af00834f9c93f06fb440 Mon Sep 17 00:00:00 2001
-From: Dan Goodliffe <d...@randomdan.homeip.net>
-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();