Skip to content

Commit 9beebfc

Browse files
Vishrut2403Vishrut2403
authored
Merge branch 'master' into feature/favorites-gamelist
2 parents 36642e2 + ed796ee commit 9beebfc

141 files changed

Lines changed: 10096 additions & 7239 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/cron_update_base_translation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
run: ./.github/workflows/scripts/common/update_base_translation.sh
1818

1919
- name: Create Pull Request
20-
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0
20+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1
2121
with:
2222
title: "Qt: Update Base Translation"
2323
commit-message: "[ci skip] Qt: Update Base Translation."

‎.github/workflows/cron_update_controller_db.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
mv ./game_controller_db.txt ${{github.workspace}}/bin/resources/game_controller_db.txt
2020
2121
- name: Create Pull Request
22-
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0
22+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1
2323
with:
2424
title: "PAD: Update to latest controller database"
2525
commit-message: "[ci skip] PAD: Update to latest controller database."

‎.github/workflows/linux_build_flatpak.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
9494
- name: Build Flatpak (beta)
9595
if: ${{ inputs.stableBuild == false || inputs.stableBuild == 'false' }}
96-
uses: flatpak/flatpak-github-actions/flatpak-builder@92ae9851ad316786193b1fd3f40c4b51eb5cb101
96+
uses: flatpak/flatpak-github-actions/flatpak-builder@401fe28a8384095fc1531b9d320b292f0ee45adb
9797
with:
9898
bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
9999
upload-artifact: false
@@ -109,7 +109,7 @@ jobs:
109109

110110
- name: Build Flatpak (stable)
111111
if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
112-
uses: flatpak/flatpak-github-actions/flatpak-builder@92ae9851ad316786193b1fd3f40c4b51eb5cb101
112+
uses: flatpak/flatpak-github-actions/flatpak-builder@401fe28a8384095fc1531b9d320b292f0ee45adb
113113
with:
114114
bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
115115
upload-artifact: false
@@ -129,7 +129,7 @@ jobs:
129129

130130
- name: Push to Flathub (beta)
131131
if: ${{ inputs.publish == true && (inputs.stableBuild == false || inputs.stableBuild == 'false') }}
132-
uses: flatpak/flatpak-github-actions/flat-manager@92ae9851ad316786193b1fd3f40c4b51eb5cb101
132+
uses: flatpak/flatpak-github-actions/flat-manager@401fe28a8384095fc1531b9d320b292f0ee45adb
133133
with:
134134
flat-manager-url: https://hub.flathub.org/
135135
repository: beta
@@ -138,7 +138,7 @@ jobs:
138138

139139
- name: Push to Flathub (stable)
140140
if: ${{ inputs.publish == true && (inputs.stableBuild == true || inputs.stableBuild == 'true') }}
141-
uses: flatpak/flatpak-github-actions/flat-manager@92ae9851ad316786193b1fd3f40c4b51eb5cb101
141+
uses: flatpak/flatpak-github-actions/flat-manager@401fe28a8384095fc1531b9d320b292f0ee45adb
142142
with:
143143
flat-manager-url: https://hub.flathub.org/
144144
repository: stable

‎.github/workflows/release_cut_new.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
mv ./release-notes.md ${GITHUB_WORKSPACE}/release-notes.md
6969
7070
- name: Create a GitHub Release (Manual)
71-
uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe
71+
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda
7272
if: steps.tag_version.outputs.new_tag && github.event_name == 'workflow_dispatch'
7373
with:
7474
body_path: ./release-notes.md
@@ -77,7 +77,7 @@ jobs:
7777
tag_name: ${{ steps.tag_version.outputs.new_tag }}
7878

7979
- name: Create a GitHub Release (Push)
80-
uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe
80+
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda
8181
if: steps.tag_version.outputs.new_tag && github.event_name != 'workflow_dispatch'
8282
with:
8383
body_path: ./release-notes.md

‎.github/workflows/scripts/linux/appimage-qt.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ STRIP=strip
4343

4444
declare -a MANUAL_LIBS=(
4545
"libshaderc_shared.so.1"
46-
"libharfbuzz.so.0"
47-
"libfreetype.so.6"
4846
)
4947

5048
set -e

‎.github/workflows/scripts/linux/build-dependencies-qt.sh‎

Lines changed: 9 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ fi
2121
QT=6.11.0
2222
QTAPNG=1.3.0
2323

