From afd17b2986284333d9eb694542298471a86bc421 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 23 Jun 2021 17:27:05 +0200
Subject: [PATCH] Make kiwix-desktop flatpak use last version of Qt (5.15).

Adapt flatpack_builder to generate the same manifest than PR
flathub/org.kiwix.desktop#6
---
 kiwixbuild/dependencies/base.py          |  2 ++
 kiwixbuild/dependencies/kiwix_desktop.py | 19 +++++++++++++++----
 kiwixbuild/flatpak_builder.py            |  2 ++
 kiwixbuild/versions.py                   |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py
index a4702ca..bb8637d 100644
--- a/kiwixbuild/dependencies/base.py
+++ b/kiwixbuild/dependencies/base.py
@@ -294,6 +294,8 @@ class Builder:
             module['buildsystem'] = self.flatpak_buildsystem
         if getattr(self, 'subsource_dir', None):
             module['subdir'] = self.subsource_dir
+        if getattr(self, 'flatpack_build_options', None):
+            module['build-options'] = self.flatpack_build_options
         if getattr(self, 'configure_option', ''):
             module['config-opts'] = self.configure_option.split(' ')
 
diff --git a/kiwixbuild/dependencies/kiwix_desktop.py b/kiwixbuild/dependencies/kiwix_desktop.py
index 86726a9..ec1611b 100644
--- a/kiwixbuild/dependencies/kiwix_desktop.py
+++ b/kiwixbuild/dependencies/kiwix_desktop.py
@@ -16,11 +16,22 @@ class KiwixDesktop(Dependency):
         make_install_target = 'install'
         configure_env = None
 
+        flatpack_build_options = {
+            "env": [
+                "QMAKEPATH=/app/lib"
+            ]
+        }
+
         @property
         def configure_option(self):
             if self.buildEnv.platformInfo.name == 'flatpak':
-                return []
-            options = ["PREFIX={}".format(self.buildEnv.install_dir)]
-            if self.buildEnv.platformInfo.static:
-                options.append('"CONFIG+=static"')
+                options = [
+                    'QMAKE_INCDIR+=/app/include/QtWebEngine',
+                    'QMAKE_INCDIR+=/app/include/QtWebEngineCore',
+                    'QMAKE_INCDIR+=/app/include/QtWebEngineWidgets'
+                ]
+            else:
+                options = ["PREFIX={}".format(self.buildEnv.install_dir)]
+                if self.buildEnv.platformInfo.static:
+                    options.append('"CONFIG+=static"')
             return " ".join(options)
diff --git a/kiwixbuild/flatpak_builder.py b/kiwixbuild/flatpak_builder.py
index f0c4a59..208ac77 100644
--- a/kiwixbuild/flatpak_builder.py
+++ b/kiwixbuild/flatpak_builder.py
@@ -33,6 +33,8 @@ MANIFEST = {
     'app-id': 'org.kiwix.desktop',
     'runtime': 'org.kde.Platform',
     'runtime-version': base_deps_versions['org.kde'],
+    'base': 'io.qt.qtwebengine.BaseApp',
+    'base-version': base_deps_versions['org.kde'], # keep BaseApp (qwebengine) in sync with org.kde
     'sdk': 'org.kde.Sdk',
     'command': 'kiwix-desktop',
     'rename-icon': 'kiwix-desktop',
diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py
index 0d7d619..382cd97 100644
--- a/kiwixbuild/versions.py
+++ b/kiwixbuild/versions.py
@@ -59,6 +59,6 @@ base_deps_versions = {
   'android-ndk' : 'r13b',
   'qt' : '5.10.1',
   'qtwebengine' : '5.10.1',
-  'org.kde' : '5.12',
+  'org.kde' : '5.15',
   'zim-testing-suite': '0.3',
 }