diff options
Diffstat (limited to 'kde-misc/basket')
| -rw-r--r-- | kde-misc/basket/Manifest | 3 | ||||
| -rw-r--r-- | kde-misc/basket/basket-2.49b.ebuild | 5 | ||||
| -rw-r--r-- | kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch | 48 |
3 files changed, 54 insertions, 2 deletions
diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest index ef752e47c464..b9f7f7ab5c1f 100644 --- a/kde-misc/basket/Manifest +++ b/kde-misc/basket/Manifest @@ -1,4 +1,5 @@ +AUX basket-2.49b-libgit2-0.99-compat.patch 1598 BLAKE2B c8938b905715cff5e69147463d7f8c17da69b8bee2fc04e98d06da33f27fd57c6589814321c17a39c803f3f1a923d82aab084c3bbe7c45419e5b05d75e7c4f1c SHA512 756aad2a59668aa605fbb438aa859b4f4c59affe859635bd4962e47f003461df57ab500c5b7ad460f8c450f95b2da917c04ea9bf7cb1e8b3a49db47f5fd304b8 AUX basket-2.49b-xdg_mime_install_dir.patch 1429 BLAKE2B cc1177ec5d9675d2a85c81bcbee77b02ee1fcf11f9d609e7298d4b1c067c07c818fe18d2d1aaa1fc0c159fa5fc7a2d84322eddbd82eff2dddedd81b446a01879 SHA512 224c3dae19c80ae8f0826f2bee6429391998c3baadf708aac3353ca0962646de595d9498e003b1d9d87a9e321858dc43de39a9f0866e4894791a05b28fde05f6 DIST basket-2.49b.tar.gz 4686990 BLAKE2B 6915d673abae6902bd2a0073a88cdf5bc497a7e7eec47dc87dbafcce68915e55bb02505c81a24cc00ed081e60b4c135afd337c6c4d08843182175f42c39e9119 SHA512 70d4241928712a7366cbc592e414864896cfb27bea251e5e4d3606b34534a932d7c208f98a8f48b49c11234c52f78d9003ca00af979e61112dbe139627e6f134 -EBUILD basket-2.49b.ebuild 2062 BLAKE2B b755ccdd8b5d4b269f2a599aa04d69c284a643f4861093b84d1779e8410d80c0a14ff21bbe01f87c3b4f637b2e9fbef4d19005bb8211a7ba6f673dc17cfa481e SHA512 fa22847582a6c648f7d084f14702d34bb4987d6c7547816cba1e6db93fa484af9c4a0426bf467e65455100b0a35e26294c95fdf4fdcda65fc3bb5b367a3d9f72 +EBUILD basket-2.49b.ebuild 2123 BLAKE2B 53cd3b4993893c1d5d4d2d35d27ec9a1f80f479431af7bc5b8a0739e5b1bc739671632e4613c079fb6502a2c620b4bb7abbfd8c70bb920996f03cf9d5458e8e8 SHA512 8d837ba2048a9176a3b2be7a6bb10d25ae161e1a8758d94eed617370d3051bf135127279e63666368ce3d79249d9ad2eb71212d5fc2821c299a56d3962a8c18a MISC metadata.xml 336 BLAKE2B 0a9704885fd7a47cb2b0b01f51baf34c3cfac7eefcfb06c4328d83aa51b4909e5ad20a29ffc7df79df38d01d1a86e37ece806a0f905714eb0e86a29f12e2aade SHA512 8c2e68454f9153eefec98b4c918de8390de6e3384b0d3339b64bcbe54592e582c933a372852444f031fe0574e4d1ad3e4b6fcd80fe9f610cd6624e13eaec3eb0 diff --git a/kde-misc/basket/basket-2.49b.ebuild b/kde-misc/basket/basket-2.49b.ebuild index 6a9fcbf3e6a7..bbcfe4d1009e 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 000000000000..d1051af86acf --- /dev/null +++ b/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch @@ -0,0 +1,48 @@ +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 + +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 c52fb57..b673848 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_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && 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_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 22) + git_libgit2_shutdown(); + #else + git_threads_shutdown(); +-- +2.26.0 |