0
0
mirror of https://github.com/python-LimeReport/containers.git synced 2024-12-23 16:23:00 +03:00
This commit is contained in:
Maxim Slipenko 2024-03-21 18:30:20 +03:00
parent 9b356ef67a
commit a7fbddcdad
2 changed files with 5 additions and 1 deletions

View File

@ -28,9 +28,11 @@ ENV PATH=/root/.local/bin:$PATH
ARG QT_VERSION=6.4.2 ARG QT_VERSION=6.4.2
ENV QT_VERSION=${QT_VERSION} ENV QT_VERSION=${QT_VERSION}
COPY ./scripts/install_qt.sh ./aqt.cfg / 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 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 # TODO
# 1. fixes "test -x /opt/python/cp39-cp39/bin/python" # 1. fixes "test -x /opt/python/cp39-cp39/bin/python"

View File

@ -7,5 +7,7 @@ echo "Qt version: $QT_VERSION"
# if qt verion is 6.5.3 apply fix # if qt verion is 6.5.3 apply fix
if [ "$QT_VERSION" = "6.5.3" ]; then if [ "$QT_VERSION" = "6.5.3" ]; then
echo "Apply fix-build-vaappi-version-1.9.0.diff" echo "Apply fix-build-vaappi-version-1.9.0.diff"
cd ./qtmultimedia
patch -p1 < "$BASE_FOLDER/fix-build-vaappi-version-1.9.0.diff" patch -p1 < "$BASE_FOLDER/fix-build-vaappi-version-1.9.0.diff"
cd ..
fi fi