Subject: Re: i386 build fails at running fc-cache
To: None <lukem@NetBSD.org>
From: Masao Uebayashi <uebayasi@pultek.co.jp>
List: current-users
Date: 02/01/2004 22:34:46
Hi.  The change below fixes my build.

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

Masao

Index: fc-cache/fc-cache.c
===================================================================
RCS file: /usr/local/src/TNF/cvsroot/xsrc/xfree/xc/lib/fontconfig/fc-cache/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 = 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", argv[0]);
     }
     if (argv[i])
     {
Index: src/fcstr.c
===================================================================
RCS file: /usr/local/src/TNF/cvsroot/xsrc/xfree/xc/lib/fontconfig/src/fcstr.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 == '~')
     {
 	FcChar8	*home = (FcChar8 *) getenv ("HOME");
-	int	size = strlen ((char *) home) + strlen ((char *) s);
+	int	size;
 	if (!home)
 	    return 0;
+	size = strlen ((char *) home) + strlen ((char *) s);
 	new = (FcChar8 *) malloc (size);
 	if (!new)
 	    return 0;