From: Sandro Knauß <hefee@debian.org>
Date: Fri, 3 Feb 2023 18:10:15 +0000 (+0100)
Subject: KDE CMake actions are used to install dolphin plugin.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~107
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6087b8f4e6cddc2f416b04e8d348178865d3bf20;p=nextcloud-desktop.git

KDE CMake actions are used to install 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 b8adf148b..65dcc03b5 100644
--- a/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch
+++ b/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch
@@ -9,14 +9,14 @@ Last-Update: 2021-01-03
 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 | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ shell_integration/dolphin/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/shell_integration/dolphin/CMakeLists.txt b/shell_integration/dolphin/CMakeLists.txt
-index 07e6096..ada94fd 100644
+index 07e6096..358385e 100644
 --- a/shell_integration/dolphin/CMakeLists.txt
 +++ b/shell_integration/dolphin/CMakeLists.txt
-@@ -31,18 +31,21 @@ add_library(${OWNCLOUDDOLPHINHELPER} SHARED
+@@ -31,7 +31,7 @@ add_library(${OWNCLOUDDOLPHINHELPER} SHARED
      ownclouddolphinpluginhelper.cpp)
  target_link_libraries(${OWNCLOUDDOLPHINHELPER} Qt5::Network)
  generate_export_header(${OWNCLOUDDOLPHINHELPER} BASE_NAME ownclouddolphinpluginhelper)
@@ -25,17 +25,3 @@ index 07e6096..ada94fd 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)
- configure_file(ownclouddolphinactionplugin.desktop.in ${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop ESCAPE_QUOTES @ONLY)
-+<<<<<<< HEAD
- kcoreaddons_add_plugin(${OWNCLOUDDOLPHINACTIONPLUGIN} INSTALL_NAMESPACE "kf5/kfileitemaction"
-                        SOURCES ownclouddolphinactionplugin.cpp)
- target_link_libraries(${OWNCLOUDDOLPHINACTIONPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ${OWNCLOUDDOLPHINHELPER})
-+set_target_properties(${OWNCLOUDDOLPHINACTIONPLUGIN} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}")
- kcoreaddons_desktop_to_json(${OWNCLOUDDOLPHINACTIONPLUGIN} ${CMAKE_CURRENT_BINARY_DIR}/${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop)