Re: [Gnome-print] some RH merge

[Jody Goldberg <jgoldberg home com>]

On Sat, Sep 22, 2001 at 05:22:11PM -0400, Havoc Pennington wrote:
> 
> Hi,
> 
> Two patches in our RPM, one moves config files to sysconfdir for FHS
> compliance, the other improves error handling for command line options
> to gnome-font-install.
> 
> Havoc
> 

> --- gnome-print-0.29/libgnomeprint/gp-fontmap.c.fontmap	Sat Jul 21 16:41:50 2001
> +++ gnome-print-0.29/libgnomeprint/gp-fontmap.c	Sat Jul 21 16:42:09 2001
> @@ -165,7 +165,7 @@
>  	/* System map */
>  
>  	systemmap = NULL;
> -	name = gnome_datadir_file ("fonts/fontmap2");
> +	name = gnome_config_file ("gnome/fonts/fontmap2");
>  	if (!name) {
>  		name = g_concat_dir_and_file (DATADIR, "/fonts/fontmap2");
>  	}
> @@ -764,7 +764,7 @@
>  		if (s.st_mtime != map->system.mtime) return TRUE;
>  	} else {
>  		gchar * name;
> -		name = gnome_datadir_file ("fonts/fontmap2");
> +		name = gnome_config_file ("gnome/fonts/fontmap2");
>  		if (!name) name = g_concat_dir_and_file (DATADIR, "/fonts/fontmap2");
>  		if ((stat (name, &s) == 0) && S_ISREG (s.st_mode)) {
>  			g_free (name);

Please be VERY careful applying this patch.  If it goes in we should
attempt to notify as many distributions and packagers as possible.
Getting the fontmap(2) file filled correctly has been a long running
irritation.  Doing it properly requires some knowledge of where on
the system to find type1 fonts.  If you move it the distribution
specific wrappers will need to change.  Have a look in the Debian or
Gnumeric bug logs for hundreds of examples of failure.