Re-apply brotli patch.

gpodder · Mar 4, 2023 · c69465a · c69465a
1 parent faabce9
commit c69465a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/fetch_modules.sh b/fetch_modules.sh
@@ -6,4 +6,4 @@ rsync -vrb --delete _gtk-osx-modules/patches modulesets/
 (cd _gtk-osx-modules/ && git log -1) > modulesets/upstream-ref
 rm -Rf _gtk-osx-modules
 
-#(cd modulesets && patch -p1 < ../github.patch)
+(cd modulesets && patch -p1 < ../github.patch)
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
@@ -127,8 +127,9 @@
     then build harfbuzz without cairo because cairo requires
     harfbuzz.
   -->
+  <!-- gpodder github action needs to disable BrotliDec -->
   <cmake id="freetype-no-harfbuzz"
-         cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
+         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">
 
     <branch module="freetype/freetype-2.11.1.tar.gz"
             version="2.11.1"
@@ -153,8 +154,9 @@
     </dependencies>
   </meson>
   <!---->
+   <!-- gpodder github action needs to disable BrotliDec -->
   <cmake id="freetype"
-         cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
+         cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE">
 
     <branch module="freetype/freetype-2.11.1.tar.gz"
             version="2.11.1"