mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-01 15:15:13 +00:00
Code Issues Releases Wiki Activity

Update Qt to 6.2.3 on macOS and Linux.

Browse Source
This commit is contained in:
John Preston
2022-03-05 17:03:03 +04:00
parent 1ddc0c1977
commit d2d41f978d
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,9 +10,9 @@ ENV QT5_VER 5_15_2
ENV QT5_TAG v5.15.2 ENV QT5_TAG v5.15.2
ENV QT5_PREFIX /usr/local/desktop-app/Qt-5.15.2 ENV QT5_PREFIX /usr/local/desktop-app/Qt-5.15.2
ENV Qt5_DIR ${QT5_PREFIX} ENV Qt5_DIR ${QT5_PREFIX}
ENV QT6_VER 6_2_2 ENV QT6_VER 6_2_3
ENV QT6_TAG v6.2.2 ENV QT6_TAG v6.2.3
ENV QT6_PREFIX /usr/local/desktop-app/Qt-6.2.2 ENV QT6_PREFIX /usr/local/desktop-app/Qt-6.2.3
ENV Qt6_DIR ${QT6_PREFIX} ENV Qt6_DIR ${QT6_PREFIX}
ENV OPENSSL_VER 1_1_1 ENV OPENSSL_VER 1_1_1
ENV OPENSSL_PREFIX /usr/local/desktop-app/openssl-1.1.1 ENV OPENSSL_PREFIX /usr/local/desktop-app/openssl-1.1.1
@@ -51,7 +51,7 @@ RUN ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
RUN rm $CMAKE_FILE RUN rm $CMAKE_FILE
FROM builder AS patches FROM builder AS patches
RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout 1206363d59 RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout 49d233d5de
FROM builder AS libffi FROM builder AS libffi
RUN git clone -b v3.4.2 --depth=1 $GIT/libffi/libffi.git RUN git clone -b v3.4.2 --depth=1 $GIT/libffi/libffi.git

18
Telegram/build/prepare/prepare.py
View File

@@ -400,7 +400,7 @@ if customRunCommand:
stage('patches', """ stage('patches', """
git clone https://github.com/desktop-app/patches.git git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout 47d447b531 git checkout 49d233d5de
""") """)
stage('depot_tools', """ stage('depot_tools', """
@@ -1195,28 +1195,28 @@ mac:
""") """)
if buildQt6: if buildQt6:
stage('qt_6_2_2', """ stage('qt_6_2_3', """
mac: mac:
git clone -b v6.2.2 https://code.qt.io/qt/qt5.git qt_6_2_2 git clone -b v6.2.3 https://code.qt.io/qt/qt5.git qt_6_2_3
cd qt_6_2_2 cd qt_6_2_3
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg,qt5compat perl init-repository --module-subset=qtbase,qtimageformats,qtsvg,qt5compat
depends:patches/qtbase_6_2_2/*.patch depends:patches/qtbase_6_2_3/*.patch
cd qtbase cd qtbase
find ../../patches/qtbase_6_2_2 -type f -print0 | sort -z | xargs -0 git apply find ../../patches/qtbase_6_2_3 -type f -print0 | sort -z | xargs -0 git apply
cd .. cd ..
depends:patches/qt5compat_6_2_2/*.patch depends:patches/qt5compat_6_2_3/*.patch
cd qt5compat cd qt5compat
find ../../patches/qt5compat_6_2_2 -type f -print0 | sort -z | xargs -0 git apply find ../../patches/qt5compat_6_2_3 -type f -print0 | sort -z | xargs -0 git apply
cd .. cd ..
CONFIGURATIONS=-debug CONFIGURATIONS=-debug
release: release:
CONFIGURATIONS=-debug-and-release CONFIGURATIONS=-debug-and-release
mac: mac:
./configure -prefix "$USED_PREFIX/Qt-6.2.2" \ ./configure -prefix "$USED_PREFIX/Qt-6.2.3" \
$CONFIGURATIONS \ $CONFIGURATIONS \
-force-debug-info \ -force-debug-info \
-opensource \ -opensource \

2
Telegram/lib_ui

Submodule Telegram/lib_ui updated: d2e482dac3...f2c77daccc

2
cmake

Submodule cmake updated: f05023bb10...aa71b768bd