From f1e75d809ace8deb20acf6b7e8cc2a2d61f57f57 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 2 Jun 2020 14:14:51 +0400 Subject: [PATCH] Separate patches --- .github/workflows/linux.yml | 8 +++----- .github/workflows/mac.yml | 2 +- .github/workflows/win.yml | 2 +- docs/building-cmake.md | 8 +++----- docs/building-msvc.md | 4 ++-- docs/building-xcode.md | 4 ++-- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f99bb944c2..8772e50efa 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -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" \ diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 50a1b87ec9..0515ca1f7c 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -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 \ diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 8b62aacde2..6817a2b5a1 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -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 diff --git a/docs/building-cmake.md b/docs/building-cmake.md index 45a8760d4d..0d81c907cf 100644 --- a/docs/building-cmake.md +++ b/docs/building-cmake.md @@ -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 diff --git a/docs/building-msvc.md b/docs/building-msvc.md index 142b4689f1..c18bf7be0b 100644 --- a/docs/building-msvc.md +++ b/docs/building-msvc.md @@ -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 diff --git a/docs/building-xcode.md b/docs/building-xcode.md index 1d7f435283..91bdc4c50c 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -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" \