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 08153a011cf4c07e21eb8fffe23db2312e5de6f9..927249a5c07dcb126ce3b376513b40f957a15d38 100644 (file)
--- 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 db76a45e73c2e863612d38305225c2ce992d3176..ebbe5596796afc15fe4f813cf1776c1b3595870b 100755 (executable)
--- 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)