From ba9b66eecf9ced0d890ff9d6b7a6efda35825382 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 1 Feb 2017 10:43:57 +0100 Subject: upload fontconfig 2.12.1 Change-Id: I6f035afbf4a904bed5074d79f467ba43f7d8ed32 Reviewed-on: https://gerrit.libreoffice.org/33813 Tested-by: Jenkins Reviewed-by: David Tardon --- ...01-Fix-a-memory-leak-in-FcDirScanConfig.patch.1 | 26 ---- external/fontconfig/UnpackedTarball_fontconfig.mk | 5 +- external/fontconfig/fontconfig-2.12.1.patch.1 | 135 +++++++++++++++++++++ external/fontconfig/fontconfig-2.8.0.patch | 64 ---------- 4 files changed, 136 insertions(+), 94 deletions(-) delete mode 100644 external/fontconfig/0001-Fix-a-memory-leak-in-FcDirScanConfig.patch.1 create mode 100644 external/fontconfig/fontconfig-2.12.1.patch.1 delete mode 100644 external/fontconfig/fontconfig-2.8.0.patch (limited to 'external') diff --git a/external/fontconfig/0001-Fix-a-memory-leak-in-FcDirScanConfig.patch.1 b/external/fontconfig/0001-Fix-a-memory-leak-in-FcDirScanConfig.patch.1 deleted file mode 100644 index 8fd4dcf29117..000000000000 --- a/external/fontconfig/0001-Fix-a-memory-leak-in-FcDirScanConfig.patch.1 +++ /dev/null @@ -1,26 +0,0 @@ -From ea1c6ea337b8cf6b86169b565787d0d31a0fc330 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Tue, 27 Mar 2012 21:06:36 +0900 -Subject: [PATCH] Fix a memory leak in FcDirScanConfig() - ---- - src/fcdir.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/fcdir.c b/src/fcdir.c -index d8b094f..4399afc 100644 ---- a/src/fcdir.c -+++ b/src/fcdir.c -@@ -211,6 +211,9 @@ bail2: - bail1: - closedir (d); - bail: -+ if (file) -+ free (file); -+ - return ret; - } - --- -2.9.3 - diff --git a/external/fontconfig/UnpackedTarball_fontconfig.mk b/external/fontconfig/UnpackedTarball_fontconfig.mk index be440335ecf9..6026a817c5ed 100644 --- a/external/fontconfig/UnpackedTarball_fontconfig.mk +++ b/external/fontconfig/UnpackedTarball_fontconfig.mk @@ -11,11 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,fontconfig)) $(eval $(call gb_UnpackedTarball_set_tarball,fontconfig,$(FONTCONFIG_TARBALL),,fontconfig)) -$(eval $(call gb_UnpackedTarball_set_patchlevel,fontconfig,3)) - $(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\ - external/fontconfig/fontconfig-2.8.0.patch \ - external/fontconfig/0001-Fix-a-memory-leak-in-FcDirScanConfig.patch.1 \ + external/fontconfig/fontconfig-2.12.1.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/fontconfig/fontconfig-2.12.1.patch.1 b/external/fontconfig/fontconfig-2.12.1.patch.1 new file mode 100644 index 000000000000..f348d2aa8731 --- /dev/null +++ b/external/fontconfig/fontconfig-2.12.1.patch.1 @@ -0,0 +1,135 @@ +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 + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' + archive_expsym_cmds='' + ;; + m68k) +@@ -10485,7 +10485,7 @@ _LT_EOF + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME +- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags -o $lib' + else + ld_shlibs=no + fi +@@ -10519,7 +10519,7 @@ _LT_EOF + ;; + + 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 + ;; + +@@ -10614,13 +10614,13 @@ _LT_EOF + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac +- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib' + + 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~ + 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 + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -10669,8 +10669,8 @@ _LT_EOF + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -10698,8 +10698,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' +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -10716,8 +10716,8 @@ _LT_EOF + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -11016,7 +11016,7 @@ fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' + archive_expsym_cmds='' + ;; + m68k) +@@ -11285,7 +11285,7 @@ fi + + irix5* | irix6* | nonstopux*) + if test yes = "$GCC"; then +- archive_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 -o $lib' ++ archive_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 -o $lib' + # 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; } + 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" > + osf3*) + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' +- archive_cmds='$CC -shared$allow_undefined_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 -o $lib' ++ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + 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" > + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' +- archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ++ archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' diff --git a/external/fontconfig/fontconfig-2.8.0.patch b/external/fontconfig/fontconfig-2.8.0.patch deleted file mode 100644 index 5c89a40381dd..000000000000 --- a/external/fontconfig/fontconfig-2.8.0.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- misc/build/fontconfig-2.8.0/config.sub -+++ misc/build/fontconfig-2.8.0/config.sub -@@ -120,7 +120,7 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ nto-qnx* | linux-android* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os -@@ -1272,7 +1272,7 @@ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ -- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -+ | -udi* | -android* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ---- misc/build/fontconfig-2.8.0/configure -+++ misc/build/fontconfig-2.8.0/configure -@@ -8718,7 +8718,7 @@ - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac -- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ ---- misc/build/fontconfig-2.8.0/fontconfig/fontconfig.h -+++ misc/build/fontconfig-2.8.0/fontconfig/fontconfig.h -@@ -113,9 +113,9 @@ - #define FC_DECORATIVE "decorative" /* Bool - true if style is a decorative variant */ - #define FC_LCD_FILTER "lcdfilter" /* Int */ - --#define FC_CACHE_SUFFIX ".cache-"FC_CACHE_VERSION --#define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION --#define FC_USER_CACHE_FILE ".fonts.cache-"FC_CACHE_VERSION -+#define FC_CACHE_SUFFIX ".cache-" FC_CACHE_VERSION -+#define FC_DIR_CACHE_FILE "fonts.cache-" FC_CACHE_VERSION -+#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION - - /* Adjust outline rasterizer */ - #define FC_CHAR_WIDTH "charwidth" /* Int */ ---- misc/build/fontconfig-2.8.0/src/fcxml.c -+++ misc/build/fontconfig-2.8.0/src/fcxml.c -@@ -1123,6 +1123,7 @@ - * Have to swap the decimal point to match the current locale - * if that locale doesn't use 0x2e - */ -+#ifndef __ANDROID__ - if ((dot = strchr (s, 0x2e)) && - (locale_data = localeconv ()) && - (locale_data->decimal_point[0] != 0x2e || -@@ -1158,6 +1158,7 @@ - } - } - else -+#endif - v = strtod (s, end); - return v; - } -- cgit