24-
FFMPEG=8.0
25-
FREETYPE=2.14.1
26-
HARFBUZZ=13.0.0
24+
FFMPEG=8.1
2725
LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
28-
LIBJPEGTURBO=3.1.3
29-
LIBPNG=1.6.55
26+
LIBJPEGTURBO=3.1.4.1
27+
LIBPNG=1.6.56
3028
LIBWEBP=1.6.0
3129
NVENC=13.0.19.0
3230
SDL=SDL3-3.4.4
@@ -57,15 +55,13 @@ cfb1993d7a10848965b01b9cf33a54b8a4ba4e5e3a6d28d59483e73f10d9fc76 qttools-everyw
5755
e710e6e760f92922b86e4dd68f6bbe94ef6510919519d1b0068e874b5ad84d37 qtwayland-everywhere-src-$QT.tar.xz
5856
f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6 QtApng-$QTAPNG.tar.gz
5957
60-
b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e ffmpeg-$FFMPEG.tar.xz
61-
32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc freetype-$FREETYPE.tar.xz
62-
207f96964dc9475b13c1f66565bf145d2658089d65b4cf786d351da2857fc269 harfbuzz-$HARFBUZZ.tar.gz
58+
b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a ffmpeg-$FFMPEG.tar.xz
6359
96e5c2d7f2c482a60d5804da48a2eb9a0db0719b2c65dcc169fbfdcf37f3a45d libbacktrace-$LIBBACKTRACE.tar.gz
64-
075920b826834ac4ddf97661cc73491047855859affd671d52079c6867c1c6c0 libjpeg-turbo-$LIBJPEGTURBO.tar.gz
65-
d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d libpng-$LIBPNG.tar.xz
60+
ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022 libjpeg-turbo-$LIBJPEGTURBO.tar.gz
61+
f7d8bf1601b7804f583a254ab343a6549ca6cf27d255c302c47af2d9d36a6f18 libpng-$LIBPNG.tar.xz
6662
e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 libwebp-$LIBWEBP.tar.gz
6763
ee712dbe6a89bb140bbfc2ce72358fb5ee5cc2240abeabd54855012db30b3864 $SDL.tar.gz
68-
017c06f75ffed25f6cda9b5369ec6da0ac35a6616adf7abe4222516a0237f37a libpng-$LIBPNG-apng.patch.gz
64+
9ce32d4a2763a2ac5f258726ba2f49e9011327c1ee8c30862a32d0f30889fbe8 libpng-$LIBPNG-apng.patch.gz
6965
537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b lz4-$LZ4.tar.gz
7066
13da39edb3a40ed9713ae390ca89faa2f1202c9dda869ef306a8d4383e242bee nv-codec-headers-$NVENC.tar.gz
7167
c465aa56757e7746ac707f582b6e2d51546569a4a2488c1172fb543aa5fdfc2c vulkan-sdk-$VULKAN.tar.gz
@@ -83,8 +79,6 @@ EOF
8379

8480
if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
8581
curl -L \
86-
-O "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz" \
87-
-O "https://github.com/harfbuzz/harfbuzz/archive/$HARFBUZZ/harfbuzz-$HARFBUZZ.tar.gz" \
8882
-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE/libbacktrace-$LIBBACKTRACE.tar.gz" \
8983
-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
9084
-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
@@ -158,7 +152,7 @@ cd ..
158152
echo "Building libpng..."
159153
rm -fr "libpng-$LIBPNG"
160154
tar xf "libpng-$LIBPNG.tar.xz"
161-
gunzip -d -f "libpng-$LIBPNG-apng.patch.gz"
155+
gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
162156
cd "libpng-$LIBPNG"
163157
patch -p1 < "../libpng-$LIBPNG-apng.patch"
164158
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja
@@ -206,35 +200,6 @@ cmake --build build --parallel
206200
ninja -C build install
207201
cd ..
208202

