diff options
| -rw-r--r-- | kde-misc/basket/basket-9999.ebuild | 6 | ||||
| -rw-r--r-- | kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch | 32 |
2 files changed, 1 insertions, 37 deletions
diff --git a/kde-misc/basket/basket-9999.ebuild b/kde-misc/basket/basket-9999.ebuild index 0a5c8dfa200..0036ef6b463 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 94793a090f1..00000000000 --- 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 <dan@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(); |