walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

A few random fontconfig build fixes

This commit is contained in:
Keith Packard 2002-05-23 23:00:46 +00:00
parent 61bb4bad75
commit 48db40f692
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/config-subst
View File

@ -1,8 +1,10 @@
#!/bin/sh #!/bin/sh
exprs="" script=config-subst.$$
trap "rm $script" 0
rm -f $script
for i in ${1+"$@"}; do for i in ${1+"$@"}; do
var="`echo $i | sed 's/=.*$//'`" var="`echo "$i" | sed 's/=.*$//'`"
val="`echo $i | sed 's/^[^=]*=//'`" val="`echo "$i" | sed 's/^[^=]*=//'`"
exprs="$exprs -e s;@$var@;$val;" echo "s;@$var@;$val;" >> $script
done done
sed $exprs sed -f $script

7
fontconfig/fontconfig.h
View File

@ -1,5 +1,5 @@
/* /*
* $XFree86: xc/lib/fontconfig/fontconfig/fontconfig.h,v 1.8 2002/05/21 17:06:22 keithp Exp $ * $XFree86: xc/lib/fontconfig/fontconfig/fontconfig.h,v 1.9 2002/05/22 04:37:07 keithp Exp $
* *
* Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
* *
@ -37,7 +37,7 @@ typedef int FcBool;
*/ */
#define FC_MAJOR 1 #define FC_MAJOR 1
#define FC_MINOR 0 #define FC_MINOR 0
#define FC_REVISION 0 #define FC_REVISION 1
#define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION)) #define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
@ -412,6 +412,9 @@ FcInitLoadConfigAndFonts (void);
FcBool FcBool
FcInit (void); FcInit (void);
int
FcGetVersion (void);
FcBool FcBool
FcInitReinitialize (void); FcInitReinitialize (void);

8
src/fcinit.c
View File

@ -1,5 +1,5 @@
/* /*
* $XFree86: xc/lib/fontconfig/src/fcinit.c,v 1.4 2002/05/21 17:06:22 keithp Exp $ * $XFree86: xc/lib/fontconfig/src/fcinit.c,v 1.5 2002/05/21 17:48:15 keithp Exp $
* *
* Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
* *
@ -43,6 +43,12 @@ bail0:
return 0; return 0;
} }
int
FcGetVersion (void)
{
return FC_VERSION;
}
/* /*
* Load the configuration files * Load the configuration files
*/ */