209-
echo "Building FreeType without HarfBuzz..."
210-
rm -fr "freetype-$FREETYPE"
211-
tar xf "freetype-$FREETYPE.tar.xz"
212-
cd "freetype-$FREETYPE"
213-
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build -G Ninja
214-
cmake --build build --parallel
215-
ninja -C build install
216-
cd ..
217-
218-
echo "Building HarfBuzz..."
219-
rm -fr "harfbuzz-$HARFBUZZ"
220-
tar xf "harfbuzz-$HARFBUZZ.tar.gz"
221-
cd "harfbuzz-$HARFBUZZ"
222-
# Add an SOVERSION to match system harfbuzz
223-
sed -i 's/PROPERTIES VISIBILITY_INLINES_HIDDEN TRUE)/PROPERTIES VISIBILITY_INLINES_HIDDEN TRUE SOVERSION 0)/g' CMakeLists.txt
224-
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_HAVE_FREETYPE=ON -B build -G Ninja
225-
cmake --build build --parallel
226-
ninja -C build install
227-
cd ..
228-
229-
echo "Building FreeType with HarfBuzz..."
230-
rm -fr "freetype-$FREETYPE"
231-
tar xf "freetype-$FREETYPE.tar.xz"
232-
cd "freetype-$FREETYPE"
233-
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build -G Ninja
234-
cmake --build build --parallel
235-
ninja -C build install
236-
cd ..
237-
238203
echo "Building SDL..."
239204
rm -fr "$SDL"
240205
tar xf "$SDL.tar.gz"
@@ -347,7 +312,7 @@ echo "Building PlutoSVG..."
347312
rm -fr "plutosvg-$PLUTOSVG"
348313
tar xf "plutosvg-$PLUTOSVG.tar.gz"
349314
cd "plutosvg-$PLUTOSVG"
350-
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOSVG_ENABLE_FREETYPE=ON -DPLUTOSVG_BUILD_EXAMPLES=OFF -B build -G Ninja
315+
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOSVG_ENABLE_FREETYPE=OFF -DPLUTOSVG_BUILD_EXAMPLES=OFF -B build -G Ninja
351316
cmake --build build --parallel
352317
ninja -C build install
353318
cd ..

‎.github/workflows/scripts/linux/build-dependencies-runner.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ cd ..
8787
echo "Building libpng..."
8888
rm -fr "libpng-$LIBPNG"
8989
tar xf "libpng-$LIBPNG.tar.xz"
90-
gunzip -d -f "libpng-$LIBPNG-apng.patch.gz"
90+
gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
9191
cd "libpng-$LIBPNG"
9292
patch -p1 < "../libpng-$LIBPNG-apng.patch"
9393
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja

‎.github/workflows/scripts/linux/flatpak/modules/26-libpng.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@
1414
"sources": [
1515
{
1616
"type": "archive",
17-
"url": "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.55/libpng-1.6.55.tar.xz",
18-
"sha256": "d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d"
17+
"url": "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.56/libpng-1.6.56.tar.xz",
18+
"sha256": "f7d8bf1601b7804f583a254ab343a6549ca6cf27d255c302c47af2d9d36a6f18"
1919
},
2020
{
2121
"type": "file",
22-
"url": "https://download.sourceforge.net/libpng-apng/libpng-1.6.55-apng.patch.gz",
23-
"dest-filename": "libpng-1.6.55-apng.patch.gz",
24-
"sha256": "017c06f75ffed25f6cda9b5369ec6da0ac35a6616adf7abe4222516a0237f37a"
22+
"url": "https://download.sourceforge.net/libpng-apng/libpng-1.6.56-apng.patch.gz",
23+
"dest-filename": "libpng-1.6.56-apng.patch.gz",
24+
"sha256": "9ce32d4a2763a2ac5f258726ba2f49e9011327c1ee8c30862a32d0f30889fbe8"
2525
},
2626
{
2727
"type": "shell",
2828
"commands":
2929
[
30-
"gunzip -f libpng-1.6.55-apng.patch.gz",
31-
"patch -p1 < \"libpng-1.6.55-apng.patch\""
30+
"gunzip -f libpng-1.6.56-apng.patch.gz",
31+
"patch -p1 < \"libpng-1.6.56-apng.patch\""
3232
]
3333
}
3434
],

‎.github/workflows/scripts/macos/build-dependencies-universal.sh‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ fi
4646
QT=6.11.0
4747
QTAPNG=1.3.0
4848

