From 703cac1f70384cdfbe9e7867216085ca9220ff74 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Thu, 29 Nov 2018 11:40:16 +0100
Subject: [PATCH 1/4] Do not compile libcurl in flatpak.

---
 kiwixbuild/packages.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kiwixbuild/packages.py b/kiwixbuild/packages.py
index 54fb6bd..0cfac46 100644
--- a/kiwixbuild/packages.py
+++ b/kiwixbuild/packages.py
@@ -14,6 +14,7 @@ PACKAGE_NAME_MAPPERS = {
         'uuid': True,
         'libxml2': True,
         'libssl': True,
+        'libcurl': True,
     },
     'fedora_native_dyn': {
         'COMMON': _fedora_common,

From f96ae19c8818c5fc53eef2c00dcda25bb3fe5fb0 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Thu, 29 Nov 2018 11:41:11 +0100
Subject: [PATCH 2/4] Disable websocket support in aria2.

We don't need it. It could speed up a bit the compilation.
---
 kiwixbuild/dependencies/aria2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kiwixbuild/dependencies/aria2.py b/kiwixbuild/dependencies/aria2.py
index 8432058..e2d5dbb 100644
--- a/kiwixbuild/dependencies/aria2.py
+++ b/kiwixbuild/dependencies/aria2.py
@@ -23,4 +23,4 @@ class Aria2(Dependency):
 
     class Builder(MakeBuilder):
         dependencies = ['zlib']
-        configure_option = "--disable-libaria2 --without-sqlite3"
+        configure_option = "--disable-libaria2 --disable-websocket --without-sqlite3"

From 92d637ad994e19b23718cc8f99401211627254d5 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Thu, 29 Nov 2018 11:42:28 +0100
Subject: [PATCH 3/4] Better flatpak build.

- Print the name of the module instead of the builder.
- Do not try to build the kiwix-desktop dependencies in the flatpak.
- Correct the path of the created flatpak.
---
 kiwixbuild/flatpak_builder.py | 2 +-
 travis/compile_all.py         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kiwixbuild/flatpak_builder.py b/kiwixbuild/flatpak_builder.py
index 4f44a61..1ff6f05 100644
--- a/kiwixbuild/flatpak_builder.py
+++ b/kiwixbuild/flatpak_builder.py
@@ -181,7 +181,7 @@ class FlatpakBuilder:
                 elif isinstance(builder, QMakeBuilder):
                     module['buildsystem'] = 'qmake'
                 # config-opts
-                print(builder)
+                print(module['name'])
                 if getattr(builder, 'configure_option', ''):
                     module['config-opts'] = builder.configure_option.split(' ')
 
diff --git a/travis/compile_all.py b/travis/compile_all.py
index 3ba00b9..8a184f1 100755
--- a/travis/compile_all.py
+++ b/travis/compile_all.py
@@ -115,7 +115,7 @@ def create_desktop_image():
         src_dir = SOURCE_DIR/'kiwix-desktop'
 
     if PLATFORM == 'flatpak':
-        build_path = BASE_DIR/'BUILD_flatpak'/'org.kiwix.Client.flatpak'
+        build_path = BASE_DIR/'org.kiwix.Client.flatpak'
         app_name = 'org.kiwix.Client.{}.flatpak'.format(postfix)
     else:
         build_path = HOME/'Kiwix-x86_64.AppImage'
@@ -335,7 +335,7 @@ else:
     TARGETS = ('libzim', 'zim-tools', 'kiwix-lib', 'kiwix-tools')
 
 for target in TARGETS:
-    if environ['TRAVIS_EVENT_TYPE'] == 'cron' and PLATFORM != 'android':
+    if environ['TRAVIS_EVENT_TYPE'] == 'cron' and PLATFORM not in ('android', 'flatpak'):
         run_kiwix_build(target,
                         platform=PLATFORM,
                         build_deps_only=True)

From 9679c01254f099760bf08dae44e29327be91e618 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Thu, 29 Nov 2018 12:30:28 +0100
Subject: [PATCH 4/4] Run docker with all privileges.

---
 .travis.yml                   | 2 +-
 kiwixbuild/flatpak_builder.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 39a5ffe..2e0e152 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ script:
     else
       docker build -t kiwix/build -f travis/Dockerfile .
     fi
-    docker run -e PLATFORM -e NIGHTLY_DATE -e TRAVIS_EVENT_TYPE -e TRAVIS_BUILD_DIR -e DESKTOP_ONLY -e TRAVIS_TAG --device /dev/fuse --cap-add ALL kiwix/build
+    docker run -e PLATFORM -e NIGHTLY_DATE -e TRAVIS_EVENT_TYPE -e TRAVIS_BUILD_DIR -e DESKTOP_ONLY -e TRAVIS_TAG --device /dev/fuse --cap-add ALL --privileged kiwix/build
   else
     travis/compile_all.py
   fi
diff --git a/kiwixbuild/flatpak_builder.py b/kiwixbuild/flatpak_builder.py
index 1ff6f05..a526658 100644
--- a/kiwixbuild/flatpak_builder.py
+++ b/kiwixbuild/flatpak_builder.py
@@ -214,6 +214,7 @@ class FlatpakBuilder:
             try:
                 with open(log, 'r') as f:
                     print(f.read())
+                raise StopBuild()
             except:
                 pass
 
@@ -229,6 +230,7 @@ class FlatpakBuilder:
             try:
                 with open(log, 'r') as f:
                     print(f.read())
+                raise StopBuild()
             except:
                 pass