[Fontconfig] fontconfig: Branch 'master'

[Keith Packard]

 fontconfig/fontconfig.h |    2 +-
 src/makealias           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 6cff1dca81b60fcd75e19f3ed827aae98f643fd1 (from 31e0f0321057a7612ed5a7fa890dad09e6a53ee6)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Thu Sep 7 14:37:52 2006 -0700

    Replace gnu-specific sed command with simple grep.
    
    makealias was using a gnu-extension to sed addressing, replace that with a
    simple (and more robuse) grep command. Also, found a bug in the public
    header file that was leaving one symbol out of the process.

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 08153a0..927249a 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -312,7 +312,7 @@ FcCacheNumSubdir (const FcCache *c);
 FcPublic int
 FcCacheNumFont (const FcCache *c);
 
-FcBool
+FcPublic FcBool
 FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config);
 
 FcPublic FcBool
diff --git a/src/makealias b/src/makealias
index db76a45..ebbe559 100755
--- a/src/makealias
+++ b/src/makealias
@@ -4,7 +4,7 @@ shift
 HEAD=fcalias.h
 TAIL=fcaliastail.h
 rm -f $HEAD $TAIL
-sed -n -e '/^FcPublic /,+1p' "$@" | sed -e '/^FcPublic /d' -e 's/ *(.*$//' |
+cat "$@" | grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$//' |
 while read name; do
 	case $name in
 	FcCacheDir|FcCacheSubdir)