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 --- src/CMakeLists.txt | 4 ++++ src/main.cpp | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b97a5d7c0..651f021e6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -340,6 +340,10 @@ target_sources(dolphin PRIVATE main.cpp ) +if(FLATPAK) + target_compile_definitions(dolphin PRIVATE FLATPAK) +endif() + # Sets the icon on Windows and OSX file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*system-file-manager.png") ecm_add_app_icon(dolphin_APPICON_SRCS ICONS ${ICONS_SRCS}) diff --git a/src/main.cpp b/src/main.cpp index cda28c80c..7a2d42ea5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -154,7 +154,11 @@ int main(int argc, char **argv) QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement); QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement); +#ifdef FLATPAK + KDBusService dolphinDBusService(KDBusService::NoExitOnFailure); +#else KDBusService dolphinDBusService; +#endif DBusInterface interface; interface.setAsDaemon(); return app.exec(); -- cgit v1.3