From 899322831e49e8d4fe67ba97cf29b6f246f844de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20V=C3=A1radi?= Date: Sat, 9 Oct 2021 17:28:30 +0200 Subject: [PATCH] Fixed the VFS plugin install path --- debian/libnextcloudsync0.install | 2 +- debian/patches/0007-vfs-plugin.patch | 39 ++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0007-vfs-plugin.patch diff --git a/debian/libnextcloudsync0.install b/debian/libnextcloudsync0.install index 9468b03ee8..f07142d784 100644 --- a/debian/libnextcloudsync0.install +++ b/debian/libnextcloudsync0.install @@ -1,3 +1,3 @@ usr/lib/*/libnextcloudsync.so.* usr/lib/*/libnextcloud_csync.so.* -usr/lib/*/nextcloudsync_vfs_*.so +usr/lib/*/qt5/plugins/nextcloudsync_vfs_*.so diff --git a/debian/patches/0007-vfs-plugin.patch b/debian/patches/0007-vfs-plugin.patch new file mode 100644 index 0000000000..16c97ce601 --- /dev/null +++ b/debian/patches/0007-vfs-plugin.patch @@ -0,0 +1,39 @@ +diff --git a/src/libsync/vfs/cfapi/CMakeLists.txt b/src/libsync/vfs/cfapi/CMakeLists.txt +index 5d7900711..e64dd50a2 100644 +--- a/src/libsync/vfs/cfapi/CMakeLists.txt ++++ b/src/libsync/vfs/cfapi/CMakeLists.txt +@@ -25,7 +25,7 @@ if (WIN32) + + target_include_directories("nextcloudsync_vfs_cfapi" BEFORE PUBLIC ${CMAKE_CURRENT_BINARY_DIR} INTERFACE ${CMAKE_BINARY_DIR}) + +- set(vfs_installdir "${PLUGINDIR}") ++ set(vfs_installdir "${PLUGIN_INSTALL_DIR}") + + generate_export_header(nextcloudsync_vfs_cfapi + BASE_NAME nextcloudsync_vfs_cfapi +diff --git a/src/libsync/vfs/suffix/CMakeLists.txt b/src/libsync/vfs/suffix/CMakeLists.txt +index bec840ca2..022641746 100644 +--- a/src/libsync/vfs/suffix/CMakeLists.txt ++++ b/src/libsync/vfs/suffix/CMakeLists.txt +@@ -26,7 +26,7 @@ if(APPLE) + # For being loadable when client run from install dir (after make macdeployqt) + set(vfs_installdir "${LIB_INSTALL_DIR}/../PlugIns") + else() +- set(vfs_installdir "${PLUGINDIR}") ++ set(vfs_installdir "${PLUGIN_INSTALL_DIR}") + endif() + + install(TARGETS nextcloudsync_vfs_suffix +diff --git a/src/libsync/vfs/xattr/CMakeLists.txt b/src/libsync/vfs/xattr/CMakeLists.txt +index f87bd4f9c..02c1cdab1 100644 +--- a/src/libsync/vfs/xattr/CMakeLists.txt ++++ b/src/libsync/vfs/xattr/CMakeLists.txt +@@ -34,7 +34,7 @@ if (LINUX) + # For being loadable when client run from install dir (after make macdeployqt) + set(vfs_installdir "${LIB_INSTALL_DIR}/../PlugIns") + else() +- set(vfs_installdir "${PLUGINDIR}") ++ set(vfs_installdir "${PLUGIN_INSTALL_DIR}") + endif() + + generate_export_header(nextcloudsync_vfs_xattr diff --git a/debian/patches/series b/debian/patches/series index 08ba6ecb15..243b6e96de 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-fix-installationpath-of-dolphin-plugin.patch 0003-use_system_buildflags.patch 0004-sane-cmake.patch +0007-vfs-plugin.patch