From b8160de652fbdcfaeb17d0131cf365a39c5137eb Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 29 Jun 2021 15:47:59 +0200
Subject: [PATCH] Correctly install io.qt.qtwebengine.BaseApp for flatpak
 build.

---
 kiwixbuild/dependencies/flatpak.py | 31 ++++++++++++++++++++++++++++++
 kiwixbuild/platforms/flatpak.py    |  2 +-
 kiwixbuild/versions.py             |  1 +
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/kiwixbuild/dependencies/flatpak.py b/kiwixbuild/dependencies/flatpak.py
index b64fb5b..d4764ec 100644
--- a/kiwixbuild/dependencies/flatpak.py
+++ b/kiwixbuild/dependencies/flatpak.py
@@ -35,3 +35,34 @@ class org_kde(Dependency):
             self.command('setup_remote', self._setup_remote)
             self.command('install_sdk', self._install_sdk)
 
+
+class org_kde(Dependency):
+    neutral = False
+    name = 'io.qt.qtwebengine'
+
+    Source = NoopSource
+
+    class Builder(Builder):
+        def _setup_remote(self, context):
+            command = "flatpak --user remote-add --if-not-exists {remote_name} {remote_url}"
+            command = command.format(
+                remote_name = 'flathub',
+                remote_url = 'https://flathub.org/repo/flathub.flatpakrepo'
+            )
+            env = self.buildEnv.get_env(cross_comp_flags=False, cross_compilers=False, cross_path=False)
+            run_command(command, self.buildEnv.build_dir, context, env=env)
+
+        def _install_sdk(self, context):
+            command = "flatpak --user install -y {remote_name} {name}.BaseApp//{version}"
+            command = command.format(
+                remote_name = 'flathub',
+                name = self.target.name,
+                version = self.target.version()
+            )
+            env = self.buildEnv.get_env(cross_comp_flags=False, cross_compilers=False, cross_path=False)
+            run_command(command, self.buildEnv.build_dir, context, env=env)
+
+        def build(self):
+            self.command('setup_remote', self._setup_remote)
+            self.command('install_sdk', self._install_sdk)
+
diff --git a/kiwixbuild/platforms/flatpak.py b/kiwixbuild/platforms/flatpak.py
index 81ad37a..4cd8342 100644
--- a/kiwixbuild/platforms/flatpak.py
+++ b/kiwixbuild/platforms/flatpak.py
@@ -5,7 +5,7 @@ class FlatpakPlatformInfo(PlatformInfo):
     name = 'flatpak'
     build = 'flatpak'
     static = ''
-    toolchain_names = ['org.kde']
+    toolchain_names = ['org.kde', 'io.qt.qtwebengine']
     compatible_hosts = ['debian', 'fedora']
 
     def __str__(self):
diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py
index 382cd97..fe5eba1 100644
--- a/kiwixbuild/versions.py
+++ b/kiwixbuild/versions.py
@@ -60,5 +60,6 @@ base_deps_versions = {
   'qt' : '5.10.1',
   'qtwebengine' : '5.10.1',
   'org.kde' : '5.15',
+  'io.qt.qtwebengine' : '5.15',
   'zim-testing-suite': '0.3',
 }