RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2024-12-26 16:32:17 +00:00
Code Issues Projects Releases Wiki Activity

Separate patches

Browse Source
This commit is contained in:
Ilya Fedin 2020-06-02 14:14:51 +04:00 committed by John Preston
parent c776f81dc7
commit f1e75d809a
6 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/linux.yml vendored
View File

@ -415,7 +415,7 @@ jobs:
uses: actions/cache@v1
with:
path: ${{ env.LibrariesPath }}/qt-cache
key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qt*_5_12_8.diff') }}
key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qt*_5_12_8/*') }}
- name: Qt 5.12.8 build.
if: steps.cache-qt.outputs.cache-hit != 'true'
run: |
@ -426,12 +426,10 @@ jobs:
perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg,qtx11extras
git submodule update qtbase qtwayland qtimageformats qtsvg qtx11extras
cd qtbase
git apply ../../patches/qtbase_${QT}.diff
git apply ../../patches/qtbase_xkbfix_${QT}.diff
find ../../patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git apply
cd ..
cd qtwayland
git apply ../../patches/qtwayland_${QT}.diff
git apply ../../patches/qtwayland_xkbfix_${QT}.diff
find ../../patches/qtwayland_${QT} -type f -print0 | sort -z | xargs -r0 git apply
cd ..
./configure -prefix "$QT_PREFIX" \

2
.github/workflows/mac.yml vendored
View File

@ -424,7 +424,7 @@ jobs:
git submodule update qtbase
git submodule update qtimageformats
cd qtbase
git apply ../../patches/qtbase_$QT.diff
find ../../patches/qtbase_$QT -type f -print0 | sort -z | xargs -0 git apply
cd ..
./configure \

2
.github/workflows/win.yml vendored
View File

@ -308,7 +308,7 @@ jobs:
git submodule update qtbase
git submodule update qtimageformats
cd qtbase
git apply ../../patches/qtbase_%QT%.diff
for /r %%i in (..\..\patches\qtbase_%QT%\*) do git apply %%i
cd ..
SET SSL=%LibrariesPath%\openssl_1_1_1

8
docs/building-cmake.md
View File

@ -54,7 +54,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout fd42dc2
git checkout 2b9afa7
cd ../
git clone https://github.com/xiph/opus
@ -240,12 +240,10 @@ Go to ***BuildPath*** and run
git checkout v5.12.8
git submodule update qtbase qtwayland qtimageformats qtsvg qtx11extras
cd qtbase
git apply ../../patches/qtbase_5_12_8.diff
git apply ../../patches/qtbase_xkbfix_5_12_8.diff
find ../../patches/qtbase_5_12_8 -type f -print0 | sort -z | xargs -r0 git apply
cd ..
cd qtwayland
git apply ../../patches/qtwayland_5_12_8.diff
git apply ../../patches/qtwayland_xkbfix_5_12_8.diff
find ../../patches/qtwayland_5_12_8 -type f -print0 | sort -z | xargs -r0 git apply
cd ..
OPENSSL_DIR=/usr/local/desktop-app/openssl-1.1.1

4
docs/building-msvc.md
View File

@ -64,7 +64,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout b08b497
git checkout 2b9afa7
cd ..
git clone https://github.com/desktop-app/lzma.git
@ -153,7 +153,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
git checkout v5.12.8
git submodule update qtbase qtimageformats
cd qtbase
git apply ../../patches/qtbase_5_12_8.diff
for /r %i in (..\..\patches\qtbase_5_12_8\*) do git apply %i
cd ..
configure -prefix "%LibrariesPath%\Qt-5.12.8" -debug-and-release -force-debug-info -opensource -confirm-license -static -static-runtime -I "%LibrariesPath%\openssl_1_1_1\include" -no-opengl -openssl-linked OPENSSL_LIBS_DEBUG="%LibrariesPath%\openssl_1_1_1\out32.dbg\libssl.lib %LibrariesPath%\openssl_1_1_1\out32.dbg\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" OPENSSL_LIBS_RELEASE="%LibrariesPath%\openssl_1_1_1\out32\libssl.lib %LibrariesPath%\openssl_1_1_1\out32\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" -mp -nomake examples -nomake tests -platform win32-msvc

4
docs/building-xcode.md
View File

@ -29,7 +29,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout b08b497
git checkout 2b9afa7
cd ../
git clone https://chromium.googlesource.com/external/gyp
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@ -240,7 +240,7 @@ Go to ***BuildPath*** and run
git checkout v5.12.8
git submodule update qtbase qtimageformats
cd qtbase
git apply ../../patches/qtbase_5_12_8.diff
find ../../patches/qtbase_5_12_8 -type f -print0 | sort -z | xargs -0 git apply
cd ..
./configure -prefix "/usr/local/desktop-app/Qt-5.12.8" \