diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-03-12 15:21:19 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-03-12 15:21:32 +0100 |
| commit | f4f34713ec12462b1546023976d10308298effd0 (patch) | |
| tree | d3764d99fe7623e9793e6cb23d400a027270be93 /kde-misc/basket | |
| parent | kde-misc/basket: Drop obsolete patch (diff) | |
| download | kde-f4f34713ec12462b1546023976d10308298effd0.tar.gz kde-f4f34713ec12462b1546023976d10308298effd0.tar.bz2 kde-f4f34713ec12462b1546023976d10308298effd0.zip | |
kde-misc/basket: Patch upstreamed
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-misc/basket')
| -rw-r--r-- | kde-misc/basket/basket-9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch | 35 |
2 files changed, 0 insertions, 37 deletions
diff --git a/kde-misc/basket/basket-9999.ebuild b/kde-misc/basket/basket-9999.ebuild index 0036ef6b46..8a34e75f05 100644 --- a/kde-misc/basket/basket-9999.ebuild +++ b/kde-misc/basket/basket-9999.ebuild @@ -60,8 +60,6 @@ DEPEND="${RDEPEND} >=dev-qt/qtconcurrent-${QTMIN}:5 " -PATCHES=( "${FILESDIR}/${PN}-2.49b-xdg_mime_install_dir.patch" ) # TODO: upstream - src_prepare() { ecm_src_prepare if ! use test; then 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 deleted file mode 100644 index d118cb2baa..0000000000 --- a/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 - |