| 1 |
commit: 764400c6e7668baba409c5862f88b7157fa3efc3 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 11 18:04:51 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 11 22:33:40 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=764400c6 |
| 7 |
|
| 8 |
kde-misc/basket: Drop obsolete patch |
| 9 |
|
| 10 |
Upstream commit 090ac46912025f94aca710355e51a8154df36a56 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.93, Repoman-2.3.20 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
kde-misc/basket/basket-9999.ebuild | 6 +--- |
| 16 |
.../files/basket-2.49b-libgit2-0.99-compat.patch | 32 ---------------------- |
| 17 |
2 files changed, 1 insertion(+), 37 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-misc/basket/basket-9999.ebuild b/kde-misc/basket/basket-9999.ebuild |
| 20 |
index 0a5c8dfa20..0036ef6b46 100644 |
| 21 |
--- a/kde-misc/basket/basket-9999.ebuild |
| 22 |
+++ b/kde-misc/basket/basket-9999.ebuild |
| 23 |
@@ -60,11 +60,7 @@ DEPEND="${RDEPEND} |
| 24 |
>=dev-qt/qtconcurrent-${QTMIN}:5 |
| 25 |
" |
| 26 |
|
| 27 |
-PATCHES=( |
| 28 |
- # TODO: upstream |
| 29 |
- "${FILESDIR}/${PN}-2.49b-xdg_mime_install_dir.patch" |
| 30 |
- "${FILESDIR}/${PN}-2.49b-libgit2-0.99-compat.patch" # bug #710832 |
| 31 |
-) |
| 32 |
+PATCHES=( "${FILESDIR}/${PN}-2.49b-xdg_mime_install_dir.patch" ) # TODO: upstream |
| 33 |
|
| 34 |
src_prepare() { |
| 35 |
ecm_src_prepare |
| 36 |
|
| 37 |
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 |
| 38 |
deleted file mode 100644 |
| 39 |
index 94793a090f..0000000000 |
| 40 |
--- a/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch |
| 41 |
+++ /dev/null |
| 42 |
@@ -1,32 +0,0 @@ |
| 43 |
-From 094580f207b5ba9f44e9af00834f9c93f06fb440 Mon Sep 17 00:00:00 2001 |
| 44 |
-From: Dan Goodliffe <dan@××××××××××××××××.net> |
| 45 |
-Date: Thu, 27 Feb 2020 18:04:21 +0000 |
| 46 |
-Subject: [PATCH] Use LIBGIT2_VER_MINOR for version test |
| 47 |
- |
| 48 |
-Addresses compatibility with libgit2-0.99 |
| 49 |
---- |
| 50 |
- src/application.cpp | 4 ++-- |
| 51 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 52 |
- |
| 53 |
-diff --git a/src/application.cpp b/src/application.cpp |
| 54 |
-index c52fb574..81fcd121 100644 |
| 55 |
---- a/src/application.cpp |
| 56 |
-+++ b/src/application.cpp |
| 57 |
-@@ -56,7 +56,7 @@ Application::Application(int &argc, char **argv) |
| 58 |
- |
| 59 |
- |
| 60 |
- #ifdef WITH_LIBGIT2 |
| 61 |
-- #if LIBGIT2_SOVERSION >= 22 |
| 62 |
-+ #if LIBGIT2_VER_MINOR >= 22 |
| 63 |
- git_libgit2_init(); |
| 64 |
- #else |
| 65 |
- git_threads_init(); |
| 66 |
-@@ -67,7 +67,7 @@ Application::Application(int &argc, char **argv) |
| 67 |
- Application::~Application() |
| 68 |
- { |
| 69 |
- #ifdef WITH_LIBGIT2 |
| 70 |
-- #if LIBGIT2_SOVERSION >= 22 |
| 71 |
-+ #if LIBGIT2_VER_MINOR >= 22 |
| 72 |
- git_libgit2_shutdown(); |
| 73 |
- #else |
| 74 |
- git_threads_shutdown(); |
Archives