From 3c1864c724cb8eac2d47076f2d36e6dce29fdbaf Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 31 Jul 2019 10:24:13 +0200
Subject: [PATCH 1/2] New version of kiwix-lib and kiwix-tools.

Also build libzim and zim-tools because build fails the last time.
---
 kiwixbuild/versions.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py
index 3bb063c..545d9f1 100644
--- a/kiwixbuild/versions.py
+++ b/kiwixbuild/versions.py
@@ -1,8 +1,8 @@
 # This file reference all the versions of the depedencies we use in kiwix-build.
 
 main_project_versions = {
-    'kiwix-lib': '5.1.0',
-    'kiwix-tools': '2.0.0',
+    'kiwix-lib': '5.2.0',
+    'kiwix-tools': '2.1.0',
     'libzim': '5.0.1',
     'zim-tools': '1.0.3',
     'zimwriterfs': '1.3.3',
@@ -25,10 +25,10 @@ main_project_versions = {
 
 release_versions = {
     'libzim': 0, # Depends of base deps (was 0)
-    'kiwix-lib': None, # Depends of libzim (was 0)
+    'kiwix-lib': 0, # Depends of libzim (was 0)
     'kiwix-tools': 0, # Depends of kiwix-lib and libzim (was 0)
-    'zim-tools': None, # Depends of libzim (was 0)
-    'zimwriterfs': 1, # Depends of libzim (was 0)
+    'zim-tools': 0, # Depends of libzim (was 0)
+    'zimwriterfs': 2, # Depends of libzim (was 1)
     'kiwix-desktop': None # Depends of kiwix-lib and libzim (was 0)
 }
 

From 7c2527c38f0fba918f0aafe7bd33abf0c2cf42c9 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 31 Jul 2019 16:36:31 +0200
Subject: [PATCH 2/2] Do not try to download subproject for libzim in flatpak.

---
 kiwixbuild/dependencies/libzim.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kiwixbuild/dependencies/libzim.py b/kiwixbuild/dependencies/libzim.py
index ed0ea24..946ef61 100644
--- a/kiwixbuild/dependencies/libzim.py
+++ b/kiwixbuild/dependencies/libzim.py
@@ -25,4 +25,6 @@ class Libzim(Dependency):
                 return "-Db_bitcode=true"
             if platformInfo.name == 'native_mixed' and option('target') == 'libzim':
                 return "-Dstatic-linkage=true"
+            if platformInfo.name == "flatpak":
+                return "--wrap-mode=nodownload"
             return ""