Install qt.
This commit is contained in:
parent
d4021d8220
commit
6824273599
3 changed files with 16 additions and 0 deletions
|
@ -54,6 +54,7 @@ from buildlog_consultant.common import (
|
||||||
GnomeCommonMissing,
|
GnomeCommonMissing,
|
||||||
MissingGnomeCommonDependency,
|
MissingGnomeCommonDependency,
|
||||||
UnknownCertificateAuthority,
|
UnknownCertificateAuthority,
|
||||||
|
MissingQt,
|
||||||
)
|
)
|
||||||
|
|
||||||
from .fix_build import BuildFixer
|
from .fix_build import BuildFixer
|
||||||
|
@ -88,6 +89,7 @@ from .requirements import (
|
||||||
PythonPackageRequirement,
|
PythonPackageRequirement,
|
||||||
CertificateAuthorityRequirement,
|
CertificateAuthorityRequirement,
|
||||||
NodeModuleRequirement,
|
NodeModuleRequirement,
|
||||||
|
QTRequirement,
|
||||||
)
|
)
|
||||||
from .resolver import UnsatisfiedRequirements
|
from .resolver import UnsatisfiedRequirements
|
||||||
|
|
||||||
|
@ -143,6 +145,8 @@ def problem_to_upstream_requirement(problem): # noqa: C901
|
||||||
return JDKRequirement()
|
return JDKRequirement()
|
||||||
elif isinstance(problem, MissingJRE):
|
elif isinstance(problem, MissingJRE):
|
||||||
return JRERequirement()
|
return JRERequirement()
|
||||||
|
elif isinstance(problem, MissingQt):
|
||||||
|
return QTRequirement()
|
||||||
elif isinstance(problem, UnknownCertificateAuthority):
|
elif isinstance(problem, UnknownCertificateAuthority):
|
||||||
return CertificateAuthorityRequirement(problem.url)
|
return CertificateAuthorityRequirement(problem.url)
|
||||||
elif isinstance(problem, MissingGnomeCommonDependency):
|
elif isinstance(problem, MissingGnomeCommonDependency):
|
||||||
|
|
|
@ -428,6 +428,12 @@ class JRERequirement(Requirement):
|
||||||
super(JRERequirement, self).__init__("jre")
|
super(JRERequirement, self).__init__("jre")
|
||||||
|
|
||||||
|
|
||||||
|
class QTRequirement(Requirement):
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
super(QTRequirement, self).__init__("qt")
|
||||||
|
|
||||||
|
|
||||||
class CertificateAuthorityRequirement(Requirement):
|
class CertificateAuthorityRequirement(Requirement):
|
||||||
|
|
||||||
def __init__(self, url):
|
def __init__(self, url):
|
||||||
|
|
|
@ -55,6 +55,7 @@ from ..requirements import (
|
||||||
JDKFileRequirement,
|
JDKFileRequirement,
|
||||||
JDKRequirement,
|
JDKRequirement,
|
||||||
JRERequirement,
|
JRERequirement,
|
||||||
|
QTRequirement,
|
||||||
PerlModuleRequirement,
|
PerlModuleRequirement,
|
||||||
PerlFileRequirement,
|
PerlFileRequirement,
|
||||||
AutoconfMacroRequirement,
|
AutoconfMacroRequirement,
|
||||||
|
@ -435,6 +436,10 @@ def resolve_jre_req(apt_mgr, req):
|
||||||
return [AptRequirement.simple('default-jre')]
|
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):
|
def resolve_perl_module_req(apt_mgr, req):
|
||||||
DEFAULT_PERL_PATHS = ["/usr/share/perl5"]
|
DEFAULT_PERL_PATHS = ["/usr/share/perl5"]
|
||||||
|
|
||||||
|
@ -539,6 +544,7 @@ APT_REQUIREMENT_RESOLVERS = [
|
||||||
(JDKFileRequirement, resolve_jdk_file_req),
|
(JDKFileRequirement, resolve_jdk_file_req),
|
||||||
(JDKRequirement, resolve_jdk_req),
|
(JDKRequirement, resolve_jdk_req),
|
||||||
(JRERequirement, resolve_jre_req),
|
(JRERequirement, resolve_jre_req),
|
||||||
|
(QTRequirement, resolve_qt_req),
|
||||||
(PerlModuleRequirement, resolve_perl_module_req),
|
(PerlModuleRequirement, resolve_perl_module_req),
|
||||||
(PerlFileRequirement, resolve_perl_file_req),
|
(PerlFileRequirement, resolve_perl_file_req),
|
||||||
(AutoconfMacroRequirement, resolve_autoconf_macro_req),
|
(AutoconfMacroRequirement, resolve_autoconf_macro_req),
|
||||||
|
|
Loading…
Add table
Reference in a new issue