From 68242735990d00902893fdc945abb40b52621f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 24 Mar 2021 02:56:34 +0000 Subject: [PATCH] Install qt. --- ognibuild/buildlog.py | 4 ++++ ognibuild/requirements.py | 6 ++++++ ognibuild/resolver/apt.py | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/ognibuild/buildlog.py b/ognibuild/buildlog.py index 5d4d7d3..5cdbc25 100644 --- a/ognibuild/buildlog.py +++ b/ognibuild/buildlog.py @@ -54,6 +54,7 @@ from buildlog_consultant.common import ( GnomeCommonMissing, MissingGnomeCommonDependency, UnknownCertificateAuthority, + MissingQt, ) from .fix_build import BuildFixer @@ -88,6 +89,7 @@ from .requirements import ( PythonPackageRequirement, CertificateAuthorityRequirement, NodeModuleRequirement, + QTRequirement, ) from .resolver import UnsatisfiedRequirements @@ -143,6 +145,8 @@ def problem_to_upstream_requirement(problem): # noqa: C901 return JDKRequirement() elif isinstance(problem, MissingJRE): return JRERequirement() + elif isinstance(problem, MissingQt): + return QTRequirement() elif isinstance(problem, UnknownCertificateAuthority): return CertificateAuthorityRequirement(problem.url) elif isinstance(problem, MissingGnomeCommonDependency): diff --git a/ognibuild/requirements.py b/ognibuild/requirements.py index a9aa927..d513982 100644 --- a/ognibuild/requirements.py +++ b/ognibuild/requirements.py @@ -428,6 +428,12 @@ class JRERequirement(Requirement): super(JRERequirement, self).__init__("jre") +class QTRequirement(Requirement): + + def __init__(self): + super(QTRequirement, self).__init__("qt") + + class CertificateAuthorityRequirement(Requirement): def __init__(self, url): diff --git a/ognibuild/resolver/apt.py b/ognibuild/resolver/apt.py index d79a1f7..3b5b631 100644 --- a/ognibuild/resolver/apt.py +++ b/ognibuild/resolver/apt.py @@ -55,6 +55,7 @@ from ..requirements import ( JDKFileRequirement, JDKRequirement, JRERequirement, + QTRequirement, PerlModuleRequirement, PerlFileRequirement, AutoconfMacroRequirement, @@ -435,6 +436,10 @@ def resolve_jre_req(apt_mgr, req): return [AptRequirement.simple('default-jre')] +def resolve_qt_req(apt_mgr, req): + return find_reqs_simple(apt_mgr, ["/usr/lib/.*/qt[0-9]+/bin/qmake"], regex=True) + + def resolve_perl_module_req(apt_mgr, req): DEFAULT_PERL_PATHS = ["/usr/share/perl5"] @@ -539,6 +544,7 @@ APT_REQUIREMENT_RESOLVERS = [ (JDKFileRequirement, resolve_jdk_file_req), (JDKRequirement, resolve_jdk_req), (JRERequirement, resolve_jre_req), + (QTRequirement, resolve_qt_req), (PerlModuleRequirement, resolve_perl_module_req), (PerlFileRequirement, resolve_perl_file_req), (AutoconfMacroRequirement, resolve_autoconf_macro_req),