Indicate that KDE libs should use the Qt system paths in the Dolphin plugin (#234)

6 files changed, 13 insertions, 14 deletions

diff --git a/linux/debian/nextcloud-client/debian.artful/nextcloud-client-dolphin.install b/linux/debian/nextcloud-client/debian.artful/nextcloud-client-dolphin.install
deleted file mode 100644
index 1b81e95..0000000
--- a/linux/debian/nextcloud-client/debian.artful/nextcloud-client-dolphin.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/libnextclouddolphinpluginhelper.so
-usr/lib/*/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
-usr/lib/*/qt5/plugins/nextclouddolphinactionplugin.so
-usr/share/kservices5/nextclouddolphinactionplugin.desktop
diff --git a/linux/debian/nextcloud-client/debian.yakkety/nextcloud-client-dolphin.install b/linux/debian/nextcloud-client/debian.yakkety/nextcloud-client-dolphin.install
deleted file mode 100644
index 1b81e95..0000000
--- a/linux/debian/nextcloud-client/debian.yakkety/nextcloud-client-dolphin.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/libnextclouddolphinpluginhelper.so
-usr/lib/*/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
-usr/lib/*/qt5/plugins/nextclouddolphinactionplugin.so
-usr/share/kservices5/nextclouddolphinactionplugin.desktop
diff --git a/linux/debian/nextcloud-client/debian.zesty/nextcloud-client-dolphin.install b/linux/debian/nextcloud-client/debian.zesty/nextcloud-client-dolphin.install
deleted file mode 100644
index 1b81e95..0000000
--- a/linux/debian/nextcloud-client/debian.zesty/nextcloud-client-dolphin.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/libnextclouddolphinpluginhelper.so
-usr/lib/*/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
-usr/lib/*/qt5/plugins/nextclouddolphinactionplugin.so
-usr/share/kservices5/nextclouddolphinactionplugin.desktop
diff --git a/linux/debian/nextcloud-client/debian/nextcloud-client-dolphin.install b/linux/debian/nextcloud-client/debian/nextcloud-client-dolphin.install
index 736f0ad..1b81e95 100644
--- a/linux/debian/nextcloud-client/debian/nextcloud-client-dolphin.install
+++ b/linux/debian/nextcloud-client/debian/nextcloud-client-dolphin.install
@@ -1,4 +1,4 @@
 usr/lib/*/libnextclouddolphinpluginhelper.so
-usr/lib/*/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
-usr/lib/*/plugins/nextclouddolphinactionplugin.so
+usr/lib/*/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
+usr/lib/*/qt5/plugins/nextclouddolphinactionplugin.so
 usr/share/kservices5/nextclouddolphinactionplugin.desktop
diff --git a/linux/debian/nextcloud-client/debian/patches/series b/linux/debian/nextcloud-client/debian/patches/series
index 6cdbb79..83aa7d5 100644
--- a/linux/debian/nextcloud-client/debian/patches/series
+++ b/linux/debian/nextcloud-client/debian/patches/series
@@ -1,2 +1,3 @@
 fix-application-icon-name.patch
 fix-syncstate-appname.patch
+set-kde-use-qt-sys-path.patch
diff --git a/linux/debian/nextcloud-client/debian/patches/set-kde-use-qt-sys-path.patch b/linux/debian/nextcloud-client/debian/patches/set-kde-use-qt-sys-path.patch
new file mode 100644
index 0000000..6af1208
--- /dev/null
+++ b/linux/debian/nextcloud-client/debian/patches/set-kde-use-qt-sys-path.patch
@@ -0,0 +1,10 @@
+--- nextcloud-client_2.3.0.orig/client/shell_integration/dolphin/CMakeLists.txt	2018-02-25 13:15:53.775971301 +0100
++++ nextcloud-client_2.3.0/client/shell_integration/dolphin/CMakeLists.txt	2018-02-25 13:15:57.584003567 +0100
+@@ -4,6 +4,7 @@
+ include(FeatureSummary)
+ set(QT_MIN_VERSION "5.3.0")
+ set(KF5_MIN_VERSION "5.16.0")
++set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "Install the plugin in the right directory")
+ 
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Network)
+