From e679091f5034124b84d86fe8d9cb2cc573dacabe Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 2 Sep 2022 09:06:42 +0200 Subject: [PATCH] Provisioning: Install xcb-cursor libs and headers Task-number: QTQAINFRA-5067 Change-Id: I8199eb36868cdb66baf4228d5cd3e7fa627acf76 Reviewed-by: Heikki Halmet --- .../qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh | 5 +++++ .../qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh | 2 +- 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh index 4b3fe2d8..6560e102 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh @@ -128,6 +128,9 @@ installPackages+=(xcb-util-image-devel) installPackages+=(xcb-util-keysyms-devel) installPackages+=(xcb-util-wm-devel) installPackages+=(xcb-util-renderutil-devel) +installPackages+=(xcb-util-cursor) +installPackages+=(xcb-util-cursor-devel) + # ODBC support installPackages+=(unixODBC-devel) installPackages+=(unixODBC) diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh index 384bdf03..c37c5a7d 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh @@ -131,6 +131,9 @@ installPackages+=(xcb-util-image-devel) installPackages+=(xcb-util-keysyms-devel) installPackages+=(xcb-util-wm-devel) installPackages+=(xcb-util-renderutil-devel) +installPackages+=(xcb-util-cursor) +installPackages+=(xcb-util-cursor-devel) + # ODBC support installPackages+=(unixODBC-devel) installPackages+=(unixODBC) diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh index a8171dfd..a442f5aa 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh @@ -136,6 +136,9 @@ installPackages+=(xcb-util-image-devel) installPackages+=(xcb-util-keysyms-devel) installPackages+=(xcb-util-wm-devel) installPackages+=(xcb-util-renderutil-devel) +installPackages+=(xcb-util-cursor) +installPackages+=(xcb-util-cursor-devel) + # ODBC support installPackages+=(unixODBC-devel) installPackages+=(unixODBC) diff --git a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh index f4ebbfc2..cb99d172 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh @@ -85,6 +85,11 @@ sudo zypper -nq install libXi-devel postgresql14 postgresql14-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 +# temporary solution for libxcb-cursor0 xcb-util-cursor-devel +sudo zypper addrepo --no-gpgcheck https://download.opensuse.org/repositories/home:liangqi_qt:branches:SUSE:SLE-15-SP4:GA/standard/home:liangqi_qt:branches:SUSE:SLE-15-SP4:GA.repo +sudo zypper refresh +sudo zypper -nq install --force-resolution libxcb-cursor0 xcb-util-cursor-devel + # qtwebengine sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \ libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh index 982faecf..73747fbd 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh @@ -29,7 +29,7 @@ sudo zypper -nq install libXi-devel # system provided XCB libraries sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \ - xcb-util-wm-devel xcb-util-renderutil-devel + xcb-util-wm-devel xcb-util-renderutil-devel xcb-util-cursor-devel # ICU sudo zypper -nq install libicu-devel