From 2d69fd13e8bd0a2bd5dab3bbf225d3db6d775846 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 8 Mar 2020 13:25:25 +0100
Subject: kde-misc/basket: Project moved (back) to kde.org

https://cgit.kde.org/sysadmin/repo-metadata.git/commit/?id=44c76e85b18f55ec24986aad45bf390dc7b414b3

Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 .../files/basket-2.49b-libgit2-0.99-compat.patch   | 32 ++++++++++++++++++++
 .../files/basket-2.49b-xdg_mime_install_dir.patch  | 35 ++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch
 create mode 100644 kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch

(limited to 'kde-misc/basket/files')

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 <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();
diff --git a/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch b/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch
new file mode 100644
index 00000000000..d118cb2baab
--- /dev/null
+++ b/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch
@@ -0,0 +1,35 @@
+From 4c80df2dd6aeb7a90677d983a292e4f9a95f2a70 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 14 Nov 2019 13:35:42 +0100
+Subject: [PATCH] Fix install basket.xml to XDG_MIME_INSTALL_DIR
+
+Previous code did not work at all in a sandboxed packaging build.
+---
+ file-integration/CMakeLists.txt | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/file-integration/CMakeLists.txt b/file-integration/CMakeLists.txt
+index c3774fe..77e4692 100644
+--- a/file-integration/CMakeLists.txt
++++ b/file-integration/CMakeLists.txt
+@@ -11,15 +11,5 @@ install(TARGETS basketthumbcreator DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
+ ########### install files ###############
+ 
+-find_program(XDG-MIME_EXECUTABLE xdg-mime)
+-find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
+-
+-install(FILES  basketthumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+-install(CODE "
+-execute_process(COMMAND ${XDG-MIME_EXECUTABLE} install --novendor
+-  ${CMAKE_CURRENT_SOURCE_DIR}/basket.xml)
+-execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install
+-  --novendor ${CMAKE_SOURCE_DIR}/src/basket.desktop)
+-execute_process(COMMAND ${XDG-MIME_EXECUTABLE} default
+-  ${CMAKE_SOURCE_DIR}/src/basket.desktop application/x-basket-item)
+-")
++install(FILES basketthumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR})
++install(FILES basket.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
+-- 
+2.24.0
+
-- 
cgit v1.2.3