download.lst | 4 ++-- external/freetype/freetype-2.6.5.patch.1 | 4 ++-- external/freetype/ubsan.patch | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit 8d8ec7dc68ab992f3dffe9bcab2fefbb363f9082 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Sep 8 12:48:25 2025 +0200 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Wed Sep 10 18:49:49 2025 +0200 freetype: upgrade to 2.14.0 Downloaded from https://sourceforge.net/projects/freetype/files/freetype2/2.14.0/freetype-2.14.0.tar.xz/download Change-Id: If11ce5186689702496754b4668fedbaed14ab287 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190660 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit b732868bd612d3b046ab395d9db69b5d92b6f984) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190667 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/download.lst b/download.lst index b3fcaf8b51d8..4f77fa7ca3b5 100644 --- a/download.lst +++ b/download.lst @@ -302,8 +302,8 @@ FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -FREETYPE_SHA256SUM := 0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289 -FREETYPE_TARBALL := freetype-2.13.3.tar.xz +FREETYPE_SHA256SUM := f8dfa8f15ef0576738dfb55b2e6e6b172fd5d09b6f03785a1df03239549f64d2 +FREETYPE_TARBALL := freetype-2.14.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/freetype/freetype-2.6.5.patch.1 b/external/freetype/freetype-2.6.5.patch.1 index 5d940b11addc..e00dbeb3b97b 100644 --- a/external/freetype/freetype-2.6.5.patch.1 +++ b/external/freetype/freetype-2.6.5.patch.1 @@ -19,13 +19,13 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure else ld_shlibs=no fi -@@ -9573,7 +9573,7 @@ _LT_EOF +@@ -9771,7 +9771,7 @@ ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' - link_all_deplibs=yes + link_all_deplibs=no ;; @@ -9669,13 +9669,13 @@ _LT_EOF diff --git a/external/freetype/ubsan.patch b/external/freetype/ubsan.patch index 7e474c815942..e915bedf7a46 100644 --- a/external/freetype/ubsan.patch +++ b/external/freetype/ubsan.patch @@ -1,11 +1,11 @@ --- src/truetype/ttgxvar.c +++ src/truetype/ttgxvar.c -@@ -1045,7 +1045,7 @@ - if ( varData->longWords ) +@@ -1217,7 +1217,7 @@ per_region_size *= 2; + } - bytes = varData->deltaSet + per_region_size * innerIndex; + bytes = varData->deltaSet ? varData->deltaSet + per_region_size * innerIndex : NULL; - if ( varData->longWords ) - { + /* outer loop steps through master designs to be blended */ + for ( master = 0; master < varData->regionIdxCount; master++ )
