From 52b4341b89505285703c3adafc344e995a0bca27 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Sun, 1 Mar 2020 17:03:07 +0100
Subject: [PATCH] centos-7: Update Qt to 5.12.7
---
centos-7/Dockerfile | 15 +++++----------
centos-7/ldconfig/qt5.conf | 1 -
centos-7/qtifwsilent.qs | 4 ++--
3 files changed, 7 insertions(+), 13 deletions(-)
delete mode 100644 centos-7/ldconfig/qt5.conf
diff --git a/centos-7/Dockerfile b/centos-7/Dockerfile
index db5f835..28ee69c 100644
--- a/centos-7/Dockerfile
+++ b/centos-7/Dockerfile
@@ -97,10 +97,11 @@ RUN version=1.10.5 && \
rm -rf hdf5-${version}*
# Qt
-ENV Qt5_DIR /opt/qt5/5.12.6/gcc_64/lib/cmake/Qt5
+ENV Qt5_DIR /opt/qt5/5.12.7/gcc_64/lib/cmake/Qt5
ADD qtifwsilent.qs /tmp/qtifwsilent.qs
-RUN version=5.12.6 && \
+RUN version=5.12.7 && \
yum install -y \
+ libxkbcommon-x11 \
pulseaudio-libs \
pulseaudio-libs-glib2 \
gstreamer1-plugins-base \
@@ -112,7 +113,8 @@ RUN version=5.12.6 && \
chmod +x qt-opensource-linux-x64-${version}.run && \
env QT_INSTALL_DIR=/opt/qt5 ./qt-opensource-linux-x64-${version}.run --script qtifwsilent.qs -platform minimal && \
rm -f qt-opensource-linux-x64-${version}.run && \
- rm -f qtifwsilent.qs
+ rm -f qtifwsilent.qs && \
+ echo "/opt/qt5/${version}/gcc_64/lib" > /etc/ld.so.conf.d/qt5.conf
# linuxdeployqt
RUN version=6 && \
@@ -336,12 +338,6 @@ RUN version=0.9.9.5 && \
ADD agki-nas01.imp.fu-berlin.de-ca-cert.crt /etc/pki/ca-trust/source/anchors/agki-nas01.imp.fu-berlin.de-ca-cert.crt
RUN update-ca-trust
-# Potential runtime dependencies for AppImages
-RUN yum install -y \
- libxkbcommon-x11 \
- && \
- yum clean all
-
# Additional development dependencies
RUN yum install -y \
libepoxy-devel \
@@ -356,5 +352,4 @@ RUN yum install -y \
twine
ADD ldconfig/local.conf /etc/ld.so.conf.d/local.conf
-ADD ldconfig/qt5.conf /etc/ld.so.conf.d/qt5.conf
RUN ldconfig
diff --git a/centos-7/ldconfig/qt5.conf b/centos-7/ldconfig/qt5.conf
deleted file mode 100644
index 4a31c54..0000000
--- a/centos-7/ldconfig/qt5.conf
+++ /dev/null
@@ -1 +0,0 @@
-/opt/qt5/5.12.6/gcc_64/lib
diff --git a/centos-7/qtifwsilent.qs b/centos-7/qtifwsilent.qs
index e421e72..3ed8866 100644
--- a/centos-7/qtifwsilent.qs
+++ b/centos-7/qtifwsilent.qs
@@ -25,8 +25,8 @@ Controller.prototype.TargetDirectoryPageCallback = function() {
Controller.prototype.ComponentSelectionPageCallback = function() {
var widget = gui.currentPageWidget();
widget.deselectAll();
- widget.selectComponent("qt.qt5.5126.gcc_64");
- widget.selectComponent("qt.qt5.5126.qtcharts");
+ widget.selectComponent("qt.qt5.5127.gcc_64");
+ widget.selectComponent("qt.qt5.5127.qtcharts");
gui.clickButton(buttons.NextButton);
}
--
GitLab