--8P1HSweYDcXXzwPJ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Feb 01, 2004 at 10:34:46PM +0900, Masao Uebayashi wrote:
  | Hi.  The change below fixes my build.

I've committed the second patch (to src/fcstr.c).

I'm still not clear how the first patch fixes things for you, so I
have left that alone for now.

When I run "tmake install" in src/x11/share/fonts, I do get
	Fontconfig error: Cannot load default config file
but it does correctly create the fonts.cache-1 files.


  | (Actually, I spent most of time wondering how to build a part of tree
  | cleanly, and I finally learned what make wrapper is for...)

Heh!  I have a wrapper "tmake" which calls $TOOLDIR/bin/nbmake-$MACHINE,
exactly for this purpose.


Cheers,
Luke.


  |=20
  | Masao
  |=20
  | Index: fc-cache/fc-cache.c
  | =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
  | RCS file: /usr/local/src/TNF/cvsroot/xsrc/xfree/xc/lib/fontconfig/fc-ca=
che/fc-cache.c,v
  | retrieving revision 1.1.1.1
  | diff -u -r1.1.1.1 fc-cache.c
  | --- fc-cache/fc-cache.c	28 Feb 2003 13:18:56 -0000	1.1.1.1
  | +++ fc-cache/fc-cache.c	1 Feb 2004 13:23:53 -0000
  | @@ -229,8 +229,7 @@
  |      config =3D FcInitLoadConfig ();
  |      if (!config)
  |      {
  | -	fprintf (stderr, "%s: Can't init font config library\n", argv[0]);
  | -	return 1;
  | +	fprintf (stderr, "%s: Can't load font config configuration file\n", a=
rgv[0]);
  |      }
  |      if (argv[i])
  |      {
  | Index: src/fcstr.c
  | =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
  | RCS file: /usr/local/src/TNF/cvsroot/xsrc/xfree/xc/lib/fontconfig/src/f=
cstr.c,v
  | retrieving revision 1.1.1.1
  | diff -u -r1.1.1.1 fcstr.c
  | --- src/fcstr.c	28 Feb 2003 13:18:57 -0000	1.1.1.1
  | +++ src/fcstr.c	1 Feb 2004 13:26:24 -0000
  | @@ -428,9 +428,10 @@
  |      if (*s =3D=3D '~')
  |      {
  |  	FcChar8	*home =3D (FcChar8 *) getenv ("HOME");
  | -	int	size =3D strlen ((char *) home) + strlen ((char *) s);
  | +	int	size;
  |  	if (!home)
  |  	    return 0;
  | +	size =3D strlen ((char *) home) + strlen ((char *) s);
  |  	new =3D (FcChar8 *) malloc (size);
  |  	if (!new)
  |  	    return 0;

--8P1HSweYDcXXzwPJ
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (NetBSD)

iD8DBQFAHQmGpBhtmn8zJHIRAlFuAJ9iGBV0m1gHQDtJCgY1gr8WjPKBkQCeJPCU
7wnRWoKZJcsaq/thJsV6oAg=
=mloR
-----END PGP SIGNATURE-----

--8P1HSweYDcXXzwPJ--