diff options
| author | István Váradi <ivaradi@varadiistvan.hu> | 2021-10-09 18:26:55 +0300 |
|---|---|---|
| committer | István Váradi <ivaradi@varadiistvan.hu> | 2021-10-09 18:42:14 +0300 |
| commit | a11da38db6593be0d02e3edf6ff9747c6bd0d084 (patch) | |
| tree | d13a0a657263e3709fc33ffa4ea3e861fb6224fb | |
| parent | 67deaf9eeaeae23528a213233b2ba6db02eaa9b9 (diff) | |
Fixed the VFS plugin install pathdebian/dist/focal/stable-3.3
| -rw-r--r-- | debian/libnextcloudsync0.install | 2 | ||||
| -rw-r--r-- | debian/patches/0007-vfs-plugin.patch | 39 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 41 insertions, 1 deletions
diff --git a/debian/libnextcloudsync0.install b/debian/libnextcloudsync0.install index 9468b03ee..f07142d78 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 000000000..21c17886a --- /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 77392c21f..42083f135 100644 +--- a/src/libsync/vfs/cfapi/CMakeLists.txt ++++ b/src/libsync/vfs/cfapi/CMakeLists.txt +@@ -21,7 +21,7 @@ if (WIN32) + + target_include_directories("${synclib_NAME}_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( "${synclib_NAME}_vfs_cfapi" + BASE_NAME "${synclib_NAME}_vfs_cfapi" +diff --git a/src/libsync/vfs/suffix/CMakeLists.txt b/src/libsync/vfs/suffix/CMakeLists.txt +index 92426a5fb..e11375e5e 100644 +--- a/src/libsync/vfs/suffix/CMakeLists.txt ++++ b/src/libsync/vfs/suffix/CMakeLists.txt +@@ -24,7 +24,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 "${synclib_NAME}_vfs_suffix" +diff --git a/src/libsync/vfs/xattr/CMakeLists.txt b/src/libsync/vfs/xattr/CMakeLists.txt +index ae6fe7abf..66f51b4be 100644 +--- a/src/libsync/vfs/xattr/CMakeLists.txt ++++ b/src/libsync/vfs/xattr/CMakeLists.txt +@@ -32,7 +32,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( "${synclib_NAME}_vfs_xattr" diff --git a/debian/patches/series b/debian/patches/series index f36162c55..a7af2663e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0003-use_system_buildflags.patch 0004-sane-cmake.patch 0005-inkscape-switch.patch +0007-vfs-plugin.patch |