Merge pull request #276 from kiwix/update_flatpak

Update flatpak and new versions

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',

kiwixbuild/versions.py

@@ -1,12 +1,12 @@
 # This file reference all the versions of the depedencies we use in kiwix-build.
 
 main_project_versions = {
-    'kiwix-lib': '3.1.0',
+    'kiwix-lib': '3.1.1',
     'kiwix-tools': '0.8.0',
     'libzim': '4.0.4',
     'zim-tools': '1.0.0',
     'zimwriterfs': '1.2',
-    'kiwix-desktop': '2.0-beta1'
+    'kiwix-desktop': '2.0-beta2'
 }
 
 # This dictionnary specify what we need to build at each release process.
@@ -26,8 +26,8 @@ main_project_versions = {
 release_versions = {
     'libzim': None, # Depends of base deps (was 0)
     'kiwix-lib': 0, # Depends of libzim
-    'kiwix-tools': 1, # Depends of kiwix-lib and libzim
-    'zim-tools': None, # Depends of libzim (was 1)
+    'kiwix-tools': 2, # Depends of kiwix-lib and libzim
+    'zim-tools': 2, # Depends of libzim (was 1)
     'zimwriterfs': None, # Depends of libzim (was 1)
     'kiwix-desktop': 0 # Depends of kiwix-lib and libzim
 }

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)