procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Use default Qt prefix on Linux

Browse source
This commit is contained in:
Ilya Fedin 2024-03-25 21:18:26 +04:00 committed by John Preston
parent ea42f9545f
commit 5fa89c22bd
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Telegram/build/docker/centos_env/Dockerfile
View file

@ -2,7 +2,6 @@
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%} {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
{%- set QT = "6.7.0" -%} {%- set QT = "6.7.0" -%}
{%- set QT_TAG = "v" ~ QT ~ "-rc2" -%} {%- set QT_TAG = "v" ~ QT ~ "-rc2" -%}
{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%}
{%- set CMAKE_VER = "3.27.6" -%} {%- set CMAKE_VER = "3.27.6" -%}
{%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%} {%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%}
{%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -fcf-protection -D_GLIBCXX_ASSERTIONS" -%} {%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -fcf-protection -D_GLIBCXX_ASSERTIONS" -%}
@ -729,15 +728,15 @@ COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache / COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache /
COPY --link --from=libwebp {{ LibrariesPath }}/libwebp-cache / COPY --link --from=libwebp {{ LibrariesPath }}/libwebp-cache /
RUN git clone -b {{ QT_TAG }} --depth=1 {{ GIT }}/qt/qt5.git qt_{{ QT }} \ RUN git clone -b {{ QT_TAG }} --depth=1 {{ GIT }}/qt/qt5.git \
&& cd qt_{{ QT }} \ && cd qt5 \
&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \ && git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \
&& cd qtbase \ && cd qtbase \
&& find ../../patches/qtbase_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \ && find ../../patches/qtbase_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
&& cd ../qtwayland \ && cd ../qtwayland \
&& find ../../patches/qtwayland_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \ && find ../../patches/qtwayland_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
&& cd .. \ && cd .. \
&& ./configure -prefix "{{ QT_PREFIX }}" \ && ./configure \
CMAKE_BUILD_TYPE=None \ CMAKE_BUILD_TYPE=None \
-opensource \ -opensource \
-confirm-license \ -confirm-license \
@ -756,7 +755,7 @@ RUN git clone -b {{ QT_TAG }} --depth=1 {{ GIT }}/qt/qt5.git qt_{{ QT }} \
&& cmake --build . --parallel \ && cmake --build . --parallel \
&& DESTDIR="{{ LibrariesPath }}/qt-cache" cmake --install . \ && DESTDIR="{{ LibrariesPath }}/qt-cache" cmake --install . \
&& cd .. \ && cd .. \
&& rm -rf qt_{{ QT }} && rm -rf qt5
FROM builder AS breakpad FROM builder AS breakpad
RUN git clone -b v2023.06.01 --depth=1 https://chromium.googlesource.com/breakpad/breakpad.git \ RUN git clone -b v2023.06.01 --depth=1 https://chromium.googlesource.com/breakpad/breakpad.git \