download.lst | 4 -
external/fontconfig/ExternalPackage_fontconfig_data.mk | 5 +-
external/fontconfig/README | 4 -
external/fontconfig/UnpackedTarball_fontconfig.mk | 1
external/fontconfig/android_x86.patch | 13 +++++
external/fontconfig/fontconfig-2.12.1.patch.1 | 36 +++++++--------
external/fontconfig/libfontconfig-bundled-soname.patch.0 | 2
7 files changed, 41 insertions(+), 24 deletions(-)
New commits:
commit 7aea297d371de4f8384f819e570bd3280a50b7bf
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Jan 5 19:47:19 2023 +0900
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Mar 1 11:10:42 2023 +0000
fontconfig: upgrade to release 2.14.2
Change-Id: I5347580318c752517c9ef7a37d4175a2c6db36bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145134
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/download.lst b/download.lst
index 95505112300a..09d11ff543c8 100644
--- a/download.lst
+++ b/download.lst
@@ -116,8 +116,8 @@ FIREBIRD_TARBALL := Firebird-3.0.7.33374-0.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
-FONTCONFIG_SHA256SUM :=
a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c
-FONTCONFIG_TARBALL := fontconfig-2.13.94.tar.xz
+FONTCONFIG_SHA256SUM :=
dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b
+FONTCONFIG_TARBALL := fontconfig-2.14.2.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/fontconfig/ExternalPackage_fontconfig_data.mk
b/external/fontconfig/ExternalPackage_fontconfig_data.mk
index cc33c26705d7..cc72312da430 100644
--- a/external/fontconfig/ExternalPackage_fontconfig_data.mk
+++ b/external/fontconfig/ExternalPackage_fontconfig_data.mk
@@ -23,13 +23,15 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,fontconfig_data,$(LIBO_SHARE
conf.d/10-hinting-medium.conf \
conf.d/10-hinting-none.conf \
conf.d/10-hinting-slight.conf \
- conf.d/10-no-sub-pixel.conf \
+ conf.d/10-no-antialias.conf \
conf.d/10-scale-bitmap-fonts.conf \
conf.d/10-sub-pixel-bgr.conf \
+ conf.d/10-sub-pixel-none.conf \
conf.d/10-sub-pixel-rgb.conf \
conf.d/10-sub-pixel-vbgr.conf \
conf.d/10-sub-pixel-vrgb.conf \
conf.d/10-unhinted.conf \
+ conf.d/10-yes-antialias.conf \
conf.d/11-lcdfilter-default.conf \
conf.d/11-lcdfilter-legacy.conf \
conf.d/11-lcdfilter-light.conf \
@@ -40,6 +42,7 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,fontconfig_data,$(LIBO_SHARE
conf.d/40-nonlatin.conf \
conf.d/45-generic.conf \
conf.d/45-latin.conf \
+ conf.d/48-spacing.conf \
conf.d/49-sansserif.conf \
conf.d/50-user.conf \
conf.d/51-local.conf \
diff --git a/external/fontconfig/README b/external/fontconfig/README
index 220ee6078a65..318d99594d89 100644
--- a/external/fontconfig/README
+++ b/external/fontconfig/README
@@ -1,6 +1,6 @@
-This "bundled" fontconfig is built only in an Android build
+This "bundled" fontconfig is usually built only in an Android build or a
fuzzing build
Fontconfig is a font configuration and customization library. It is designed
to locate fonts
within the system and select them according to requirements specified by
applications.
-From [ http://packages.debian.org/squeeze/fontconfig ]
\ No newline at end of file
+From [ https://www.freedesktop.org/wiki/Software/fontconfig/ ]
diff --git a/external/fontconfig/UnpackedTarball_fontconfig.mk
b/external/fontconfig/UnpackedTarball_fontconfig.mk
index ceb87ea062ad..25e5a33f1d75 100644
--- a/external/fontconfig/UnpackedTarball_fontconfig.mk
+++ b/external/fontconfig/UnpackedTarball_fontconfig.mk
@@ -14,6 +14,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,fontconfig,$(FONTCONFIG_TARBALL),,f
$(eval $(call gb_UnpackedTarball_set_patchlevel,fontconfig,0))
$(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\
+ $(if $(filter ANDROID,$(OS)), external/fontconfig/android_x86.patch) \
external/fontconfig/fontconfig-2.12.1.patch.1 \
external/fontconfig/ubsan.patch \
external/fontconfig/libfontconfig-bundled-soname.patch.0 \
diff --git a/external/fontconfig/android_x86.patch
b/external/fontconfig/android_x86.patch
new file mode 100644
index 000000000000..c8c0fc14ee64
--- /dev/null
+++ b/external/fontconfig/android_x86.patch
@@ -0,0 +1,13 @@
+Avoids "error: undefined symbol: posix_fadvise" if ANDROID_API_LEVEL is less
than 21.
+
+--- src/fccache.c
++++ src/fccache.c
+@@ -962,7 +962,7 @@
+ {
+ #if defined(HAVE_MMAP) || defined(__CYGWIN__)
+ cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0);
+-#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
++#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED) &&
(!defined(__ANDROID_API__) || (__ANDROID_API__ >= 21))
+ posix_fadvise (fd, 0, fd_stat->st_size, POSIX_FADV_WILLNEED);
+ #endif
+ if (cache == MAP_FAILED)
diff --git a/external/fontconfig/fontconfig-2.12.1.patch.1
b/external/fontconfig/fontconfig-2.12.1.patch.1
index f348d2aa8731..b6f54361bb8c 100644
--- a/external/fontconfig/fontconfig-2.12.1.patch.1
+++ b/external/fontconfig/fontconfig-2.12.1.patch.1
@@ -1,7 +1,7 @@
diff -up fontconfig/configure.dt fontconfig/configure
---- fontconfig/configure.dt 2017-02-01 22:07:29.671668568 +0100
-+++ fontconfig/configure 2017-02-01 22:09:53.335215490 +0100
-@@ -10469,7 +10469,7 @@ _LT_EOF
+--- fontconfig/configure.dt 2023-01-27 17:22:13.000000000 +0900
++++ fontconfig/configure 2023-02-21 20:04:01.347467874 +0900
+@@ -11534,7 +11534,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
@@ -10,7 +10,7 @@ diff -up fontconfig/configure.dt fontconfig/configure
archive_expsym_cmds=''
;;
m68k)
-@@ -10485,7 +10485,7 @@ _LT_EOF
+@@ -11550,7 +11550,7 @@ _LT_EOF
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 fontconfig/configure.dt fontconfig/configure
else
ld_shlibs=no
fi
-@@ -10519,7 +10519,7 @@ _LT_EOF
+@@ -11584,7 +11584,7 @@ _LT_EOF
;;
haiku*)
@@ -28,7 +28,7 @@ diff -up fontconfig/configure.dt fontconfig/configure
link_all_deplibs=yes
;;
-@@ -10614,13 +10614,13 @@ _LT_EOF
+@@ -11680,13 +11680,13 @@ _LT_EOF
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
@@ -37,14 +37,14 @@ diff -up fontconfig/configure.dt fontconfig/configure
if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >>
$output_objdir/$libname.ver~
+ cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >>
$output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname $wl-version-script
$wl$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs
$compiler_flags $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
-@@ -10650,8 +10650,8 @@ _LT_EOF
+@@ -11716,8 +11716,8 @@ _LT_EOF
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -55,7 +55,7 @@ diff -up fontconfig/configure.dt fontconfig/configure
fi
;;
-@@ -10669,8 +10669,8 @@ _LT_EOF
+@@ -11735,8 +11735,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null;
then
@@ -66,7 +66,7 @@ diff -up fontconfig/configure.dt fontconfig/configure
else
ld_shlibs=no
fi
-@@ -10698,8 +10698,8 @@ _LT_EOF
+@@ -11764,8 +11764,8 @@ _LT_EOF
# 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 fontconfig/configure.dt fontconfig/configure
else
ld_shlibs=no
fi
-@@ -10716,8 +10716,8 @@ _LT_EOF
+@@ -11782,8 +11782,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null;
then
@@ -88,7 +88,7 @@ diff -up fontconfig/configure.dt fontconfig/configure
else
ld_shlibs=no
fi
-@@ -11016,7 +11016,7 @@ fi
+@@ -12086,7 +12086,7 @@ fi
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
@@ -97,7 +97,7 @@ diff -up fontconfig/configure.dt fontconfig/configure
archive_expsym_cmds=''
;;
m68k)
-@@ -11285,7 +11285,7 @@ fi
+@@ -12356,7 +12356,7 @@ fi
irix5* | irix6* | nonstopux*)
if test yes = "$GCC"; then
@@ -106,16 +106,16 @@ diff -up fontconfig/configure.dt fontconfig/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.
-@@ -11313,7 +11313,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol"
>&5
- $as_echo "$lt_cv_irix_exported_symbol" >&6; }
+@@ -12386,7 +12386,7 @@ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$lt_cv_irix_exported_symbol" >&5
+ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
if test yes = "$lt_cv_irix_exported_symbol"; then
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all
"$wl-set_version $wl$verstring"` $wl-update_registry
$wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags `test -n "$verstring" && func_echo_all "$wl-set_version
$wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations
$wl-exports_file $wl$export_symbols -o $lib'
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'
-@@ -11408,7 +11408,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -12482,7 +12482,7 @@ printf "%s\n" "$lt_cv_irix_exported_symb
osf3*)
if test yes = "$GCC"; then
allow_undefined_flag=' $wl-expect_unresolved $wl\*'
@@ -124,7 +124,7 @@ diff -up fontconfig/configure.dt fontconfig/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'
-@@ -11421,7 +11421,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -12495,7 +12495,7 @@ printf "%s\n" "$lt_cv_irix_exported_symb
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test yes = "$GCC"; then
allow_undefined_flag=' $wl-expect_unresolved $wl\*'
diff --git a/external/fontconfig/libfontconfig-bundled-soname.patch.0
b/external/fontconfig/libfontconfig-bundled-soname.patch.0
index 390338e957e8..14da823315be 100644
--- a/external/fontconfig/libfontconfig-bundled-soname.patch.0
+++ b/external/fontconfig/libfontconfig-bundled-soname.patch.0
@@ -1,7 +1,7 @@
# -*- Mode: Diff -*-
--- src/Makefile.in
+++ src/Makefile.in
-@@ -525,6 +525,6 @@
+@@ -529,6 +529,6 @@
lib_LTLIBRARIES = libfontconfig.la
libfontconfig_la_LDFLAGS = \
- -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
