diff options
Diffstat (limited to 'kf5.patch')
| -rw-r--r-- | kf5.patch | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/kf5.patch b/kf5.patch index 3b18ae6995c5..1eea2f28cfef 100644 --- a/kf5.patch +++ b/kf5.patch @@ -1,23 +1,12 @@ diff --git a/MEGAsync/src/MEGAShellExtDolphin/CMakeLists_kde5.txt b/MEGAsync/src/MEGAShellExtDolphin/CMakeLists_kde5.txt -index 83224966..3814d073 100644 ---- a/MEGAsync/src/MEGAShellExtDolphin/CMakeLists_kde5.txt -+++ b/MEGAsync/src/MEGAShellExtDolphin/CMakeLists_kde5.txt -@@ -38,7 +38,6 @@ add_definitions(-DWITH_KF5) - if (KF5_VERSION) - if (NOT KF5_VERSION VERSION_LESS 5.16.0) - set(MEGASYNCDOLPHINOVERLAYPLUGIN megasyncdolphinoverlayplugin) -- set(PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt5/plugins) #so that kcoreaddons install in the right path (see https://github.com/KDE/kcoreaddons/blob/master/KF5CoreAddonsMacros.cmake) - kcoreaddons_add_plugin(${MEGASYNCDOLPHINOVERLAYPLUGIN} INSTALL_NAMESPACE "kf5/overlayicon" - JSON megasync-plugin-overlay.json SOURCES megasync-plugin-overlay.cpp) - #target_link_libraries(${MEGASYNCDOLPHINOVERLAYPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ${MEGASYNCDOLPHINHELPER}) -@@ -60,5 +61,6 @@ target_link_libraries(${MEGASYNCPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWid +@@ -63,5 +64,6 @@ target_link_libraries(${MEGASYNCPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWid #configure_file(megasync-plugin.desktop.in ${MEGASYNCPLUGIN}.desktop ESCAPE_QUOTES @ONLY) #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/megasync-plugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) +#install(TARGETS ${MEGASYNCPLUGIN} DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt5/plugins) install(FILES megasync-plugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) -+install(TARGETS ${MEGASYNCPLUGIN} DESTINATION ${PLUGIN_INSTALL_DIR}) -install(TARGETS ${MEGASYNCPLUGIN} DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt5/plugins) ++install(TARGETS ${MEGASYNCPLUGIN} DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/MEGAsync/src/MEGAShellExtDolphin/megasync-plugin.moc b/src/MEGAShellExtDolphin/megasync-plugin.moc deleted file mode 100644 |