From 2980075ce0e66ffc3cc31e65f13c9710a861f1d8 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Fri, 14 Dec 2018 16:51:11 +0100
Subject: [PATCH] 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.
---
 kiwixbuild/flatpak_builder.py | 4 +---
 travis/compile_all.py         | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/kiwixbuild/flatpak_builder.py b/kiwixbuild/flatpak_builder.py
index b28f5e8..50bdba0 100644
--- a/kiwixbuild/flatpak_builder.py
+++ b/kiwixbuild/flatpak_builder.py
@@ -26,12 +26,11 @@ import json
 from shutil import copyfile
 
 MANIFEST = {
-    'app-id': 'org.kiwix.Client',
+    'app-id': 'org.kiwix.desktop',
     'runtime': 'org.kde.Platform',
     'runtime-version': '5.11',
     'sdk': 'org.kde.Sdk',
     'command': 'kiwix-desktop',
-    'rename-desktop-file' : 'kiwix-desktop.desktop',
     'rename-icon': 'kiwix-desktop',
     'finish-args': [
         '--socket=wayland',
@@ -40,7 +39,6 @@ MANIFEST = {
         '--share=ipc',
         '--device=dri',
         '--socket=pulseaudio',
-        '--filesystem=xdg-data',
     ],
     'cleanup': [
         '/include',
diff --git a/travis/compile_all.py b/travis/compile_all.py
index 0a0d23a..25a4143 100755
--- a/travis/compile_all.py
+++ b/travis/compile_all.py
@@ -115,8 +115,8 @@ def create_desktop_image():
         src_dir = SOURCE_DIR/'kiwix-desktop'
 
     if PLATFORM == 'flatpak':
-        build_path = BASE_DIR/'org.kiwix.Client.flatpak'
-        app_name = 'org.kiwix.Client.{}.flatpak'.format(postfix)
+        build_path = BASE_DIR/'org.kiwix.desktop.flatpak'
+        app_name = 'org.kiwix.desktop.{}.flatpak'.format(postfix)
     else:
         build_path = HOME/'Kiwix-x86_64.AppImage'
         app_name = "kiwix-desktop_x86_64_{}.appimage".format(postfix)