From 9997dafd66c00c80601d16f6856edea4362cdb36 Mon Sep 17 00:00:00 2001 From: Marcelo Duarte Date: Fri, 15 Sep 2023 01:45:27 -0300 Subject: [PATCH] Fix tkinter missing fonts in manylinux2014 (#1531) --- docker/build_scripts/install-build-packages.sh | 1 + docker/build_scripts/install-runtime-packages.sh | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/build_scripts/install-build-packages.sh b/docker/build_scripts/install-build-packages.sh index 9bdf6602..1d566f0d 100755 --- a/docker/build_scripts/install-build-packages.sh +++ b/docker/build_scripts/install-build-packages.sh @@ -17,6 +17,7 @@ if [ "${BASE_POLICY}" == "manylinux" ]; then COMPILE_DEPS="bzip2-devel ncurses-devel readline-devel gdbm-devel libpcap-devel xz-devel openssl openssl-devel keyutils-libs-devel krb5-devel libcom_err-devel libidn-devel curl-devel uuid-devel libffi-devel kernel-headers libdb-devel" if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then PACKAGE_MANAGER=yum + COMPILE_DEPS="${COMPILE_DEPS} libXft-devel" else PACKAGE_MANAGER=dnf COMPILE_DEPS="${COMPILE_DEPS} tk-devel" diff --git a/docker/build_scripts/install-runtime-packages.sh b/docker/build_scripts/install-runtime-packages.sh index 310d6a7e..469fd563 100755 --- a/docker/build_scripts/install-runtime-packages.sh +++ b/docker/build_scripts/install-runtime-packages.sh @@ -44,9 +44,11 @@ fi # RUNTIME_DEPS: Runtime dependencies. c.f. install-build-packages.sh if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then RUNTIME_DEPS="zlib bzip2 expat ncurses readline gdbm libpcap xz openssl keyutils-libs libkadm5 libcom_err libidn libcurl uuid libffi libdb" - if [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then - RUNTIME_DEPS="${RUNTIME_DEPS} tk" - fi + if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then + RUNTIME_DEPS="${RUNTIME_DEPS} libXft" + elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then + RUNTIME_DEPS="${RUNTIME_DEPS} tk" + fi elif [ "${BASE_POLICY}" == "musllinux" ]; then RUNTIME_DEPS="zlib bzip2 expat ncurses-libs readline tk gdbm db xz openssl keyutils-libs krb5-libs libcom_err libidn2 libcurl libuuid libffi" else