From 3abc4cfcd49df45c856e1b5f01da8de8f970ccb2 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 4 Jan 2022 21:53:44 +0000 Subject: Add Flatpak patches to Dolphin depending on CMake definition When Dolphin gets packaged as a flatpak, this patch gets applied: https://invent.kde.org/packaging/flatpak-kde-applications/-/blob/master/dolphinpatch.patch That's not really an ideal solution, so this is probably a better idea -- to upstream the patches and apply them depending on a CMake definition --- CMakeLists.txt | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ab68cc93..2f26ae85f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,13 +175,22 @@ install(FILES COMPONENT Devel ) -ecm_generate_dbus_service_file( - NAME org.freedesktop.FileManager1 - EXECUTABLE "${KDE_INSTALL_FULL_BINDIR}/dolphin --daemon" - SYSTEMD_SERVICE plasma-dolphin.service - DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR} - RENAME org.kde.dolphin.FileManager1.service -) +if(FLATPAK) + ecm_generate_dbus_service_file( + NAME org.freedesktop.FileManager1 + EXECUTABLE "${KDE_INSTALL_FULL_BINDIR}/dolphin --daemon" + SYSTEMD_SERVICE plasma-dolphin.service + DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR} + ) +else() + ecm_generate_dbus_service_file( + NAME org.freedesktop.FileManager1 + EXECUTABLE "${KDE_INSTALL_FULL_BINDIR}/dolphin --daemon" + SYSTEMD_SERVICE plasma-dolphin.service + DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR} + RENAME org.kde.dolphin.FileManager1.service + ) +endif() ecm_install_configured_files(INPUT plasma-dolphin.service.in DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) -- cgit v1.3