49-
FREETYPE=2.14.1
50-
HARFBUZZ=13.0.0
49+
FREETYPE=2.14.3
5150
SDL=SDL3-3.4.4
51+
HARFBUZZ=14.0.0
5252
ZSTD=1.5.7
5353
LZ4=1.10.0
54-
LIBPNG=1.6.55
55-
LIBJPEGTURBO=3.1.3
54+
LIBPNG=1.6.56
55+
LIBJPEGTURBO=3.1.4.1
5656
LIBWEBP=1.6.0
57-
FFMPEG=8.0
57+
FFMPEG=8.1
5858
MOLTENVK=1.4.1
5959
KDDOCKWIDGETS=2.4.0
6060
PLUTOVG=1.3.2
@@ -92,16 +92,16 @@ cfb1993d7a10848965b01b9cf33a54b8a4ba4e5e3a6d28d59483e73f10d9fc76 qttools-everyw
9292
54f48b2fe4316892ff930195f170a5385644acc7393505f3155c066b8e1ffe56 qttranslations-everywhere-src-$QT.tar.xz
9393
f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6 QtApng-$QTAPNG.tar.gz
9494
95-
32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc freetype-$FREETYPE.tar.xz
96-
207f96964dc9475b13c1f66565bf145d2658089d65b4cf786d351da2857fc269 harfbuzz-$HARFBUZZ.tar.gz
95+
36bc4f1cc413335368ee656c42afca65c5a3987e8768cc28cf11ba775e785a5f freetype-$FREETYPE.tar.xz
9796
ee712dbe6a89bb140bbfc2ce72358fb5ee5cc2240abeabd54855012db30b3864 $SDL.tar.gz
97+
f29db9470e0ca5cef484e04e27baeec233aa428e8fdabe9e51b0f706c0809d24 harfbuzz-$HARFBUZZ.tar.gz
9898
eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3 zstd-$ZSTD.tar.gz
9999
537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b lz4-$LZ4.tar.gz
100-
d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d libpng-$LIBPNG.tar.xz
100+
f7d8bf1601b7804f583a254ab343a6549ca6cf27d255c302c47af2d9d36a6f18 libpng-$LIBPNG.tar.xz
101101
e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 libwebp-$LIBWEBP.tar.gz
102-
017c06f75ffed25f6cda9b5369ec6da0ac35a6616adf7abe4222516a0237f37a libpng-$LIBPNG-apng.patch.gz
103-
075920b826834ac4ddf97661cc73491047855859affd671d52079c6867c1c6c0 libjpeg-turbo-$LIBJPEGTURBO.tar.gz
104-
b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e ffmpeg-$FFMPEG.tar.xz
102+
9ce32d4a2763a2ac5f258726ba2f49e9011327c1ee8c30862a32d0f30889fbe8 libpng-$LIBPNG-apng.patch.gz
103+
ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022 libjpeg-turbo-$LIBJPEGTURBO.tar.gz
104+
b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a ffmpeg-$FFMPEG.tar.xz
105105
9985f141902a17de818e264d17c1ce334b748e499ee02fcb4703e4dc0038f89c MoltenVK-$MOLTENVK.tar.gz
106106
51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2 KDDockWidgets-$KDDOCKWIDGETS.tar.gz
107107
7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5 plutovg-$PLUTOVG.tar.gz
@@ -218,7 +218,7 @@ cd ..
218218
echo "Installing libpng..."
219219
rm -fr "libpng-$LIBPNG"
220220
tar xf "libpng-$LIBPNG.tar.xz"
221-
gunzip -d -f "libpng-$LIBPNG-apng.patch.gz"
221+
gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
222222
cd "libpng-$LIBPNG"
223223
patch -p1 < "../libpng-$LIBPNG-apng.patch"
224224
cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -B build
@@ -270,7 +270,7 @@ echo "Building HarfBuzz..."
270270
rm -fr "harfbuzz-$HARFBUZZ"
271271
tar xf "harfbuzz-$HARFBUZZ.tar.gz"
272272
cd "harfbuzz-$HARFBUZZ"
273-
cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build
273+
cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_BUILD_GPU=OFF -B build
274274
cmake --build build --parallel
275275
cmake --install build
276276
cd ..
@@ -301,6 +301,8 @@ cd "qtbase-everywhere-src-$QT"
301301

302302
# Patch Qt to support macOS 11
303303
patch -p1 < "$SCRIPTDIR/qt-macos11compat.patch"
304+
# Backport fix build on Xcode 26.4 (https://codereview.qt-project.org/c/qt/qtbase/+/724619)
305+
patch -p1 < "$SCRIPTDIR/qt110-xcode264.patch"
304306

305307
# since we don't have a direct reference to QtSvg, it doesn't deployed directly from the main binary
306308
# (only indirectly from iconengines), and the libqsvg.dylib imageformat plugin does not get deployed.

‎.github/workflows/scripts/macos/build-dependencies.sh‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ fi
2323
QT=6.11.0
2424
QTAPNG=1.3.0
2525

