2004-11-08 09:59:17 -05:00
|
|
|
$OpenBSD: patch-installer_gnome-font-install_c,v 1.2 2004/11/08 14:59:17 naddy Exp $
|
2002-05-21 15:17:54 -04:00
|
|
|
--- installer/gnome-font-install.c.orig Tue Jan 22 22:44:55 2002
|
2004-11-08 09:59:17 -05:00
|
|
|
+++ installer/gnome-font-install.c Sun Nov 7 17:33:15 2004
|
|
|
|
|
@@ -26,7 +26,8 @@
|
|
|
|
|
#include <parser.h>
|
|
|
|
|
#include <xmlmemory.h>
|
|
|
|
|
/* End of ugly thing */
|
|
|
|
|
-#include <freetype/freetype.h>
|
|
|
|
|
+#include <ft2build.h>
|
|
|
|
|
+#include FT_FREETYPE_H
|
|
|
|
|
#include <libgnome/gnome-defs.h>
|
|
|
|
|
#include <libgnome/gnome-util.h>
|
|
|
|
|
#include <libgnome/gnome-i18n.h>
|
|
|
|
|
@@ -333,12 +334,12 @@ int main (int argc, char ** argv)
|
2002-05-21 15:17:54 -04:00
|
|
|
if (!gfi_target) gfi_target = g_concat_dir_and_file (g_get_home_dir (), ".gnome/fonts/gnome-print.fontmap");
|
|
|
|
|
}
|
|
|
|
|
g_assert (mastermap != NULL);
|
|
|
|
|
+ mastermap->path = gfi_target;
|
|
|
|
|
|
|
|
|
|
/* Verify fonts */
|
|
|
|
|
if (gfi_debug) fprintf (stderr, "Verifying fontmap entries\n");
|
|
|
|
|
- gfi_verify_fontmap (db->usermaps);
|
|
|
|
|
- gfi_verify_fontmap (db->dynamicmaps);
|
|
|
|
|
- gfi_verify_fontmap (db->staticmaps);
|
|
|
|
|
+ gfi_verify_fontmap (mastermap);
|
|
|
|
|
+
|
|
|
|
|
/* Vacuum mastermap */
|
|
|
|
|
mastermap->fonts = NULL;
|
|
|
|
|
if (gfi_debug) fprintf (stderr, "Done\n");
|
