summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Fedin <fedin-ilja2010@ya.ru>2022-12-28 15:19:36 +0400
committerJohn Preston <johnprestonmail@gmail.com>2022-12-28 16:02:35 +0400
commitdc5abf8ddd4d754dfcae1b6bcd78aabc170f9d57 (patch)
treeb814518452e686c1cf33cb3eb92023792c790a1e
parentb334a1f4fda6cd126d00ef20db4a5e98e20d60bf (diff)
Support ICCv4 with Little CMS on Linux
-rw-r--r--Telegram/build/docker/centos_env/Dockerfile3
m---------cmake0
-rw-r--r--snap/snapcraft.yaml2
3 files changed, 4 insertions, 1 deletions
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index a711a2e49e..625a27b34a 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
-Subproject 8cbc57f355d37c9236522bc90c8850a8e6fffca
+Subproject 4d8c8a0f84f271a14666a36674d2781a2fe155a
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 6d5fa22b53..399c294a3a 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