From: Sandro Knauß Date: Sat, 4 Feb 2023 16:41:01 +0000 (+0100) Subject: Update patch: Need to set RPATH/RUNPATH for dolphin plugin. X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~102 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=842da74e1e138ae621678749e132c9d76de35f06;p=nextcloud-desktop.git Update patch: Need to set RPATH/RUNPATH for dolphin plugin. --- diff --git a/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch b/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch index 65dcc03b5..65ee882fa 100644 --- a/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch +++ b/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch @@ -4,19 +4,19 @@ Subject: Debianize installation folder for kde plugin Origin: Debian Forwarded: not-needed -Last-Update: 2021-01-03 +Last-Update: 2023-02-04 Inside debian we want that the kde plugins are directly found, so we need to push them to known places. --- - shell_integration/dolphin/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + shell_integration/dolphin/CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shell_integration/dolphin/CMakeLists.txt b/shell_integration/dolphin/CMakeLists.txt -index 07e6096..358385e 100644 +index 07e6096..62c1815 100644 --- a/shell_integration/dolphin/CMakeLists.txt +++ b/shell_integration/dolphin/CMakeLists.txt -@@ -31,7 +31,7 @@ add_library(${OWNCLOUDDOLPHINHELPER} SHARED +@@ -31,13 +31,15 @@ add_library(${OWNCLOUDDOLPHINHELPER} SHARED ownclouddolphinpluginhelper.cpp) target_link_libraries(${OWNCLOUDDOLPHINHELPER} Qt5::Network) generate_export_header(${OWNCLOUDDOLPHINHELPER} BASE_NAME ownclouddolphinpluginhelper) @@ -25,3 +25,16 @@ index 07e6096..358385e 100644 #---OVERLAY PLUGIN--- set(OWNCLOUDDOLPHINOVERLAYPLUGIN ${APPLICATION_EXECUTABLE}dolphinoverlayplugin) + kcoreaddons_add_plugin(${OWNCLOUDDOLPHINOVERLAYPLUGIN} INSTALL_NAMESPACE "kf5/overlayicon" + JSON ownclouddolphinoverlayplugin.json SOURCES ownclouddolphinoverlayplugin.cpp) + target_link_libraries(${OWNCLOUDDOLPHINOVERLAYPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ${OWNCLOUDDOLPHINHELPER}) ++set_target_properties(${OWNCLOUDDOLPHINOVERLAYPLUGIN} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}") ++ + + #---ACTION PLUGIN--- + set(OWNCLOUDDOLPHINACTIONPLUGIN ${APPLICATION_EXECUTABLE}dolphinactionplugin) +@@ -46,3 +48,4 @@ kcoreaddons_add_plugin(${OWNCLOUDDOLPHINACTIONPLUGIN} INSTALL_NAMESPACE "kf5/kfi + SOURCES ownclouddolphinactionplugin.cpp) + target_link_libraries(${OWNCLOUDDOLPHINACTIONPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ${OWNCLOUDDOLPHINHELPER}) + kcoreaddons_desktop_to_json(${OWNCLOUDDOLPHINACTIONPLUGIN} ${CMAKE_CURRENT_BINARY_DIR}/${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop) ++set_target_properties(${OWNCLOUDDOLPHINACTIONPLUGIN} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}")