diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-11-14 13:40:11 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-11-14 13:40:49 +0100 |
| commit | d58bb6648edca6865687237dd1a6d779056fe274 (patch) | |
| tree | bfac1f5270182b239b424c21adcaacbf8b08223f /kde-misc/basket | |
| parent | media-libs/taglib: amd64 stable wrt bug #700054 (diff) | |
| download | gentoo-d58bb6648edca6865687237dd1a6d779056fe274.tar.gz gentoo-d58bb6648edca6865687237dd1a6d779056fe274.tar.bz2 gentoo-d58bb6648edca6865687237dd1a6d779056fe274.zip | |
kde-misc/basket: Fix xdg-mime file installation and drop bogus code
Bug: https://bugs.gentoo.org/699960
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-misc/basket')
| -rw-r--r-- | kde-misc/basket/basket-2.49b.ebuild | 2 | ||||
| -rw-r--r-- | kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch | 35 |
2 files changed, 37 insertions, 0 deletions
diff --git a/kde-misc/basket/basket-2.49b.ebuild b/kde-misc/basket/basket-2.49b.ebuild index cb8a10b757ed..7a67ebb6fc1a 100644 --- a/kde-misc/basket/basket-2.49b.ebuild +++ b/kde-misc/basket/basket-2.49b.ebuild @@ -54,6 +54,8 @@ DEPEND="${RDEPEND} $(add_qt_dep qtconcurrent) " +PATCHES=( "${FILESDIR}/${P}-xdg_mime_install_dir.patch" ) + src_prepare() { kde5_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 new file mode 100644 index 000000000000..d118cb2baab7 --- /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 + |