From: Keith Packard <keithp@neko.keithp.com>
Date: Thu, 7 Sep 2006 21:37:52 +0000 (-0700)
Subject: Replace gnu-specific sed command with simple grep.
X-Git-Tag: 2.4.0~11
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;ds=sidebyside;h=6cff1dca81b60fcd75e19f3ed827aae98f643fd1;p=fontconfig.git

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)