diff options
| author | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-05-24 00:19:52 -0500 |
|---|---|---|
| committer | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-05-24 00:19:52 -0500 |
| commit | dad7de1e534837f9ea677925e7c87a3d816f9baa (patch) | |
| tree | 03cfdf13f932f23d5a626ca66bd9615a614bcba6 /docker | |
| parent | 12ce612e00af99990d364b1b74aca39e81b4d56f (diff) | |
Update MO2 beta 12 integration
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 20 | ||||
| -rwxr-xr-x | docker/build-inner.sh | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index fe5e21a..161706e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ liblz4-dev zlib1g-dev libzstd-dev libbz2-dev liblzma-dev \ libssl-dev libcurl4-openssl-dev \ libtomlplusplus-dev \ - # Qt 6 runtime deps (aqtinstall provides Qt 6.10 headers/tools/libs for build) + # Qt 6 runtime deps (aqtinstall provides Qt 6.11 headers/tools/libs for build) kde-style-breeze \ libgl-dev libopengl-dev libvulkan-dev libxkbcommon-dev libfontconfig1-dev \ libfreetype-dev libx11-dev libxext-dev libxfixes-dev \ @@ -57,21 +57,21 @@ RUN uv python install --install-dir /opt/uv-tmp "${PYTHON_VERSION}" && \ ENV BUILD_PYTHON=/opt/python-bundled/bin/python3 ENV PATH="/opt/python-bundled/bin:${PATH}" -# ── Qt 6.10 via aqtinstall (one-off via uv tool run) ── -RUN uv tool run --from aqtinstall aqt install-qt linux desktop 6.10.2 linux_gcc_64 \ - -m qtwebsockets qtwaylandcompositor qtnetworkauth \ +# ── Qt 6.11 via aqtinstall (one-off via uv tool run) ── +RUN uv tool run --from aqtinstall aqt install-qt linux desktop 6.11.1 linux_gcc_64 \ + -m qtwebsockets qtwaylandcompositor qtnetworkauth qttasktree \ --outputdir /opt/qt6 && \ - ls /opt/qt6/6.10.2/gcc_64/bin/qmake -ENV Qt6_DIR=/opt/qt6/6.10.2/gcc_64 -ENV CMAKE_PREFIX_PATH="/opt/qt6/6.10.2/gcc_64:${CMAKE_PREFIX_PATH}" -ENV PATH="/opt/qt6/6.10.2/gcc_64/bin:${PATH}" -ENV LD_LIBRARY_PATH="/opt/qt6/6.10.2/gcc_64/lib:${LD_LIBRARY_PATH}" + ls /opt/qt6/6.11.1/gcc_64/bin/qmake +ENV Qt6_DIR=/opt/qt6/6.11.1/gcc_64 +ENV CMAKE_PREFIX_PATH="/opt/qt6/6.11.1/gcc_64:${CMAKE_PREFIX_PATH}" +ENV PATH="/opt/qt6/6.11.1/gcc_64/bin:${PATH}" +ENV LD_LIBRARY_PATH="/opt/qt6/6.11.1/gcc_64/lib:${LD_LIBRARY_PATH}" # ── Build-time Python packages ── # pybind11/sip/etc. for compiling mobase.so; PyQt6 is staged into the distribution. RUN uv pip install --system --break-system-packages \ --python /opt/python-bundled/bin/python3 --no-cache \ - pybind11==2.13.6 sip psutil larian-formats==0.8.1 vdf "PyQt6>=6.10,<6.11" + pybind11==2.13.6 sip psutil larian-formats==0.8.1 vdf "PyQt6>=6.11,<6.12" # ── Rust toolchain ── RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \ diff --git a/docker/build-inner.sh b/docker/build-inner.sh index 888894a..a392645 100755 --- a/docker/build-inner.sh +++ b/docker/build-inner.sh @@ -216,7 +216,7 @@ done QT6_PLUGIN_DIR="" for _candidate in \ "${Qt6_DIR:-}/plugins" \ - "/opt/qt6/6.10.2/gcc_64/plugins" \ + "/opt/qt6/6.11.1/gcc_64/plugins" \ "/usr/lib/x86_64-linux-gnu/qt6/plugins"; do if [ -d "${_candidate}" ]; then QT6_PLUGIN_DIR="${_candidate}" |