lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

coin: Explicitly provision the libzstd-dev package

Browse Source 
It used to be installed as a dependency of some other package, but
stopped doing lately, which causes qtbase to build without zstd
support.

This change explicitly installs the libzstd-dev package to prevent
this from happening again.

Fixes: QTBUG-124787
Fixes: QTBUG-127644
Change-Id: I72793ed96ef39ec07244079c51efe17ae1f9af66
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 8ad05756ed)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit c3a5651bd0)
Reviewed-by: Toni Saario <toni.saario@qt.io>
This commit is contained in:
Alexandru Croitor
2024-07-31 19:02:28 +02:00
parent 23e6c7d563
commit d387c64e8b
9 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
View File

@@ -169,6 +169,7 @@ installPackages+=(ssh)
installPackages+=(diffstat) installPackages+=(diffstat)
installPackages+=(binfmt-support) installPackages+=(binfmt-support)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-dev)
# Vulkan is needed for examples # Vulkan is needed for examples
installPackages+=(libvulkan-dev) installPackages+=(libvulkan-dev)
# Needed for qtdltlogging # Needed for qtdltlogging

1
coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
View File

@@ -27,6 +27,7 @@ installPackages+=(ninja-build)
installPackages+=(pcre2-devel) installPackages+=(pcre2-devel)
installPackages+=(double-conversion-devel) installPackages+=(double-conversion-devel)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-devel)
# EGL support # EGL support
installPackages+=(mesa-libEGL-devel) installPackages+=(mesa-libEGL-devel)
installPackages+=(mesa-libGL-devel) installPackages+=(mesa-libGL-devel)

1
coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh
View File

@@ -28,6 +28,7 @@ installPackages+=(ninja-build)
installPackages+=(pcre2-devel) installPackages+=(pcre2-devel)
installPackages+=(double-conversion-devel) installPackages+=(double-conversion-devel)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-devel)
# EGL support # EGL support
installPackages+=(mesa-libEGL-devel) installPackages+=(mesa-libEGL-devel)
installPackages+=(mesa-libGL-devel) installPackages+=(mesa-libGL-devel)

1
coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh
View File

@@ -29,6 +29,7 @@ installPackages+=(ninja-build)
installPackages+=(pcre2-devel) installPackages+=(pcre2-devel)
installPackages+=(double-conversion-devel) installPackages+=(double-conversion-devel)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-devel)
# update kernel # update kernel
installPackages+=(kernel) installPackages+=(kernel)
installPackages+=(kernel-tools) installPackages+=(kernel-tools)

1
coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh
View File

@@ -29,6 +29,7 @@ installPackages+=(ninja-build)
installPackages+=(pcre2-devel) installPackages+=(pcre2-devel)
installPackages+=(double-conversion-devel) installPackages+=(double-conversion-devel)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-devel)
# update kernel # update kernel
installPackages+=(kernel) installPackages+=(kernel)
installPackages+=(kernel-tools) installPackages+=(kernel-tools)

1
coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh
View File

@@ -29,6 +29,7 @@ installPackages+=(ninja-build)
installPackages+=(pcre2-devel) installPackages+=(pcre2-devel)
installPackages+=(double-conversion-devel) installPackages+=(double-conversion-devel)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-devel)
# EGL support # EGL support
# mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash # mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash
installPackages+=(mesa-libEGL-devel-21.3.4-2.el9) installPackages+=(mesa-libEGL-devel-21.3.4-2.el9)

1
coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh
View File

@@ -29,6 +29,7 @@ installPackages+=(ninja-build)
installPackages+=(pcre2-devel) installPackages+=(pcre2-devel)
installPackages+=(double-conversion-devel) installPackages+=(double-conversion-devel)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-devel)
# EGL support # EGL support
# mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash # mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash
#installPackages+=(mesa-libEGL-devel-21.3.4-2.el9) #installPackages+=(mesa-libEGL-devel-21.3.4-2.el9)

1
coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
View File

@@ -198,6 +198,7 @@ installPackages+=(ssh)
installPackages+=(diffstat) installPackages+=(diffstat)
installPackages+=(binfmt-support) installPackages+=(binfmt-support)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-dev)
# Vulkan is needed for examples # Vulkan is needed for examples
installPackages+=(libvulkan-dev) installPackages+=(libvulkan-dev)
# Needed for qtdltlogging # Needed for qtdltlogging

1
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
View File

@@ -202,6 +202,7 @@ installPackages+=(ssh)
installPackages+=(diffstat) installPackages+=(diffstat)
installPackages+=(binfmt-support) installPackages+=(binfmt-support)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-dev)
installPackages+=(lz4) installPackages+=(lz4)
# Vulkan is needed for examples # Vulkan is needed for examples
installPackages+=(libvulkan-dev) installPackages+=(libvulkan-dev)