Fix flatpak
Update with the state of the manifest on github and install icons at the correct location
|
@ -7,8 +7,21 @@
|
||||||
"command": "dolphin",
|
"command": "dolphin",
|
||||||
"tags": ["nightly"],
|
"tags": ["nightly"],
|
||||||
"desktop-file-name-suffix": " (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": [
|
"modules": [
|
||||||
{
|
{
|
||||||
"name": "lmdb",
|
"name": "lmdb",
|
||||||
|
@ -32,12 +45,12 @@
|
||||||
"config-opts": ["-DENABLE_TESTING=OFF", "-DLMDB_DIR=/app"],
|
"config-opts": ["-DENABLE_TESTING=OFF", "-DLMDB_DIR=/app"],
|
||||||
"name": "baloo",
|
"name": "baloo",
|
||||||
"buildsystem": "cmake-ninja",
|
"buildsystem": "cmake-ninja",
|
||||||
"builddir": true,
|
"builddir": true,
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://invent.kde.org/frameworks/baloo.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"],
|
"config-opts": ["-DENABLE_TESTING=OFF", "-DQT_MAJOR_VERSION=6", "-DLMDB_DIR=/app"],
|
||||||
"name": "baloo-widgets",
|
"name": "baloo-widgets",
|
||||||
"buildsystem": "cmake-ninja",
|
"buildsystem": "cmake-ninja",
|
||||||
"builddir": true,
|
"builddir": true,
|
||||||
"sources": [ { "type": "git", "url": "https://invent.kde.org/libraries/baloo-widgets.git", "branch": "master"} ]
|
"sources": [ { "type": "git", "url": "https://invent.kde.org/libraries/baloo-widgets.git", "branch": "master"} ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"config-opts": ["-DFLATPAK=ON"],
|
"config-opts": ["-DFLATPAK=ON"],
|
||||||
"name": "dolphin",
|
"name": "dolphin",
|
||||||
"buildsystem": "cmake-ninja",
|
"buildsystem": "cmake-ninja",
|
||||||
"builddir": true,
|
"builddir": true,
|
||||||
"sources": [ { "type": "dir", "path": "." } ]
|
"sources": [ { "type": "dir", "path": "." } ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "dolphin-plugins",
|
"name": "dolphin-plugins",
|
||||||
"buildsystem": "cmake-ninja",
|
"buildsystem": "cmake-ninja",
|
||||||
"builddir": true,
|
"builddir": true,
|
||||||
"sources": [ { "type": "git", "url": "https://invent.kde.org/sdk/dolphin-plugins.git" } ]
|
"sources": [ { "type": "git", "url": "https://invent.kde.org/sdk/dolphin-plugins.git" } ]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -464,9 +464,22 @@ if(FLATPAK)
|
||||||
target_compile_definitions(dolphin PRIVATE FLATPAK)
|
target_compile_definitions(dolphin PRIVATE FLATPAK)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Sets the icon on Windows and OSX
|
# Install the icons on macOS and Windows
|
||||||
file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*system-file-manager.png")
|
ecm_add_app_icon(dolphin
|
||||||
ecm_add_app_icon(dolphin ICONS ${ICONS_SRCS})
|
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
|
target_link_libraries(dolphin
|
||||||
PRIVATE
|
PRIVATE
|
||||||
|
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 490 B After Width: | Height: | Size: 490 B |
Before Width: | Height: | Size: 609 B After Width: | Height: | Size: 609 B |
Before Width: | Height: | Size: 820 B After Width: | Height: | Size: 820 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
@ -59,7 +59,7 @@ Name[x-test]=xxDolphinxx
|
||||||
Name[zh_CN]=Dolphin 文件管理器
|
Name[zh_CN]=Dolphin 文件管理器
|
||||||
Name[zh_TW]=Dolphin
|
Name[zh_TW]=Dolphin
|
||||||
Exec=dolphin %u
|
Exec=dolphin %u
|
||||||
Icon=system-file-manager
|
Icon=org.kde.dolphin
|
||||||
Type=Application
|
Type=Application
|
||||||
X-DocPath=dolphin/index.html
|
X-DocPath=dolphin/index.html
|
||||||
Categories=Qt;KDE;System;FileTools;FileManager;
|
Categories=Qt;KDE;System;FileTools;FileManager;
|
||||||
|
|