diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index c5330982a707bd01e349206660d7b5185adb893f..78a3095a3d7324c6c8cce6015ebfabedf31f4c35 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -72,7 +72,6 @@ if(OGS_BUILD_GUI) vtk:qt=True qt:qtxmlpatterns=True qt:openssl=False - qt:with_harfbuzz=False qt:with_libalsa=False qt:with_libjpeg=False #qt:with_libpng=False @@ -82,7 +81,6 @@ if(OGS_BUILD_GUI) qt:with_pq=False qt:with_sdl2=False qt:with_sqlite3=False - qt:with_freetype=False ) endif() diff --git a/scripts/docker/Dockerfile.gcc.gui b/scripts/docker/Dockerfile.gcc.gui index dcc34b8ebb82a18731cbb072d49aa8b659b4f86c..32f2b16e04ff7278bb7346f8e8e7ccd33427e274 100644 --- a/scripts/docker/Dockerfile.gcc.gui +++ b/scripts/docker/Dockerfile.gcc.gui @@ -114,7 +114,7 @@ LABEL ccache.dir=/opt/cache \ RUN apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - sudo && \ + sudo pkg-config && \ rm -rf /var/lib/apt/lists/* # Jenkins node