Skip to content

Commit 8f892cb

Browse files
committed
qtbase patch
1 parent f5ebf2e commit 8f892cb

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

.github/workflows/qt5network5.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@ jobs:
5757
sudo apt-get update
5858
sudo apt-get install -y build-essential pkg-config \
5959
python3 perl libpcre2-dev zlib1g-dev cmake ninja-build
60+
61+
- name: Checkout OSP
62+
uses: actions/checkout@v4
63+
with:
64+
repository: wolfssl/osp
65+
path: osp
66+
fetch-depth: 1
6067

6168
- name: Checkout Qt
6269
uses: actions/checkout@v4
@@ -82,17 +89,14 @@ jobs:
8289
if: matrix.qt_ref == 'dev'
8390
working-directory: qt5_repo
8491
run: |
92+
# Apply patch from OSP repo
93+
patch -p1 < $GITHUB_WORKSPACE/osp/wolfProvider/qtbase/qtbase-v6.10-wolfprov.patch
94+
8595
# Build the OpenSSL TLS backend plugin first
8696
ninja QTlsBackendOpenSSLPlugin
8797
88-
#hard loads to wolfProvider instead.
89-
perl -pi -e 's/defaultProvider/wolfProvider/g; s/legacyProvider/wolfProvider/g; s/OSSL_PROVIDER_load\(nullptr, "default"\)/OSSL_PROVIDER_load(nullptr, "libwolfprov")/g; s/OSSL_PROVIDER_load\(nullptr, "legacy"\)/OSSL_PROVIDER_load(nullptr, "libwolfprov")/g;' src/corelib/tools/qcryptographichash.cpp
90-
91-
#Remove legacy loading
92-
perl -pi -e 's/CASE\(Md4, "MD4"\);/CASE(Md4, nullptr);/g;' src/corelib/tools/qcryptographichash.cpp
93-
94-
# Build only the SSL test and its dependencies
95-
cmake --build . --target tst_qsslsocket --parallel $(nproc)
98+
# Build only the SSL test and its dependencies
99+
cmake --build . --target tst_qsslsocket --parallel $(nproc)
96100
97101
- name: Build Qt (v5.15.8 - qmake)
98102
if: matrix.qt_ref != 'dev'

0 commit comments

Comments
 (0)