Support ICCv4 with Little CMS on Linux

This commit is contained in:
Ilya Fedin 2022-12-28 15:19:36 +04:00 committed by John Preston
parent b334a1f4fd
commit dc5abf8ddd
3 changed files with 5 additions and 2 deletions

View File

@ -56,7 +56,7 @@ ENV CXXFLAGS $CFLAGS
FROM builder AS patches FROM builder AS patches
RUN git clone {{ GIT }}/desktop-app/patches.git \ RUN git clone {{ GIT }}/desktop-app/patches.git \
&& cd patches \ && cd patches \
&& git checkout 8edd80d889 \ && git checkout 4ecd75fad8 \
&& rm -rf .git && rm -rf .git
FROM builder AS nasm FROM builder AS nasm
@ -678,6 +678,7 @@ FROM patches AS qt
COPY --link --from=libffi {{ LibrariesPath }}/libffi-cache / COPY --link --from=libffi {{ LibrariesPath }}/libffi-cache /
COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache / COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache /
COPY --link --from=libproxy {{ LibrariesPath }}/libproxy-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=mozjpeg {{ LibrariesPath }}/mozjpeg-cache /
COPY --link --from=xcb {{ LibrariesPath }}/xcb-cache / COPY --link --from=xcb {{ LibrariesPath }}/xcb-cache /
COPY --link --from=xcb-wm {{ LibrariesPath }}/xcb-wm-cache / COPY --link --from=xcb-wm {{ LibrariesPath }}/xcb-wm-cache /

2
cmake

@ -1 +1 @@
Subproject commit 8cbc57f355d37c9236522bc90c8850a8e6fffca8 Subproject commit 4d8c8a0f84f271a14666a36674d2781a2fe155a9

View File

@ -376,6 +376,7 @@ parts:
- libharfbuzz-dev - libharfbuzz-dev
- libice-dev - libice-dev
- libicu-dev - libicu-dev
- liblcms2-dev
- libopengl-dev - libopengl-dev
- libpcre2-dev - libpcre2-dev
- libpng-dev - libpng-dev
@ -413,6 +414,7 @@ parts:
- libharfbuzz0b - libharfbuzz0b
- libice6 - libice6
- libicu70 - libicu70
- liblcms2-2
- libopengl0 - libopengl0
- libpcre2-16-0 - libpcre2-16-0
- libpng16-16 - libpng16-16