From 9c5af22a53a13d6b8e80e51ac611c8887684d65d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 10 Jan 2022 20:34:57 +0200 Subject: Provisioning: Change installation order between libicu and gtk3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gtk3-devel includes dependency which conflicts with libicu-devel. Changing installation order should solve it Change-Id: Iaba3e1710c2a82ec2bab076c88a7afb33896d4bc Reviewed-by: Simo Fält (cherry picked from commit 1e8939b4b2a07e8d115fc3b2c91b00d499925df4) Reviewed-by: Qt Cherry-pick Bot --- .../provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh | 6 +++--- 1 file 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 0579712a..f3f9e321 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 @@ -72,6 +72,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 @@ -82,9 +85,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 \ -- cgit v1.2.3