Skip to content

Commit 8cb50a0

Browse files
committed
Disable brotli when building freetype.
1 parent 84fab41 commit 8cb50a0

File tree

2 files changed

+27
-0
lines changed

2 files changed

+27
-0
lines changed

fetch_modules.sh

+3
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ rsync -vrb --delete --exclude gpodder.modules --exclude patches/gpodder* _gtk-os
55
rsync -vrb --delete _gtk-osx-modules/patches modulesets/
66
(cd _gtk-osx-modules/ && git log -1) > modulesets/upstream-ref
77
rm -Rf _gtk-osx-modules
8+
9+
# Disable check for brotli when building freetype
10+
(cd modulesets && patch -p1 < ../github-brotli.patch)

github-brotli.patch

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
--- modulesets/gtk-osx.modules
2+
+++ modulesets/gtk-osx.modules
3+
@@ -127,8 +127,9 @@
4+
then build harfbuzz without cairo because cairo requires
5+
harfbuzz.
6+
-->
7+
+ <!-- gpodder github action needs to disable BrotliDec -->
8+
<cmake id="freetype-no-harfbuzz"
9+
- cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
10+
+ cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE">
11+
12+
<branch module="freetype/freetype-2.11.1.tar.gz"
13+
version="2.11.1"
14+
@@ -153,8 +154,9 @@
15+
</dependencies>
16+
</meson>
17+
<!---->
18+
+ <!-- gpodder github action needs to disable BrotliDec -->
19+
<cmake id="freetype"
20+
- cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
21+
+ cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE">
22+
23+
<branch module="freetype/freetype-2.11.1.tar.gz"
24+
version="2.11.1"

0 commit comments

Comments
 (0)