Update freetype Old one doesn't build with newer zlib
diff --git a/MODULE.bazel b/MODULE.bazel index 74cb119..9ab9253 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -34,7 +34,7 @@ # We patch out some modules we don't use from freetype config file. patch_args = ["-p1"], patches = ["external/freetype_config.patch"], - sha256 = "bf380e4d7c4f3b5b1c1a7b2bf3abb967bda5e9ab480d0df656e0e08c5019c5e6", - strip_prefix = "freetype-2.9", - urls = ["https://download.savannah.gnu.org/releases/freetype/freetype-2.9.tar.gz"], + sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289", + strip_prefix = "freetype-2.13.3", + urls = ["https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz"], )
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 94f08c2..5177c7e 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock
@@ -1,6 +1,6 @@ { "lockFileVersion": 3, - "moduleFileHash": "0508e776ab75531b8bce0554f8eff97f14f69de6951d818c163f168cd73dcded", + "moduleFileHash": "1dfa4f04d3ddfb3f3a8988b00948aaaba1b8b32d7af1aae74c2161d2ccc70fde", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -86,10 +86,10 @@ "patches": [ "external/freetype_config.patch" ], - "sha256": "bf380e4d7c4f3b5b1c1a7b2bf3abb967bda5e9ab480d0df656e0e08c5019c5e6", - "strip_prefix": "freetype-2.9", + "sha256": "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289", + "strip_prefix": "freetype-2.13.3", "urls": [ - "https://download.savannah.gnu.org/releases/freetype/freetype-2.9.tar.gz" + "https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz" ], "name": "freetype" }, @@ -2177,10 +2177,10 @@ "patches": [ "@@//:external/freetype_config.patch" ], - "sha256": "bf380e4d7c4f3b5b1c1a7b2bf3abb967bda5e9ab480d0df656e0e08c5019c5e6", - "strip_prefix": "freetype-2.9", + "sha256": "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289", + "strip_prefix": "freetype-2.13.3", "urls": [ - "https://download.savannah.gnu.org/releases/freetype/freetype-2.9.tar.gz" + "https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz" ], "name": "_main~_repo_rules~freetype" }
diff --git a/external/freetype.BUILD b/external/freetype.BUILD index f7e87c4..b0add29 100644 --- a/external/freetype.BUILD +++ b/external/freetype.BUILD
@@ -19,7 +19,6 @@ # manually, we patch out the non-TrueType drivers from the configuration file, # since the only font we ship is TrueType. sources = [ - "src/autofit/afangles.c", "src/autofit/afblue.c", "src/autofit/afcjk.c", "src/autofit/afdummy.c", @@ -29,13 +28,9 @@ "src/autofit/aflatin.c", "src/autofit/afloader.c", "src/autofit/afmodule.c", - "src/autofit/afpic.c", "src/autofit/afranges.c", "src/autofit/afshaper.c", - "src/autofit/afwarp.c", - "src/base/basepic.c", "src/base/ftadvanc.c", - "src/base/ftapi.c", "src/base/ftbbox.c", "src/base/ftbdf.c", "src/base/ftbitmap.c", @@ -58,7 +53,6 @@ "src/base/ftoutln.c", "src/base/ftpatent.c", "src/base/ftpfr.c", - "src/base/ftpic.c", "src/base/ftrfork.c", "src/base/ftsnames.c", "src/base/ftstream.c", @@ -72,29 +66,33 @@ "src/gzip/ftgzip.c", "src/raster/ftraster.c", "src/raster/ftrend1.c", - "src/raster/rastpic.c", + "src/sdf/ftbsdf.c", + "src/sdf/ftsdfcommon.c", + "src/sdf/ftsdfrend.c", + "src/sdf/ftsdf.c", "src/sfnt/pngshim.c", "src/sfnt/sfdriver.c", - "src/sfnt/sfntpic.c", "src/sfnt/sfobjs.c", + "src/sfnt/sfwoff.c", "src/sfnt/ttbdf.c", "src/sfnt/ttcmap.c", + "src/sfnt/ttcolr.c", + "src/sfnt/ttcpal.c", "src/sfnt/ttkern.c", "src/sfnt/ttload.c", "src/sfnt/ttmtx.c", "src/sfnt/ttpost.c", "src/sfnt/ttsbit.c", + "src/sfnt/ttsvg.c", "src/smooth/ftgrays.c", "src/smooth/ftsmooth.c", - "src/smooth/ftspic.c", + "src/svg/ftsvg.c", "src/truetype/ttdriver.c", "src/truetype/ttgload.c", "src/truetype/ttgxvar.c", "src/truetype/ttinterp.c", "src/truetype/ttobjs.c", - "src/truetype/ttpic.c", "src/truetype/ttpload.c", - "src/truetype/ttsubpix.c", ] cc_library(
diff --git a/external/freetype_config.patch b/external/freetype_config.patch index 2ebefaa..1670168 100644 --- a/external/freetype_config.patch +++ b/external/freetype_config.patch
@@ -2,7 +2,7 @@ index 76d271a..c5950fe 100644 --- a/include/freetype/config/ftmodule.h +++ b/include/freetype/config/ftmodule.h -@@ -12,21 +12,10 @@ +@@ -12,17 +12,6 @@ FT_USE_MODULE( FT_Module_Class, autofit_module_class ) FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class ) @@ -13,14 +13,10 @@ -FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class ) -FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class ) -FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class ) +-FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class ) -FT_USE_MODULE( FT_Module_Class, psaux_module_class ) -FT_USE_MODULE( FT_Module_Class, psnames_module_class ) -FT_USE_MODULE( FT_Module_Class, pshinter_module_class ) - FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class ) FT_USE_MODULE( FT_Module_Class, sfnt_module_class ) FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class ) - FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class ) - FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class ) --FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class ) - - /* EOF */ + FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )