From a282bd8ce355a3b63cc32754da44f6d6dbeef297 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 2 Apr 2019 10:54:03 +0200 Subject: [PATCH 1/2] Allow a list of packages to install to be set `True` to skip installation. This can allow a dependency to be marked as installed even if there is nothing to install. --- kiwixbuild/builder.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kiwixbuild/builder.py b/kiwixbuild/builder.py index 8a5dbba..4462fd4 100644 --- a/kiwixbuild/builder.py +++ b/kiwixbuild/builder.py @@ -136,8 +136,10 @@ class Builder: package_name_mapper = PACKAGE_NAME_MAPPERS.get(mapper_name, {}) packages = package_name_mapper.get(builderName) if packages: - packages_list += packages to_drop.append(builderDef) + if packages is not True: + # True means "assume the dependency is install but do not try to install anything for it" + packages_list += packages for dep in to_drop: del self._targets[dep] return packages_list From 3022361d7e02197ca850be9e3ba4468b4c107bbc Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 2 Apr 2019 10:54:24 +0200 Subject: [PATCH 2/2] Add a list of package to install on fedora for qt. --- kiwixbuild/packages.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kiwixbuild/packages.py b/kiwixbuild/packages.py index 6a11de7..ad77415 100644 --- a/kiwixbuild/packages.py +++ b/kiwixbuild/packages.py @@ -27,6 +27,8 @@ PACKAGE_NAME_MAPPERS = { 'file' : ['file-devel'], 'gumbo' : ['gumbo-parser-devel'], 'aria2': ['aria2'], + 'qt': ['qt5-qtbase-devel', 'qt5-devel', 'qt5-qtsvg'], + 'qtwebengine': ['qt5-qtwebengine-devel'] }, 'fedora_native_static': { 'COMMON': _fedora_common + ['glibc-static', 'libstdc++-static'],