RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-02-01 12:44:31 +00:00
Code Issues Projects Releases Wiki Activity

Update Qt and libjxl to release versions on Linux

Browse Source
This commit is contained in:
Ilya Fedin 2022-09-29 10:49:45 +04:00 committed by John Preston
parent 8b580de47e
commit 8eb6d2e36b
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/build/docker/centos_env/Dockerfile
View File

@ -1,7 +1,7 @@
{%- set GIT = "https://github.com" -%}
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
{%- set QT = "6_4_0" -%}
{%- set QT_TAG = "v6.4.0-rc1" -%}
{%- set QT_TAG = "v6.4.0" -%}
{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.4.0" -%}
{%- set OPENSSL_VER = "1_1_1" -%}
{%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%}
@ -242,7 +242,7 @@ COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache /
COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
RUN git clone -b v0.7rc --depth=1 {{ GIT }}/libjxl/libjxl.git \
RUN git clone -b v0.7.0 --depth=1 {{ GIT }}/libjxl/libjxl.git \
&& cd libjxl \
&& cmake -GNinja -B build . \
-DCMAKE_BUILD_TYPE=Release \

17
snap/snapcraft.yaml
View File

@ -221,16 +221,8 @@ parts:
libjxl:
source: https://github.com/libjxl/libjxl.git
source-depth: 1
source-tag: v0.7rc
source-tag: v0.7.0
plugin: cmake
build-packages:
- libbrotli-dev
- libhwy-dev
- liblcms2-dev
stage-packages:
- libbrotli1
- libhwy0
- liblcms2-2
cmake-parameters:
- -DCMAKE_BUILD_TYPE=Release
- -DCMAKE_INSTALL_PREFIX=/usr
@ -245,10 +237,13 @@ parts:
- -DJPEGXL_ENABLE_SJPEG=OFF
- -DJPEGXL_ENABLE_OPENEXR=OFF
- -DJPEGXL_ENABLE_SKCMS=OFF
stage:
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libbrotli*
prime:
- -./usr/bin
- -./usr/include
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pkgocnfig
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pkgconfig
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/*.a
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/*.so
- -./usr/share
@ -401,7 +396,7 @@ parts:
override-pull: |
QT=6_4_0
git clone -b v6.4.0-rc1 --depth=1 git://code.qt.io/qt/qt5.git .
git clone -b v6.4.0 --depth=1 git://code.qt.io/qt/qt5.git .
perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg,qt5compat
cd qtbase