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

Fix multiarch support (don't destroy multiarch files!) 

Require pkg-config. (Thanks Behdad; better solution wanted for libxml2
    detection!)
reviewed by: plam
This commit is contained in:
Patrick Lam 2006-03-24 15:21:10 +00:00
parent c022182231
commit b17cf498be
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2006-03-24 Mike Fabian <mfabian@suse.de>
reviewed by: plam
* src/fccache.c (FcGlobalCacheLoad, FcCacheSkipToArch):
Fix multiarch support (don't destroy multiarch files!)
2006-03-24 Patrick Lam <plam@mit.edu>
* configure.in:
Require pkg-config. (Thanks Behdad;
better solution wanted for libxml2 detection!)
2006-03-22 Patrick Lam <plam@mit.edu>
* src/fcatomic.c:

2
configure.in
View File

@ -306,6 +306,8 @@ fi
AC_ARG_ENABLE(libxml2, [ --enable-libxml2 Use libxml2 instead of Expat])
PKG_PROG_PKG_CONFIG
if test "$enable_libxml2" = "yes" -o "$expat" = "no"; then
PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6])
AC_DEFINE_UNQUOTED(ENABLE_LIBXML2,1,[Use libxml2 instead of Expat])

7
fonts.conf.in
View File

@ -72,6 +72,7 @@
Serif faces
-->
<alias>
<family>DejaVu Serif</family>
<family>Bitstream Vera Serif</family>
<family>Times New Roman</family>
<family>Thorndale AMT</family>
@ -91,6 +92,7 @@
Sans-serif faces
-->
<alias>
<family>DejaVu Sans</family>
<family>Bitstream Vera Sans</family>
<family>Helvetica</family>
<family>Arial</family>
@ -112,7 +114,7 @@
Monospace faces
-->
<alias>
<family>Bitstream Vera Sans Mono</family>
<family>DejaVu Sans Mono</family>
<family>Courier</family>
<family>Courier New</family>
<family>Andale Mono</family>
@ -260,6 +262,7 @@
<alias>
<family>serif</family>
<prefer>
<family>DejaVu Serif</family>
<family>Bitstream Vera Serif</family>
<family>Times New Roman</family>
<family>Thorndale AMT</family>
@ -279,6 +282,7 @@
<alias>
<family>sans-serif</family>
<prefer>
<family>DejaVu Sans</family>
<family>Bitstream Vera Sans</family>
<family>Verdana</family>
<family>Arial</family>
@ -300,6 +304,7 @@
<alias>
<family>monospace</family>
<prefer>
<family>DejaVu Sans Mono</family>
<family>Bitstream Vera Sans Mono</family>
<family>Andale Mono</family>
<family>Courier New</family>

3
src/fccache.c
View File

@ -206,7 +206,7 @@ FcGlobalCacheLoad (FcGlobalCache *cache,
current_arch_start = FcCacheSkipToArch(cache->fd,
current_arch_machine_name);
if (current_arch_start < 0)
goto bail_and_destroy;
goto bail1;
lseek (cache->fd, current_arch_start, SEEK_SET);
if (!FcCacheReadString (cache->fd, candidate_arch_machine_name,
@ -643,6 +643,7 @@ FcCacheSkipToArch (int fd, const char * arch)
if (strcmp (candidate_arch, arch)==0)
return current_arch_start;
current_arch_start += bs;
current_arch_start = FcCacheNextOffset (current_arch_start);
}
return -1;