Skip to content

Commit 912b442

Browse files
committed
GHActions:Linux: Don't build or bundle FreeType/HarfBuzz
1 parent decb60f commit 912b442

File tree

2 files changed

+1
-38
lines changed

2 files changed

+1
-38
lines changed

.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: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ QT=6.11.0
2222
QTAPNG=1.3.0
2323

2424
FFMPEG=8.0
25-
FREETYPE=2.14.1
26-
HARFBUZZ=13.0.0
2725
LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
2826
LIBJPEGTURBO=3.1.3
2927
LIBPNG=1.6.55
@@ -57,8 +55,6 @@ e710e6e760f92922b86e4dd68f6bbe94ef6510919519d1b0068e874b5ad84d37 qtwayland-ever
5755
f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6 QtApng-$QTAPNG.tar.gz
5856
5957
b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e ffmpeg-$FFMPEG.tar.xz
60-
32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc freetype-$FREETYPE.tar.xz
61-
207f96964dc9475b13c1f66565bf145d2658089d65b4cf786d351da2857fc269 harfbuzz-$HARFBUZZ.tar.gz
6258
96e5c2d7f2c482a60d5804da48a2eb9a0db0719b2c65dcc169fbfdcf37f3a45d libbacktrace-$LIBBACKTRACE.tar.gz
6359
075920b826834ac4ddf97661cc73491047855859affd671d52079c6867c1c6c0 libjpeg-turbo-$LIBJPEGTURBO.tar.gz
6460
d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d libpng-$LIBPNG.tar.xz
@@ -81,8 +77,6 @@ EOF
8177

8278
if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
8379
curl -L \
84-
-O "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz" \
85-
-O "https://github.com/harfbuzz/harfbuzz/archive/$HARFBUZZ/harfbuzz-$HARFBUZZ.tar.gz" \
8680
-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE/libbacktrace-$LIBBACKTRACE.tar.gz" \
8781
-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
8882
-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
@@ -203,35 +197,6 @@ cmake --build build --parallel
203197
ninja -C build install
204198
cd ..
205199

206-
echo "Building FreeType without HarfBuzz..."
207-
rm -fr "freetype-$FREETYPE"
208-
tar xf "freetype-$FREETYPE.tar.xz"
209-
cd "freetype-$FREETYPE"
210-
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
211-
cmake --build build --parallel
212-
ninja -C build install
213-
cd ..
214-
215-
echo "Building HarfBuzz..."
216-
rm -fr "harfbuzz-$HARFBUZZ"
217-
tar xf "harfbuzz-$HARFBUZZ.tar.gz"
218-
cd "harfbuzz-$HARFBUZZ"
219-
# Add an SOVERSION to match system harfbuzz
220-
sed -i 's/PROPERTIES VISIBILITY_INLINES_HIDDEN TRUE)/PROPERTIES VISIBILITY_INLINES_HIDDEN TRUE SOVERSION 0)/g' CMakeLists.txt
221-
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
222-
cmake --build build --parallel
223-
ninja -C build install
224-
cd ..
225-
226-
echo "Building FreeType with HarfBuzz..."
227-
rm -fr "freetype-$FREETYPE"
228-
tar xf "freetype-$FREETYPE.tar.xz"
229-
cd "freetype-$FREETYPE"
230-
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
231-
cmake --build build --parallel
232-
ninja -C build install
233-
cd ..
234-
235200
echo "Building SDL..."
236201
rm -fr "$SDL"
237202
tar xf "$SDL.tar.gz"
@@ -344,7 +309,7 @@ echo "Building PlutoSVG..."
344309
rm -fr "plutosvg-$PLUTOSVG"
345310
tar xf "plutosvg-$PLUTOSVG.tar.gz"
346311
cd "plutosvg-$PLUTOSVG"
347-
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
312+
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
348313
cmake --build build --parallel
349314
ninja -C build install
350315
cd ..

0 commit comments

Comments
 (0)