bin/oss-fuzz-setup.sh | 2 -
download.lst | 4 +--
external/freetype/freetype-2.6.5.patch.1 | 32 +++++++++++++++----------------
3 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit c99b73c16b725ec2bf2f5417f28d1688c3322d7d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 20 12:08:02 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 20 14:50:41 2021 +0200
upgrade freetype to 2.11.0
Change-Id: I794e188daf2d50c457a80bc3b12bfafd0c91c8aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123887
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/bin/oss-fuzz-setup.sh b/bin/oss-fuzz-setup.sh
index e7394d515061..78c4e0a940b9 100755
--- a/bin/oss-fuzz-setup.sh
+++ b/bin/oss-fuzz-setup.sh
@@ -61,7 +61,7 @@ curl --no-progress-meter -S \
-C - -O https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz \
-C - -O https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz \
-C - -O https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz \
- -C - -O https://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2 \
+ -C - -O https://dev-www.libreoffice.org/src/freetype-2.11.0.tar.xz \
-C - -O https://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz \
-C - -O https://dev-www.libreoffice.org/src/libepoxy-1.5.9.tar.xz \
-C - -O https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz \
diff --git a/download.lst b/download.lst
index d3c0a0368746..0573475da78b 100644
--- a/download.lst
+++ b/download.lst
@@ -96,8 +96,8 @@ export FONT_SCHEHERAZADE_SHA256SUM :=
251c8817ceb87d9b661ce1d5b49e732a0116add10a
export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip
export FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
-export FREETYPE_SHA256SUM :=
db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d
-export FREETYPE_TARBALL := freetype-2.9.1.tar.bz2
+export FREETYPE_SHA256SUM :=
8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7
+export FREETYPE_TARBALL := freetype-2.11.0.tar.xz
export GLM_SHA256SUM :=
c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95
export GLM_TARBALL := glm-0.9.9.7.zip
export GPGME_SHA256SUM :=
c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46
diff --git a/external/freetype/freetype-2.6.5.patch.1
b/external/freetype/freetype-2.6.5.patch.1
index a9c231cbe384..faae4bafddd4 100644
--- a/external/freetype/freetype-2.6.5.patch.1
+++ b/external/freetype/freetype-2.6.5.patch.1
@@ -1,7 +1,7 @@
diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure
--- freetype/builds/unix/configure.dt 2017-02-01 22:14:45.206257952 +0100
+++ freetype/builds/unix/configure 2017-02-01 22:16:31.076183707 +0100
-@@ -8858,7 +8858,7 @@
+@@ -8887,7 +8887,7 @@
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
@@ -10,7 +10,7 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
archive_expsym_cmds=''
;;
m68k)
-@@ -8874,7 +8874,7 @@
+@@ -8903,7 +8903,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <j...@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -19,7 +19,7 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
else
ld_shlibs=no
fi
-@@ -8908,7 +8908,7 @@
+@@ -8937,7 +8937,7 @@
;;
haiku*)
@@ -28,7 +28,7 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
link_all_deplibs=yes
;;
-@@ -9003,13 +9003,13 @@
+@@ -9032,13 +9032,13 @@
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
@@ -44,7 +44,7 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
fi
case $cc_basename in
-@@ -9039,8 +9039,8 @@
+@@ -9068,8 +9068,8 @@
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -55,7 +55,7 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
fi
;;
-@@ -9058,8 +9058,8 @@
+@@ -9087,8 +9087,8 @@
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null;
then
@@ -66,7 +66,7 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
else
ld_shlibs=no
fi
-@@ -9087,8 +9087,8 @@
+@@ -9116,8 +9116,8 @@
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null;
then
hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
@@ -77,7 +77,7 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
else
ld_shlibs=no
fi
-@@ -9105,8 +9105,8 @@
+@@ -9134,8 +9134,8 @@
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null;
then
@@ -88,7 +88,7 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
else
ld_shlibs=no
fi
-@@ -9405,7 +9405,7 @@
+@@ -9434,7 +9434,7 @@
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
@@ -97,7 +97,7 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
archive_expsym_cmds=''
;;
m68k)
-@@ -9674,7 +9674,7 @@
+@@ -9703,7 +9703,7 @@
irix5* | irix6* | nonstopux*)
if test yes = "$GCC"; then
@@ -106,7 +106,7 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
-@@ -9702,7 +9702,7 @@
+@@ -9731,7 +9731,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol"
>&5
$as_echo "$lt_cv_irix_exported_symbol" >&6; }
if test yes = "$lt_cv_irix_exported_symbol"; then
@@ -115,7 +115,7 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
fi
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname
$soname `test -n "$verstring" && func_echo_all "-set_version $verstring"`
-update_registry $output_objdir/so_locations -o $lib'
-@@ -9797,7 +9797,7 @@
+@@ -9826,7 +9826,7 @@
osf3*)
if test yes = "$GCC"; then
allow_undefined_flag=' $wl-expect_unresolved $wl\*'
@@ -124,7 +124,7 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs
$compiler_flags -soname $soname `test -n "$verstring" && func_echo_all
"-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-@@ -9810,7 +9810,7 @@
+@@ -9839,7 +9839,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test yes = "$GCC"; then
allow_undefined_flag=' $wl-expect_unresolved $wl\*'
@@ -133,7 +133,7 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
-@@ -13143,10 +13143,10 @@
+@@ -13254,10 +13254,10 @@
XX_CFLAGS="-Wall"
case "$host" in
*-*-mingw*)
@@ -145,8 +145,8 @@ diff -up freetype/builds/unix/configure.dt
freetype/builds/unix/configure
+ XX_ANSIFLAGS=""
;;
*)
- GCC_VERSION=`$CC -dumpversion`
-@@ -13195,7 +13195,7 @@
+ XX_ANSIFLAGS=""
+@@ -13294,7 +13294,7 @@
if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, adding to
XX_ANSIFLAGS" >&5
$as_echo "ok, adding to XX_ANSIFLAGS" >&6; }