26-
FREETYPE=2.14.1
27-
HARFBUZZ=13.0.0
26+
FREETYPE=2.14.3
2827
SDL=SDL3-3.4.4
28+
HARFBUZZ=14.0.0
2929
ZSTD=1.5.7
3030
LZ4=1.10.0
31-
LIBPNG=1.6.55
32-
LIBJPEGTURBO=3.1.3
31+
LIBPNG=1.6.56
32+
LIBJPEGTURBO=3.1.4.1
3333
LIBWEBP=1.6.0
34-
FFMPEG=8.0
34+
FFMPEG=8.1
3535
MOLTENVK=1.4.1
3636
KDDOCKWIDGETS=2.4.0
3737
PLUTOVG=1.3.2
@@ -68,16 +68,16 @@ cfb1993d7a10848965b01b9cf33a54b8a4ba4e5e3a6d28d59483e73f10d9fc76 qttools-everyw
6868
54f48b2fe4316892ff930195f170a5385644acc7393505f3155c066b8e1ffe56 qttranslations-everywhere-src-$QT.tar.xz
6969
f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6 QtApng-$QTAPNG.tar.gz
7070
71-
32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc freetype-$FREETYPE.tar.xz
72-
207f96964dc9475b13c1f66565bf145d2658089d65b4cf786d351da2857fc269 harfbuzz-$HARFBUZZ.tar.gz
71+
36bc4f1cc413335368ee656c42afca65c5a3987e8768cc28cf11ba775e785a5f freetype-$FREETYPE.tar.xz
7372
ee712dbe6a89bb140bbfc2ce72358fb5ee5cc2240abeabd54855012db30b3864 $SDL.tar.gz
73+
f29db9470e0ca5cef484e04e27baeec233aa428e8fdabe9e51b0f706c0809d24 harfbuzz-$HARFBUZZ.tar.gz
7474
eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3 zstd-$ZSTD.tar.gz
7575
537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b lz4-$LZ4.tar.gz
76-
d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d libpng-$LIBPNG.tar.xz
76+
f7d8bf1601b7804f583a254ab343a6549ca6cf27d255c302c47af2d9d36a6f18 libpng-$LIBPNG.tar.xz
7777
e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 libwebp-$LIBWEBP.tar.gz
78-
017c06f75ffed25f6cda9b5369ec6da0ac35a6616adf7abe4222516a0237f37a libpng-$LIBPNG-apng.patch.gz
79-
075920b826834ac4ddf97661cc73491047855859affd671d52079c6867c1c6c0 libjpeg-turbo-$LIBJPEGTURBO.tar.gz
80-
b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e ffmpeg-$FFMPEG.tar.xz
78+
9ce32d4a2763a2ac5f258726ba2f49e9011327c1ee8c30862a32d0f30889fbe8 libpng-$LIBPNG-apng.patch.gz
79+
ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022 libjpeg-turbo-$LIBJPEGTURBO.tar.gz
80+
b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a ffmpeg-$FFMPEG.tar.xz
8181
9985f141902a17de818e264d17c1ce334b748e499ee02fcb4703e4dc0038f89c v$MOLTENVK.tar.gz
8282
51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2 KDDockWidgets-$KDDOCKWIDGETS.tar.gz
8383
7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5 plutovg-$PLUTOVG.tar.gz
@@ -170,7 +170,7 @@ cd ..
170170
echo "Installing libpng..."
171171
rm -fr "libpng-$LIBPNG"
172172
tar xf "libpng-$LIBPNG.tar.xz"
173-
gunzip -d -f "libpng-$LIBPNG-apng.patch.gz"
173+
gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
174174
cd "libpng-$LIBPNG"
175175
patch -p1 < "../libpng-$LIBPNG-apng.patch"
176176
cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -B build
@@ -211,7 +211,7 @@ echo "Building HarfBuzz..."
211211
rm -fr "harfbuzz-$HARFBUZZ"
212212
tar xf "harfbuzz-$HARFBUZZ.tar.gz"
213213
cd "harfbuzz-$HARFBUZZ"
214-
cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build
214+
cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_BUILD_GPU=OFF -B build
215215
make -C build "-j$NPROCS"
216216
make -C build install
217217
cd ..
@@ -244,6 +244,8 @@ cd "qtbase-everywhere-src-$QT"
244244

245245
# Patch Qt to support macOS 11
246246
patch -p1 < "$SCRIPTDIR/qt-macos11compat.patch"
247+
# Backport fix build on Xcode 26.4 (https://codereview.qt-project.org/c/qt/qtbase/+/724619)
248+
patch -p1 < "$SCRIPTDIR/qt110-xcode264.patch"
247249

248250
# since we don't have a direct reference to QtSvg, it doesn't deployed directly from the main binary
249251
# (only indirectly from iconengines), and the libqsvg.dylib imageformat plugin does not get deployed.

0 commit comments

Comments
 (0)