From dc5abf8ddd4d754dfcae1b6bcd78aabc170f9d57 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 28 Dec 2022 15:19:36 +0400 Subject: [PATCH] Support ICCv4 with Little CMS on Linux --- Telegram/build/docker/centos_env/Dockerfile | 3 ++- cmake | 2 +- snap/snapcraft.yaml | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index a711a2e49..625a27b34 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -56,7 +56,7 @@ ENV CXXFLAGS $CFLAGS FROM builder AS patches RUN git clone {{ GIT }}/desktop-app/patches.git \ && cd patches \ - && git checkout 8edd80d889 \ + && git checkout 4ecd75fad8 \ && rm -rf .git FROM builder AS nasm @@ -678,6 +678,7 @@ FROM patches AS qt COPY --link --from=libffi {{ LibrariesPath }}/libffi-cache / COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache / COPY --link --from=libproxy {{ LibrariesPath }}/libproxy-cache / +COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache / COPY --link --from=mozjpeg {{ LibrariesPath }}/mozjpeg-cache / COPY --link --from=xcb {{ LibrariesPath }}/xcb-cache / COPY --link --from=xcb-wm {{ LibrariesPath }}/xcb-wm-cache / diff --git a/cmake b/cmake index 8cbc57f35..4d8c8a0f8 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 8cbc57f355d37c9236522bc90c8850a8e6fffca8 +Subproject commit 4d8c8a0f84f271a14666a36674d2781a2fe155a9 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 6d5fa22b5..399c294a3 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -376,6 +376,7 @@ parts: - libharfbuzz-dev - libice-dev - libicu-dev + - liblcms2-dev - libopengl-dev - libpcre2-dev - libpng-dev @@ -413,6 +414,7 @@ parts: - libharfbuzz0b - libice6 - libicu70 + - liblcms2-2 - libopengl0 - libpcre2-16-0 - libpng16-16