diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2022-01-10 20:34:57 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-11 13:47:32 +0000 |
| commit | afa2f46691745eef09c48c48f2ce7a3ad42a2f7a (patch) | |
| tree | 3e489517748011877219283b548a59cbb431bb11 | |
| parent | fd0e5d85b025fac8d7fd4df2bc80e2a8be573db9 (diff) | |
Provisioning: Change installation order between libicu and gtk3
Gtk3-devel includes dependency which conflicts with libicu-devel.
Changing installation order should solve it
Change-Id: Iaba3e1710c2a82ec2bab076c88a7afb33896d4bc
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 1e8939b4b2a07e8d115fc3b2c91b00d499925df4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh index 42beba81..14902653 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh @@ -66,6 +66,9 @@ sudo zypper -nq install p7zip # EGL support sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel +# ICU +sudo zypper -nq install libicu-devel libicu-suse65_1 + # gtk3 style for QtGui/QStyle sudo zypper -nq install gtk3-devel @@ -76,9 +79,6 @@ sudo zypper -nq install libXi-devel postgresql13 postgresql13-devel mysql-devel sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \ xcb-util-wm-devel xcb-util-renderutil-devel -# ICU -sudo zypper -nq install libicu-devel libicu-suse65_1 - # qtwebengine sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \ libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ |