From b82068928ef639a2b6a60a2f81b9244a3a31ff74 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 7 Feb 2025 00:02:03 +0100 Subject: [PATCH] gitlab-ci: remove `libpng-devel` from the container too Qt5 ends up finding and compiling against it but it is ignored at packaging time because it is from the system. --- .gitlab/os-linux.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 528f4183..a92459c3 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -91,7 +91,8 @@ # Remove `freetype-devel` from the image; it confuses our `fontconfig` # builds. Remove it here to avoid rebuilding the image in the face of # CentOS 7's EOL. - - yum -y remove freetype-devel + # Also remove `libpng-devel` to avoid building Qt against it. + - yum -y remove freetype-devel libpng-devel .cmake_build_linux: stage: build -- GitLab