Update flatpak_builder to new version of kiwix-desktop

- app-id is now ork.kiwix.desktop
- No need to rename the desktop-file
- `--filesystem=xdg-data` is useless.
This commit is contained in:
Matthieu Gautier 2018-12-14 16:51:11 +01:00
parent c0c907bb92
commit 2980075ce0
2 changed files with 3 additions and 5 deletions

View File

@ -26,12 +26,11 @@ import json
from shutil import copyfile from shutil import copyfile
MANIFEST = { MANIFEST = {
'app-id': 'org.kiwix.Client', 'app-id': 'org.kiwix.desktop',
'runtime': 'org.kde.Platform', 'runtime': 'org.kde.Platform',
'runtime-version': '5.11', 'runtime-version': '5.11',
'sdk': 'org.kde.Sdk', 'sdk': 'org.kde.Sdk',
'command': 'kiwix-desktop', 'command': 'kiwix-desktop',
'rename-desktop-file' : 'kiwix-desktop.desktop',
'rename-icon': 'kiwix-desktop', 'rename-icon': 'kiwix-desktop',
'finish-args': [ 'finish-args': [
'--socket=wayland', '--socket=wayland',
@ -40,7 +39,6 @@ MANIFEST = {
'--share=ipc', '--share=ipc',
'--device=dri', '--device=dri',
'--socket=pulseaudio', '--socket=pulseaudio',
'--filesystem=xdg-data',
], ],
'cleanup': [ 'cleanup': [
'/include', '/include',

View File

@ -115,8 +115,8 @@ def create_desktop_image():
src_dir = SOURCE_DIR/'kiwix-desktop' src_dir = SOURCE_DIR/'kiwix-desktop'
if PLATFORM == 'flatpak': if PLATFORM == 'flatpak':
build_path = BASE_DIR/'org.kiwix.Client.flatpak' build_path = BASE_DIR/'org.kiwix.desktop.flatpak'
app_name = 'org.kiwix.Client.{}.flatpak'.format(postfix) app_name = 'org.kiwix.desktop.{}.flatpak'.format(postfix)
else: else:
build_path = HOME/'Kiwix-x86_64.AppImage' build_path = HOME/'Kiwix-x86_64.AppImage'
app_name = "kiwix-desktop_x86_64_{}.appimage".format(postfix) app_name = "kiwix-desktop_x86_64_{}.appimage".format(postfix)