download.lst | 4 ++--
external/freetype/freetype-2.6.5.patch.1 | 6 +++---
external/freetype/ubsan.patch | 12 ------------
3 files changed, 5 insertions(+), 17 deletions(-)
New commits:
commit 265914ee3e99e70a9b1f5a9a80f3574fc9af5392
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Aug 29 18:15:38 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Aug 29 20:09:50 2024 +0200
freetype: upgrade to 2.13.3
Downloaded from
https://sourceforge.net/projects/freetype/files/freetype2/2.13.3/freetype-2.13.3.tar.xz/download
Change-Id: Id38ce5fe5c04d515f4e8298326336cfb60f7ed36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172607
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index 199bfde5c5ec..e42cb525f183 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 :=
12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d
-FREETYPE_TARBALL := freetype-2.13.2.tar.xz
+FREETYPE_SHA256SUM :=
0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289
+FREETYPE_TARBALL := freetype-2.13.3.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 544e4fa496a6..5d940b11addc 100644
--- a/external/freetype/freetype-2.6.5.patch.1
+++ b/external/freetype/freetype-2.6.5.patch.1
@@ -146,12 +146,12 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
;;
*)
XX_ANSIFLAGS=""
-@@ -13796,7 +13796,7 @@ if ac_fn_c_try_compile "$LINENO"
+@@ -13982,7 +13982,7 @@
then :
{ printf "%s
" "$as_me:${as_lineno-$LINENO}: result: ok, adding to XX_ANSIFLAGS" >&5
printf "%s
" "ok, adding to XX_ANSIFLAGS" >&6; }
- XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}"
+ XX_ANSIFLAGS="${XX_ANSIFLAGS}"
- else $as_nop
- { printf "%s
" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ else case e in #(
+ e) { printf "%s
" "$as_me:${as_lineno-$LINENO}: result: no" >&5
diff --git a/external/freetype/ubsan.patch b/external/freetype/ubsan.patch
index 43ce217c4b7d..7e474c815942 100644
--- a/external/freetype/ubsan.patch
+++ b/external/freetype/ubsan.patch
@@ -1,15 +1,3 @@
---- src/psaux/psobjs.c.orig 2023-02-04 23:00:05.000000000 +0900
-+++ src/psaux/psobjs.c 2023-02-22 16:28:26.632283841 +0900
-@@ -200,7 +200,8 @@
- /* add the object to the base block and adjust offset */
- table->elements[idx] = FT_OFFSET( table->block, table->cursor );
- table->lengths [idx] = length;
-- FT_MEM_COPY( table->block + table->cursor, object, length );
-+ if (length != 0)
-+ FT_MEM_COPY( table->block + table->cursor, object, length );
-
- table->cursor += length;
- return FT_Err_Ok;
--- src/truetype/ttgxvar.c
+++ src/truetype/ttgxvar.c
@@ -1045,7 +1045,7 @@
