Fix flatpak

Update with the state of the manifest on github and install icons at the
correct location

diff --git a/.flatpak-manifest.json b/.flatpak-manifest.json
index a5afaad23c5d29c19af8a5a299d67b0b2a7022c0..1b5cd498b08943c82b212aa019affed5497466f1 100644 (file)
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -7,8 +7,21 @@
     "command": "dolphin",
     "tags": ["nightly"],
     "desktop-file-name-suffix": " (Nightly)",
-    "finish-args": ["--share=ipc", "--socket=fallback-x11", "--socket=wayland", "--filesystem=host" ],
-
+    "finish-args": [
+        "--device=dri",
+        "--share=ipc",
+        "--share=network",
+        "--socket=fallback-x11",
+        "--socket=wayland",
+        "--socket=pulseaudio",
+        "--filesystem=host",
+        "--talk-name=org.freedesktop.Flatpak",
+        "--talk-name=org.kde.kded5",
+        "--talk-name=org.kde.kiod5",
+        "--talk-name=org.kde.JobViewServer",
+        "--talk-name=org.kde.kpasswdserver",
+        "--system-talk-name=org.freedesktop.UDisks2"
+    ],
     "modules": [
         {
             "name": "lmdb",
@@ -32,12 +45,12 @@
             "config-opts": ["-DENABLE_TESTING=OFF", "-DLMDB_DIR=/app"],
             "name": "baloo",
             "buildsystem": "cmake-ninja",
-           "builddir": true,
+            "builddir": true,
             "sources": [
                 {
                     "type": "git",
                     "url": "https://invent.kde.org/frameworks/baloo.git",
-                   "branch": "master"
+                "branch": "master"
                 }
             ]
         },
@@ -45,20 +58,20 @@
             "config-opts": ["-DENABLE_TESTING=OFF", "-DQT_MAJOR_VERSION=6", "-DLMDB_DIR=/app"],
             "name": "baloo-widgets",
             "buildsystem": "cmake-ninja",
-           "builddir": true,
+            "builddir": true,
             "sources": [ { "type": "git", "url": "https://invent.kde.org/libraries/baloo-widgets.git", "branch": "master"} ]
         },
         {
-           "config-opts": ["-DFLATPAK=ON"],
+            "config-opts": ["-DFLATPAK=ON"],
             "name": "dolphin",
             "buildsystem": "cmake-ninja",
-           "builddir": true,
+            "builddir": true,
             "sources": [ { "type": "dir", "path": "." } ]
         },
         {
             "name": "dolphin-plugins",
             "buildsystem": "cmake-ninja",
-           "builddir": true,
+            "builddir": true,
             "sources": [ { "type": "git", "url": "https://invent.kde.org/sdk/dolphin-plugins.git" } ]
         }
     ]

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 533b5d221271c3cc24974a985fe563465d7293d9..18494fc8dfadf4a16d33baa44b3304b451a1ed1f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -464,9 +464,22 @@ 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 ICONS ${ICONS_SRCS})
+# Install the icons on macOS and Windows
+ecm_add_app_icon(dolphin
+    ICONS
+        icons/128-apps-org.kde.dolphin.png
+        icons/16-apps-org.kde.dolphin.png
+        icons/22-apps-org.kde.dolphin.png
+        icons/32-apps-org.kde.dolphin.png
+        icons/48-apps-org.kde.dolphin.png
+        icons/64-apps-org.kde.dolphin.png
+    DESTINATION
+        ${KDE_INSTALL_ICONDIR}
+    THEME
+        hicolor
+)
+
+install(FILES icons/org.kde.dolphin.svg DESTINATION ${KDE_INSTALL_ICONDIR}/hicolor/scalable/apps)
 
 target_link_libraries(dolphin
     PRIVATE

diff --git a/src/icons/128-system-file-manager.png b/src/icons/128-apps-org.kde.dolphin.png
similarity index 100%
rename from src/icons/128-system-file-manager.png
rename to src/icons/128-apps-org.kde.dolphin.png

diff --git a/src/icons/16-system-file-manager.png b/src/icons/16-apps-org.kde.dolphin.png
similarity index 100%
rename from src/icons/16-system-file-manager.png
rename to src/icons/16-apps-org.kde.dolphin.png

diff --git a/src/icons/22-system-file-manager.png b/src/icons/22-apps-org.kde.dolphin.png
similarity index 100%
rename from src/icons/22-system-file-manager.png
rename to src/icons/22-apps-org.kde.dolphin.png

diff --git a/src/icons/32-system-file-manager.png b/src/icons/32-apps-org.kde.dolphin.png
similarity index 100%
rename from src/icons/32-system-file-manager.png
rename to src/icons/32-apps-org.kde.dolphin.png

diff --git a/src/icons/48-system-file-manager.png b/src/icons/48-apps-org.kde.dolphin.png
similarity index 100%
rename from src/icons/48-system-file-manager.png
rename to src/icons/48-apps-org.kde.dolphin.png

diff --git a/src/icons/64-system-file-manager.png b/src/icons/64-apps-org.kde.dolphin.png
similarity index 100%
rename from src/icons/64-system-file-manager.png
rename to src/icons/64-apps-org.kde.dolphin.png

diff --git a/src/icons/system-file-manager.svg b/src/icons/org.kde.dolphin.svg
similarity index 100%
rename from src/icons/system-file-manager.svg
rename to src/icons/org.kde.dolphin.svg

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 674977ace4d9e3d1409d8750472f5f1090464960..4e3e4de2aa56649c795361e54cf12142e3cd3096 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -59,7 +59,7 @@ Name[x-test]=xxDolphinxx
 Name[zh_CN]=Dolphin 文件管理器
 Name[zh_TW]=Dolphin
 Exec=dolphin %u
-Icon=system-file-manager
+Icon=org.kde.dolphin
 Type=Application
 X-DocPath=dolphin/index.html
 Categories=Qt;KDE;System;FileTools;FileManager;