diff --git a/manylinux_2_31/Dockerfile b/manylinux_2_31/Dockerfile index 648a3b7..e86121a 100644 --- a/manylinux_2_31/Dockerfile +++ b/manylinux_2_31/Dockerfile @@ -28,9 +28,11 @@ ENV PATH=/root/.local/bin:$PATH ARG QT_VERSION=6.4.2 ENV QT_VERSION=${QT_VERSION} + COPY ./scripts/install_qt.sh ./aqt.cfg / +RUN aqt -c /aqt.cfg install-src --outputdir /opt/Qt-src linux ${QT_VERSION} COPY ./qt-patches/ /qt-patches -RUN /install_qt.sh && rm -f /install_qt.sh +RUN cd /opt/Qt-src/${QT_VERSION}/Src && /qt-patches/apply-patches.sh # TODO # 1. fixes "test -x /opt/python/cp39-cp39/bin/python" diff --git a/qt-patches/apply-patches.sh b/qt-patches/apply-patches.sh index 42276fe..1ee4eed 100755 --- a/qt-patches/apply-patches.sh +++ b/qt-patches/apply-patches.sh @@ -7,5 +7,7 @@ echo "Qt version: $QT_VERSION" # if qt verion is 6.5.3 apply fix if [ "$QT_VERSION" = "6.5.3" ]; then echo "Apply fix-build-vaappi-version-1.9.0.diff" + cd ./qtmultimedia patch -p1 < "$BASE_FOLDER/fix-build-vaappi-version-1.9.0.diff" + cd .. fi \ No newline at end of file