From e7e65e4693ec9b5d5db198e1f5afbf75b5bd15b4 Mon Sep 17 00:00:00 2001
From: Vostretsov Nikita <whalebot.helmsman@gmail.com>
Date: Tue, 2 Jun 2020 07:21:18 +0000
Subject: [PATCH] use exact PyQt version

---
 Dockerfile                          | 3 ---
 dockerfiles/splash/install-pyqt5.sh | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6669c999d..aa0975158 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -137,9 +137,6 @@ ENV LD_LIBRARY_PATH="/opt/qt-${QT_SHORT_VERSION}/${QT_FULL_VERSION}/gcc_64/lib:$
 
 FROM splash-base as qt5-builder
 
-ARG QT_MAJOR_VERSION
-ENV QT_MAJOR_VERSION=${QT_MAJOR_VERSION}
-
 ARG SPLASH_BUILD_PARALLEL_JOBS
 ENV SPLASH_BUILD_PARALLEL_JOBS=${SPLASH_BUILD_PARALLEL_JOBS}
 
diff --git a/dockerfiles/splash/install-pyqt5.sh b/dockerfiles/splash/install-pyqt5.sh
index f61ee2354..1d0940995 100755
--- a/dockerfiles/splash/install-pyqt5.sh
+++ b/dockerfiles/splash/install-pyqt5.sh
@@ -8,7 +8,7 @@ pushd /tmp/builds && \
 # sip
 tar xzf "$1" --keep-newer-files -C sip --strip-components 1 && \
 pushd sip && \
-${_PYTHON} configure.py --sip-module PyQt${QT_MAJOR_VERSION}.sip && \
+${_PYTHON} configure.py --sip-module PyQt5.sip && \
 make -j ${SPLASH_BUILD_PARALLEL_JOBS} && \
 make install && \
 popd && \
@@ -34,7 +34,7 @@ ${_PYTHON} configure.py -c -j ${SPLASH_BUILD_PARALLEL_JOBS} \
 make -j ${SPLASH_BUILD_PARALLEL_JOBS} && \
 make install && \
 popd  && \
-${_PYTHON} -c "import PyQt${QT_MAJOR_VERSION}.QtCore; print(PyQt${QT_MAJOR_VERSION}.QtCore.__file__)"
+${_PYTHON} -c "import PyQt5.QtCore; print(PyQt5.QtCore.__file__)"
 
 # Builds Complete
 popd