Diff
Modified: trunk/Tools/ChangeLog (222127 => 222128)
--- trunk/Tools/ChangeLog 2017-09-16 08:28:06 UTC (rev 222127)
+++ trunk/Tools/ChangeLog 2017-09-16 09:27:22 UTC (rev 222128)
@@ -1,3 +1,20 @@
+2017-09-16 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Bump fontconfig version to 2.12.4
+ https://bugs.webkit.org/show_bug.cgi?id=176997
+
+ Reviewed by Michael Catanzaro.
+
+ It's the latest stable version and we can get rid of the patches we have.
+
+ * WebKitTestRunner/gtk/fonts/fonts.conf: Remove hinting config we no longer need with newer FreeType and
+ deprecated <blank> that current fontconfig just ignores.
+ * gtk/jhbuild.modules:
+ * gtk/patches/fontconfig-2.11.1-add-autogen.patch: Removed.
+ * gtk/patches/fontconfig-Avoid-conflicts-with-integer-width-macros-from-TS-18661-1-2014.patch: Removed.
+ * gtk/patches/fontconfig-Fix-the-build-issue-with-gperf-3.1.patch: Removed.
+ * gtk/patches/fontconfig-fix-osx-cache.diff: Removed.
+
2017-09-15 Lucas Forschler <[email protected]>
Move run-webkit-archive from Tools/Scripts to Tools/BuildSlaveSupport
Modified: trunk/Tools/WebKitTestRunner/gtk/fonts/fonts.conf (222127 => 222128)
--- trunk/Tools/WebKitTestRunner/gtk/fonts/fonts.conf 2017-09-16 08:28:06 UTC (rev 222127)
+++ trunk/Tools/WebKitTestRunner/gtk/fonts/fonts.conf 2017-09-16 09:27:22 UTC (rev 222128)
@@ -2,19 +2,6 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
- <!-- Due to patent (http://freetype.sourceforge.net/patents.html)
- issues hinting gives different results depending on the
- freetype version of the linux distribution, avoiding hinting
- gives more consistent results. When all the distributions
- release freetype the 2.4, which enables by default the
- hinting method that was patented, we could undo this change
- and try the hinting again. -->
- <match target="font">
- <edit name="hinting" mode="assign">
- <bool>false</bool>
- </edit>
- </match>
-
<!-- This system may have turned off selection of bitmap fonts, but
we must turn it on again, because we want to be able to test that
bitmap fonts with no valid encodings are *never* selected regardless
@@ -367,69 +354,4 @@
</edit>
</match>
- <config>
- <!-- These are the default Unicode chars that are expected to be blank
- in fonts. All other blank chars are assumed to be broken and won't
- appear in the resulting charsets -->
- <blank>
- <int>0x0020</int> <!-- SPACE -->
- <int>0x00A0</int> <!-- NO-BREAK SPACE -->
- <int>0x00AD</int> <!-- SOFT HYPHEN -->
- <int>0x034F</int> <!-- COMBINING GRAPHEME JOINER -->
- <int>0x0600</int> <!-- ARABIC NUMBER SIGN -->
- <int>0x0601</int> <!-- ARABIC SIGN SANAH -->
- <int>0x0602</int> <!-- ARABIC FOOTNOTE MARKER -->
- <int>0x0603</int> <!-- ARABIC SIGN SAFHA -->
- <int>0x06DD</int> <!-- ARABIC END OF AYAH -->
- <int>0x070F</int> <!-- SYRIAC ABBREVIATION MARK -->
- <int>0x115F</int> <!-- HANGUL CHOSEONG FILLER -->
- <int>0x1160</int> <!-- HANGUL JUNGSEONG FILLER -->
- <int>0x1680</int> <!-- OGHAM SPACE MARK -->
- <int>0x17B4</int> <!-- KHMER VOWEL INHERENT AQ -->
- <int>0x17B5</int> <!-- KHMER VOWEL INHERENT AA -->
- <int>0x180E</int> <!-- MONGOLIAN VOWEL SEPARATOR -->
- <int>0x2000</int> <!-- EN QUAD -->
- <int>0x2001</int> <!-- EM QUAD -->
- <int>0x2002</int> <!-- EN SPACE -->
- <int>0x2003</int> <!-- EM SPACE -->
- <int>0x2004</int> <!-- THREE-PER-EM SPACE -->
- <int>0x2005</int> <!-- FOUR-PER-EM SPACE -->
- <int>0x2006</int> <!-- SIX-PER-EM SPACE -->
- <int>0x2007</int> <!-- FIGURE SPACE -->
- <int>0x2008</int> <!-- PUNCTUATION SPACE -->
- <int>0x2009</int> <!-- THIN SPACE -->
- <int>0x200A</int> <!-- HAIR SPACE -->
- <int>0x200B</int> <!-- ZERO WIDTH SPACE -->
- <int>0x200C</int> <!-- ZERO WIDTH NON-JOINER -->
- <int>0x200D</int> <!-- ZERO WIDTH JOINER -->
- <int>0x200E</int> <!-- LEFT-TO-RIGHT MARK -->
- <int>0x200F</int> <!-- RIGHT-TO-LEFT MARK -->
- <int>0x2028</int> <!-- LINE SEPARATOR -->
- <int>0x2029</int> <!-- PARAGRAPH SEPARATOR -->
- <int>0x202A</int> <!-- LEFT-TO-RIGHT EMBEDDING -->
- <int>0x202B</int> <!-- RIGHT-TO-LEFT EMBEDDING -->
- <int>0x202C</int> <!-- POP DIRECTIONAL FORMATTING -->
- <int>0x202D</int> <!-- LEFT-TO-RIGHT override -->
- <int>0x202E</int> <!-- RIGHT-TO-LEFT override -->
- <int>0x202F</int> <!-- NARROW NO-BREAK SPACE -->
- <int>0x205F</int> <!-- MEDIUM MATHEMATICAL SPACE -->
- <int>0x2060</int> <!-- WORD JOINER -->
- <int>0x2061</int> <!-- FUNCTION APPLICATION -->
- <int>0x2062</int> <!-- INVISIBLE TIMES -->
- <int>0x2063</int> <!-- INVISIBLE SEPARATOR -->
- <int>0x206A</int> <!-- INHIBIT SYMMETRIC SWAPPING -->
- <int>0x206B</int> <!-- ACTIVATE SYMMETRIC SWAPPING -->
- <int>0x206C</int> <!-- INHIBIT ARABIC FORM SHAPING -->
- <int>0x206D</int> <!-- ACTIVATE ARABIC FORM SHAPING -->
- <int>0x206E</int> <!-- NATIONAL DIGIT SHAPES -->
- <int>0x206F</int> <!-- NOMINAL DIGIT SHAPES -->
- <int>0x3000</int> <!-- IDEOGRAPHIC SPACE -->
- <int>0x3164</int> <!-- HANGUL FILLER -->
- <int>0xFEFF</int> <!-- ZERO WIDTH NO-BREAK SPACE -->
- <int>0xFFA0</int> <!-- HALFWIDTH HANGUL FILLER -->
- <int>0xFFF9</int> <!-- INTERLINEAR ANNOTATION ANCHOR -->
- <int>0xFFFA</int> <!-- INTERLINEAR ANNOTATION SEPARATOR -->
- <int>0xFFFB</int> <!-- INTERLINEAR ANNOTATION TERMINATOR -->
- </blank>
- </config>
</fontconfig>
Modified: trunk/Tools/gtk/jhbuild.modules (222127 => 222128)
--- trunk/Tools/gtk/jhbuild.modules 2017-09-16 08:28:06 UTC (rev 222127)
+++ trunk/Tools/gtk/jhbuild.modules 2017-09-16 09:27:22 UTC (rev 222128)
@@ -246,22 +246,9 @@
<dep package="freetype6"/>
<dep package="libxml2"/>
</dependencies>
- <branch module="software/fontconfig/release/fontconfig-2.11.1.tar.gz" version="2.11.1"
+ <branch module="software/fontconfig/release/fontconfig-2.12.4.tar.bz2" version="2.12.4"
repo="freedesktop.org"
- hash="sha256:b6b066c7dce3f436fdc0dfbae9d36122b38094f4f53bd8dffd45e195b0540d8d"
- md5sum="e75e303b4f7756c2b16203a57ac87eba">
- <patch file="fontconfig-fix-osx-cache.diff" strip="1"/>
-
- <!-- These will be in the next release after 2.12.1
- https://cgit.freedesktop.org/fontconfig/commit/?id=1ab5258f7c2abfafcd63a760ca08bf93591912da
- https://cgit.freedesktop.org/fontconfig/commit/?id=9878b306f6c673d3d6cd9db487f67eb426cc03df -->
- <patch file="fontconfig-Avoid-conflicts-with-integer-width-macros-from-TS-18661-1-2014.patch" strip="1"/>
- <patch file="fontconfig-Fix-the-build-issue-with-gperf-3.1.patch" strip="1"/>
-
- <!-- The previous patch modifies "configure.ac", and tarballs don't
- include the "autogen.sh" script, so let's re-add it here. -->
- <patch file="fontconfig-2.11.1-add-autogen.patch" strip="0"/>
- </branch>
+ hash="sha256:668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c"/>
</autotools>
<autotools id="adwaita-icon-theme" autogen-sh="configure">
Deleted: trunk/Tools/gtk/patches/fontconfig-2.11.1-add-autogen.patch (222127 => 222128)
--- trunk/Tools/gtk/patches/fontconfig-2.11.1-add-autogen.patch 2017-09-16 08:28:06 UTC (rev 222127)
+++ trunk/Tools/gtk/patches/fontconfig-2.11.1-add-autogen.patch 2017-09-16 09:27:22 UTC (rev 222128)
@@ -1,158 +0,0 @@
---- /dev/null 2017-05-03 11:22:57.496684165 +0300
-+++ autogen.sh 2017-05-04 15:13:08.100696670 +0300
-@@ -0,0 +1,155 @@
-+#!/bin/sh
-+# fontconfig/autogen.sh
-+#
-+# Copyright © 2000 Keith Packard
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of the author(s) not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. The authors make no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+# PERFORMANCE OF THIS SOFTWARE.
-+
-+# Run this to generate all the initial makefiles, etc.
-+
-+set -e
-+
-+srcdir=`dirname $0`
-+test -z "$srcdir" && srcdir=.
-+
-+case "$1" in
-+--noconf*)
-+ AUTOGEN_SUBDIR_MODE="true"
-+ shift
-+ ;;
-+esac
-+
-+ORIGDIR=`pwd`
-+cd $srcdir
-+PROJECT=Fontconfig
-+TEST_TYPE=-f
-+FILE=fontconfig/fontconfig.h
-+ACLOCAL=${ACLOCAL-aclocal}
-+ACLOCAL_FLAGS="-I m4"
-+LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
-+AUTOMAKE=${AUTOMAKE-automake}
-+AUTOHEADER=${AUTOHEADER-autoheader}
-+AUTOCONF=${AUTOCONF-autoconf}
-+GPERF=${GPERF-gperf}
-+LIBTOOLIZE_FLAGS="--copy --force"
-+
-+DIE=0
-+
-+($GPERF --version) < /dev/null > /dev/null 2>&1 || {
-+ echo
-+ echo "You must have gperf installed to compile $PROJECT."
-+ echo "Install the appropriate package for your distribution."
-+ echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-+ DIE=1
-+}
-+
-+have_libtool=false
-+if $LIBTOOLIZE --version < /dev/null > /dev/null 2>&1 ; then
-+ libtool_version=`$LIBTOOLIZE --version | sed 's/^.* \([0-9][.][0-9.]*\)[^ ]*$/\1/'`
-+ case $libtool_version in
-+ 1.4*|1.5*|1.6*|1.7*|2*)
-+ have_libtool=true
-+ ;;
-+ esac
-+fi
-+if $have_libtool ; then : ; else
-+ echo
-+ echo "You must have libtool 1.4 installed to compile $PROJECT."
-+ echo "Install the appropriate package for your distribution,"
-+ echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-+ DIE=1
-+fi
-+
-+($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || {
-+ echo
-+ echo "You must have autoconf installed to compile $PROJECT."
-+ echo "libtool the appropriate package for your distribution,"
-+ echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-+ DIE=1
-+}
-+
-+have_automake=false
-+need_libtoolize=true
-+if $AUTOMAKE --version < /dev/null > /dev/null 2>&1 ; then
-+ automake_version=`$AUTOMAKE --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
-+ case $automake_version in
-+ 1.2*|1.3*|1.4)
-+ ;;
-+ 1.4*)
-+ have_automake=true
-+ need_libtoolize=false
-+ ;;
-+ *)
-+ have_automake=true
-+ ;;
-+ esac
-+fi
-+if $have_automake ; then : ; else
-+ echo
-+ echo "You must have automake 1.4-p1 installed to compile $PROJECT."
-+ echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p1.tar.gz"
-+ echo "(or a newer version if it is available)"
-+ DIE=1
-+fi
-+
-+if test "$DIE" -eq 1; then
-+ exit 1
-+fi
-+
-+test $TEST_TYPE $FILE || {
-+ echo "You must run this script in the top-level $PROJECT directory"
-+ exit 1
-+}
-+
-+if test -z "$AUTOGEN_SUBDIR_MODE" -a -z "$NOCONFIGURE"; then
-+ if test -z "$*"; then
-+ echo "I am going to run ./configure with no arguments - if you wish "
-+ echo "to pass any to it, please specify them on the $0 command line."
-+ fi
-+fi
-+
-+echo Running $ACLOCAL $ACLOCAL_FLAGS
-+$ACLOCAL $ACLOCAL_FLAGS
-+
-+# optionally run autoheader
-+if $AUTOHEADER --version < /dev/null > /dev/null 2>&1; then
-+ echo Running $AUTOHEADER
-+ $AUTOHEADER
-+fi
-+
-+case $need_libtoolize in
-+ true)
-+ echo Running $LIBTOOLIZE $LIBTOOLIZE_FLAGS
-+ $LIBTOOLIZE $LIBTOOLIZE_FLAGS
-+ ;;
-+esac
-+
-+echo Running $AUTOMAKE -a $am_opt
-+$AUTOMAKE -a $am_opt
-+echo Running $AUTOCONF
-+$AUTOCONF
-+cd $ORIGDIR
-+
-+if test -z "$AUTOGEN_SUBDIR_MODE" -a -z "$NOCONFIGURE"; then
-+ echo Running $srcdir/configure "$@"
-+ $srcdir/configure "$@"
-+
-+ echo
-+ echo "Now type 'make' to compile $PROJECT."
-+fi
Deleted: trunk/Tools/gtk/patches/fontconfig-Avoid-conflicts-with-integer-width-macros-from-TS-18661-1-2014.patch (222127 => 222128)
--- trunk/Tools/gtk/patches/fontconfig-Avoid-conflicts-with-integer-width-macros-from-TS-18661-1-2014.patch 2017-09-16 08:28:06 UTC (rev 222127)
+++ trunk/Tools/gtk/patches/fontconfig-Avoid-conflicts-with-integer-width-macros-from-TS-18661-1-2014.patch 2017-09-16 09:27:22 UTC (rev 222128)
@@ -1,40 +0,0 @@
-commit 1ab5258f7c2abfafcd63a760ca08bf93591912da
-Author: Khem Raj <[email protected]>
-Date: Wed Dec 14 16:11:05 2016 -0800
-
- Avoid conflicts with integer width macros from TS 18661-1:2014
-
- glibc 2.25+ has now defined these macros in <limits.h>
- https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a
-
- Create an alias for FC_CHAR_WIDTH for ABI compatibility
-
- Signed-off-by: Khem Raj <[email protected]>
-
-diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
-index 5c72b22..070a557 100644
---- a/fontconfig/fontconfig.h
-+++ b/fontconfig/fontconfig.h
-@@ -128,7 +128,8 @@ typedef int FcBool;
- #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION
-
- /* Adjust outline rasterizer */
--#define FC_CHAR_WIDTH "charwidth" /* Int */
-+#define FC_CHARWIDTH "charwidth" /* Int */
-+#define FC_CHAR_WIDTH FC_CHARWIDTH
- #define FC_CHAR_HEIGHT "charheight"/* Int */
- #define FC_MATRIX "matrix" /* FcMatrix */
-
-diff --git a/src/fcobjs.h b/src/fcobjs.h
-index 1fc4f65..d27864b 100644
---- a/src/fcobjs.h
-+++ b/src/fcobjs.h
-@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL)
- FC_OBJECT (RGBA, FcTypeInteger, NULL)
- FC_OBJECT (SCALE, FcTypeDouble, NULL)
- FC_OBJECT (MINSPACE, FcTypeBool, NULL)
--FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)
-+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL)
- FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL)
- FC_OBJECT (MATRIX, FcTypeMatrix, NULL)
- FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet)
Deleted: trunk/Tools/gtk/patches/fontconfig-Fix-the-build-issue-with-gperf-3.1.patch (222127 => 222128)
--- trunk/Tools/gtk/patches/fontconfig-Fix-the-build-issue-with-gperf-3.1.patch 2017-09-16 08:28:06 UTC (rev 222127)
+++ trunk/Tools/gtk/patches/fontconfig-Fix-the-build-issue-with-gperf-3.1.patch 2017-09-16 09:27:22 UTC (rev 222128)
@@ -1,59 +0,0 @@
-commit 9878b306f6c673d3d6cd9db487f67eb426cc03df
-Author: Akira TAGOH <[email protected]>
-Date: Thu Feb 23 21:39:10 2017 +0900
-
- Fix the build issue with gperf 3.1
-
- To support the one of changes in gperf 3.1:
- * The 'len' parameter of the hash function and of the lookup function is now
- of type 'size_t' instead of 'unsigned int'. This makes it safe to call these
- functions with strings of length > 4 GB, on 64-bit machines.
-
-diff --git a/configure.ac b/configure.ac
-index 4948816..8fbf3d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -193,6 +193,26 @@ fi
- AC_CHECK_MEMBERS([struct dirent.d_type],,,
- [#include <dirent.h>])
-
-+# Check the argument type of the gperf hash/lookup function
-+AC_MSG_CHECKING([The type of len parameter of gperf hash/lookup function])
-+fc_gperf_test="$(echo 'foo' | gperf -L ANSI-C)"
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+ #include <string.h>
-+
-+ const char *in_word_set(register const char *, register size_t);
-+ $fc_gperf_test
-+ ]])], [FC_GPERF_SIZE_T=size_t],
-+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+ #include <string.h>
-+
-+ const char *in_word_set(register const char *, register unsigned int);
-+ $fc_gperf_test
-+ ]])], [FC_GPERF_SIZE_T="unsigned int"],
-+ [AC_MSG_ERROR([Unable to determine the type of the len parameter of the gperf hash/lookup function])]
-+)])
-+AC_DEFINE_UNQUOTED(FC_GPERF_SIZE_T, $FC_GPERF_SIZE_T, [The type of len parameter of the gperf hash/lookup function])
-+AC_MSG_RESULT($FC_GPERF_SIZE_T)
-+
- #
- # Checks for iconv
- #
-diff --git a/src/fcobjs.c b/src/fcobjs.c
-index 16ff31c..33bba8d 100644
---- a/src/fcobjs.c
-+++ b/src/fcobjs.c
-@@ -25,10 +25,10 @@
- #include "fcint.h"
-
- static unsigned int
--FcObjectTypeHash (register const char *str, register unsigned int len);
-+FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);
-
- static const struct FcObjectTypeInfo *
--FcObjectTypeLookup (register const char *str, register unsigned int len);
-+FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);
-
- #include "fcobjshash.h"
-
Deleted: trunk/Tools/gtk/patches/fontconfig-fix-osx-cache.diff (222127 => 222128)
--- trunk/Tools/gtk/patches/fontconfig-fix-osx-cache.diff 2017-09-16 08:28:06 UTC (rev 222127)
+++ trunk/Tools/gtk/patches/fontconfig-fix-osx-cache.diff 2017-09-16 09:27:22 UTC (rev 222128)
@@ -1,207 +0,0 @@
-diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
-index 99e0e9f..bf3b6b4 100644
---- a/fc-cache/fc-cache.c
-+++ b/fc-cache/fc-cache.c
-@@ -187,13 +187,8 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
-
- if (!cache)
- {
-- if (!recursive)
-- cache = FcDirCacheRescan (dir, config);
-- else
-- {
-- (*changed)++;
-- cache = FcDirCacheRead (dir, FcTrue, config);
-- }
-+ (*changed)++;
-+ cache = FcDirCacheRead (dir, FcTrue, config);
- if (!cache)
- {
- fprintf (stderr, "%s: error scanning\n", dir);
-@@ -391,7 +386,6 @@ main (int argc, char **argv)
- ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed, NULL);
- FcStrListDone (list);
- }
-- FcStrSetDestroy (updateDirs);
-
- /*
- * Try to create CACHEDIR.TAG anyway.
-diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
-index 2258251..d0b4e9e 100644
---- a/fontconfig/fontconfig.h
-+++ b/fontconfig/fontconfig.h
-@@ -541,9 +541,6 @@ FcDirSave (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir);
-
- FcPublic FcCache *
- FcDirCacheLoad (const FcChar8 *dir, FcConfig *config, FcChar8 **cache_file);
--
--FcPublic FcCache *
--FcDirCacheRescan (const FcChar8 *dir, FcConfig *config);
-
- FcPublic FcCache *
- FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config);
-diff --git a/src/fccache.c b/src/fccache.c
-index 5173e0b..10eacff 100644
---- a/src/fccache.c
-+++ b/src/fccache.c
-@@ -828,19 +828,6 @@ bail1:
- return NULL;
- }
-
--FcCache *
--FcDirCacheRebuild (FcCache *cache, struct stat *dir_stat, FcStrSet *dirs)
--{
-- FcCache *new;
-- FcFontSet *set = FcFontSetDeserialize (FcCacheSet (cache));
-- const FcChar8 *dir = FcCacheDir (cache);
--
-- new = FcDirCacheBuild (set, dir, dir_stat, dirs);
-- FcFontSetDestroy (set);
--
-- return new;
--}
--
- /* write serialized state to the cache file */
- FcBool
- FcDirCacheWrite (FcCache *cache, FcConfig *config)
-diff --git a/src/fcdir.c b/src/fcdir.c
-index 3bcd0b8..b040a28 100644
---- a/src/fcdir.c
-+++ b/src/fcdir.c
-@@ -130,12 +130,7 @@ FcFileScanConfig (FcFontSet *set,
- if (FcFileIsDir (file))
- return FcStrSetAdd (dirs, file);
- else
-- {
-- if (set)
-- return FcFileScanFontConfig (set, blanks, file, config);
-- else
-- return FcTrue;
-- }
-+ return FcFileScanFontConfig (set, blanks, file, config);
- }
-
- FcBool
-@@ -311,45 +306,6 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
- return cache;
- }
-
--FcCache *
--FcDirCacheRescan (const FcChar8 *dir, FcConfig *config)
--{
-- FcCache *cache = FcDirCacheLoad (dir, config, NULL);
-- FcCache *new = NULL;
-- struct stat dir_stat;
-- FcStrSet *dirs;
--
-- if (!cache)
-- return NULL;
-- if (FcStatChecksum (dir, &dir_stat) < 0)
-- goto bail;
-- dirs = FcStrSetCreate ();
-- if (!dirs)
-- goto bail;
--
-- /*
-- * Scan the dir
-- */
-- if (!FcDirScanConfig (NULL, dirs, NULL, dir, FcTrue, config))
-- goto bail1;
-- /*
-- * Rebuild the cache object
-- */
-- new = FcDirCacheRebuild (cache, &dir_stat, dirs);
-- if (!new)
-- goto bail1;
-- FcDirCacheUnload (cache);
-- /*
-- * Write out the cache file, ignoring any troubles
-- */
-- FcDirCacheWrite (new, config);
--
--bail1:
-- FcStrSetDestroy (dirs);
--bail:
-- return new;
--}
--
- /*
- * Read (or construct) the cache for a directory
- */
-diff --git a/src/fcfs.c b/src/fcfs.c
-index 21c6c7c..941abba 100644
---- a/src/fcfs.c
-+++ b/src/fcfs.c
-@@ -122,28 +122,6 @@ FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s)
-
- return s_serialize;
- }
--
--FcFontSet *
--FcFontSetDeserialize (const FcFontSet *set)
--{
-- int i;
-- FcFontSet *new = FcFontSetCreate ();
--
-- if (!new)
-- return NULL;
-- for (i = 0; i < set->nfont; i++)
-- {
-- if (!FcFontSetAdd (new, FcPatternDuplicate (FcFontSetFont (set, i))))
-- goto bail;
-- }
--
-- return new;
--bail:
-- FcFontSetDestroy (new);
--
-- return NULL;
--}
--
- #define __fcfs__
- #include "fcaliastail.h"
- #undef __fcfs__
-diff --git a/src/fcint.h b/src/fcint.h
-index cdf2dab..362ea6f 100644
---- a/src/fcint.h
-+++ b/src/fcint.h
-@@ -567,9 +567,6 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config);
- FcPrivate FcCache *
- FcDirCacheBuild (FcFontSet *set, const FcChar8 *dir, struct stat *dir_stat, FcStrSet *dirs);
-
--FcPrivate FcCache *
--FcDirCacheRebuild (FcCache *cache, struct stat *dir_stat, FcStrSet *dirs);
--
- FcPrivate FcBool
- FcDirCacheWrite (FcCache *cache, FcConfig *config);
-
-@@ -841,9 +838,6 @@ FcFontSetSerializeAlloc (FcSerialize *serialize, const FcFontSet *s);
- FcPrivate FcFontSet *
- FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s);
-
--FcPrivate FcFontSet *
--FcFontSetDeserialize (const FcFontSet *set);
--
- /* fchash.c */
- FcPrivate FcChar8 *
- FcHashGetSHA256Digest (const FcChar8 *input_strings,
-diff --git a/src/fcpat.c b/src/fcpat.c
-index 986cca3..0614ac2 100644
---- a/src/fcpat.c
-+++ b/src/fcpat.c
-@@ -33,7 +33,6 @@ FcPatternCreate (void)
- p = (FcPattern *) malloc (sizeof (FcPattern));
- if (!p)
- return 0;
-- memset (p, 0, sizeof (FcPattern));
- p->num = 0;
- p->size = 0;
- p->elts_offset = FcPtrToOffset (p, NULL);
-@@ -1311,7 +1310,6 @@ FcValueListSerialize (FcSerialize *serialize, const FcValueList *vl)
- }
- return head_serialized;
- }
--
- #define __fcpat__
- #include "fcaliastail.h"
- #include "fcftaliastail.h"
\ No newline at end of file
