From 5328dcfe420e8dbd47a023380835efbf741c87f6 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 20 Aug 2023 18:07:42 -0400 Subject: [PATCH] Enable flatpak configuration in flatpak builds The previous commit allowed dolphin to build (e.g. for inclusion of dolphin-part in other flatpaks) but this is needed for the dolphin flatpak itself. --- dolphin.spec | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dolphin.spec b/dolphin.spec index d95a9a9..a0c8b7b 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -103,6 +103,7 @@ Requires: kf5-kio-devel%{?_isa} %build %cmake_kf5 \ + %{?flatpak:-DFLATPAK:BOOL=ON} \ -DKDE_INSTALL_SYSTEMDUSERUNITDIR=%{_userunitdir} \ -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} @@ -125,6 +126,13 @@ desktop-file-edit \ %{buildroot}%{_kf5_sysconfdir}/xdg/autostart/org.kde.%{name}.desktop %endif +%if 0%{?flatpak} +for i in 16 22 32 48 64 128; do + install -D -m0644 src/icons/${i}-system-file-manager.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/system-file-manager.png +done +install -D -m0644 src/icons/system-file-manager.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/system-file-manager.svg +%endif + %check appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml ||: @@ -147,8 +155,12 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %if 0%{?dolphin_autostart} %{_kf5_sysconfdir}/xdg/autostart/org.kde.%{name}.desktop %else +%if 0%{?flatpak} +%{_datadir}/dbus-1/services/org.freedesktop.FileManager1.service +%else %{_datadir}/dbus-1/services/org.kde.dolphin.FileManager1.service %endif +%endif %{_userunitdir}/* %{_kf5_metainfodir}/org.kde.%{name}.appdata.xml %{_kf5_datadir}/applications/org.kde.%{name}.desktop @@ -159,6 +171,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %dir %{_kf5_datadir}/dolphin %{_kf5_datadir}/dolphin/dolphinpartactions.desktop %{_kf5_datadir}/zsh/site-functions/_dolphin +%if 0%{?flatpak} +%{_datadir}/icons/hicolor/*/apps/system-file-manager.* +%endif %files libs %{_kf5_libdir}/libdolphinprivate.so.*