From d375cc06bccd769b34fe50f74d7cae4abd2f482f Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 27 Nov 2018 10:11:08 +0100
Subject: [PATCH] Do not try to compiled dependencies already in the
 org.kde.Platform.

---
 kiwixbuild/flatpak_builder.py | 14 +-------------
 kiwixbuild/packages.py        | 12 ++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/kiwixbuild/flatpak_builder.py b/kiwixbuild/flatpak_builder.py
index 1366061..b37bd46 100644
--- a/kiwixbuild/flatpak_builder.py
+++ b/kiwixbuild/flatpak_builder.py
@@ -230,28 +230,16 @@ class FlatpakBuilder:
 
 
     def _get_packages(self):
-        packages_list = []
-        for platform in PlatformInfo.all_running_platforms.values():
-            mapper_name = "{host}_{target}".format(
-                host=neutralEnv('distname'),
-                target=platform)
-            package_name_mapper = PACKAGE_NAME_MAPPERS.get(mapper_name, {})
-            packages_list += package_name_mapper.get('COMMON', [])
+        package_name_mapper = PACKAGE_NAME_MAPPERS.get('flatpak', {})
 
         to_drop = []
         for builderDef in self._targets:
             platformName, builderName = builderDef
-            mapper_name = "{host}_{target}".format(
-                host=neutralEnv('distname'),
-                target=platformName)
-            package_name_mapper = PACKAGE_NAME_MAPPERS.get(mapper_name, {})
             packages = package_name_mapper.get(builderName)
             if packages:
-                packages_list += packages
                 to_drop.append(builderDef)
         for dep in to_drop:
             del self._targets[dep]
-        return packages_list
 
     def run(self):
         try:
diff --git a/kiwixbuild/packages.py b/kiwixbuild/packages.py
index c5d2f72..7f64dde 100644
--- a/kiwixbuild/packages.py
+++ b/kiwixbuild/packages.py
@@ -3,6 +3,18 @@
 _fedora_common = ['automake', 'libtool', 'cmake', 'git', 'subversion', 'ccache', 'pkgconfig', 'gcc-c++', 'gettext-devel']
 _debian_common = ['automake', 'libtool', 'cmake', 'git', 'subversion', 'ccache', 'pkg-config', 'gcc', 'autopoint']
 PACKAGE_NAME_MAPPERS = {
+    'flatpak': {
+        'zlib': True,
+        'lzma': True,
+        'icu4c': True,
+        'qt': True,
+        'qtwebengine': True,
+        'ctpp2': True,
+        'ctpp2c': True,
+        'uuid': True,
+        'libxml2': True,
+        'libssl': True,
+    },
     'fedora_native_dyn': {
         'COMMON': _fedora_common,
         'uuid': ['libuuid-devel'],