From f433b25013545814cac12e37ef756986dc74b1d8 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Sun, 18 Aug 2024 15:18:20 +0200 Subject: [PATCH] Kiwix-build doesn't try to build qt nor qtwebengine Fix #714 --- kiwixbuild/dependencies/qt.py | 82 +++++------------------------------ kiwixbuild/versions.py | 2 - 2 files changed, 10 insertions(+), 74 deletions(-) diff --git a/kiwixbuild/dependencies/qt.py b/kiwixbuild/dependencies/qt.py index 1a55ae3f..cfac8064 100644 --- a/kiwixbuild/dependencies/qt.py +++ b/kiwixbuild/dependencies/qt.py @@ -1,87 +1,25 @@ import shutil -from .base import Dependency, ReleaseDownload, MakeBuilder, QMakeBuilder +from .base import Dependency, NoopBuilder, NoopSource -from kiwixbuild.utils import Remotefile, pj, SkipCommand +from kiwixbuild.utils import SkipCommand, colorize class Qt(Dependency): name = "qt" - class Source(ReleaseDownload): - name = "qt" - source_dir = "qt-5.10.1" - archive = Remotefile( - "qt-everywhere-src-5.10.1.tar.xz", - "", - "http://ftp.oregonstate.edu/.1/blfs/conglomeration/qt5/qt-everywhere-src-5.10.1.tar.xz", - ) + Source = NoopSource - class Builder(MakeBuilder): - dependencies = ["icu4c", "zlib"] - dynamic_configure_options = ["-shared"] - static_configure_options = ["-static"] - - @property - def all_configure_options(self): - yield from self.configure_options - if self.buildEnv.configInfo.static: - yield from self.static_configure_options - else: - yield from self.dynamic_configure_options - if not self.target.force_native_build: - yield from self.buildEnv.configInfo.configure_options - yield from ("-prefix", self.buildEnv.install_dir) - yield from ( - "-libdir", - pj(self.buildEnv.install_dir, self.buildEnv.libprefix), - ) - - @property - def configure_options(self): - skip_modules = [ - "qt3d", - "qtcanvas3d", - "qtcharts", - "qtconnectivity", - "qtdatavis3d", - # 'qtdeclarative', - "qtdoc", - "qtgamepad", - "qtgraphicaleffects", - "qtlocation", - "qtmultimedia", - "qtnetworkauth", - "qtpurchasing", - # 'qtquickcontrols', - "qtquickcontrols2", - "qtremoteobjects", - "qtscript", - "qtscxml", - "qtsensors", - "qtserialbus", - "qtserialport", - "qtspeech", - "qtvirtualkeyboard", - "qtwayland", - "qtwebglplugin", - "qtwebsockets", - # 'qtwebview', - ] - yield "-recheck" - yield "-opensource" - yield "-confirm-license" - yield "-ccache" - yield from ("-make", "libs") - for module in skip_modules: - yield from ("-skip", module) + class Builder(NoopBuilder): + def build(self): + error_msg = f"""WARNING: kiwix-build cannot build {self.name} for you. +You must install it yourself using official Qt installer or your distribution system.""" + print(colorize(error_msg, "WARNING")) class QtWebEngine(Dependency): name = "qtwebengine" - Source = Qt.Source + Source = NoopSource - class Builder(QMakeBuilder): - dependencies = ["qt"] - subsource_dir = "qtwebengine" + Builder = Qt.Builder diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index d78bb2a9..ebf97b07 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -56,8 +56,6 @@ "libaria2": "1.37.0", "libmagic": "5.44", "android-ndk": "r21e", - "qt": "5.10.1", - "qtwebengine": "5.10.1", "org.kde": "5.15-23.08", "io.qt.qtwebengine": "5.15-23.08", "zim-testing-suite": "0.6.0",