head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.32
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.30
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.28
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.26
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.24
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.22
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.20
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.18
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.16
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.14
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.12
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.10
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.8
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.6
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.4
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.2
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.2.0.2
	pkgsrc-2006Q2-base:1.2;
locks; strict;
comment	@# @;


1.3
date	2006.07.10.20.52.44;	author adam;	state dead;
branches;
next	1.2;

1.2
date	2006.04.14.08.45.06;	author adam;	state Exp;
branches;
next	1.1;

1.1
date	2006.04.05.07.03.25;	author adam;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Changes 20060703:
* Bug fixes and improvements
@
text
@$NetBSD: patch-ag,v 1.2 2006/04/14 08:45:06 adam Exp $

--- fontforge/parsettf.c.orig	2006-03-30 07:53:44.000000000 +0200
+++ fontforge/parsettf.c
@@@@ -4253,7 +4253,7 @@@@ return;
 
 static int readttf(FILE *ttf, struct ttfinfo *info, char *filename) {
     char *oldloc;
-    int i;
+    int i, choice;
 
 #if !defined(FONTFORGE_CONFIG_NO_WINDOWING_UI)
     gwwv_progress_change_stages(3);
@@@@ -4282,12 +4282,12 @@@@ return( 0 );
 	buts[3] = NULL;
 #if defined(FONTFORGE_CONFIG_GDRAW)
 	buts[2] = _("_Cancel");
-	int choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
+	choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
 #elif defined(FONTFORGE_CONFIG_GTK)
 	buts[2] = GTK_STOCK_CANCEL;
-	int choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
+	choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
 #else
-	int choice = 0;
+	choice = 0;
 #endif
 	if ( choice==2 ) {
 	    setlocale(LC_NUMERIC,oldloc);
@


1.2
log
@Changes 20060413:
* FF failed to output lookups in the right order for the GSUB table.
* FF would crash when attempting to generate a font which had no familyname
* FF could be built agains ft2.2 only if the debugger were being built.
  Make it work always.
* Patch by Mike Frysinger from gentoo. Use the HOME environment variable in
  preference to /etc/passwd.
* Write sfddiff as a fontforge script and put it back into the install process.
* Add code to font compare so it can do the old sfddiff --merge option.
* Someone wanted acorn2sfd! Make it compile again.
* Make configure look for libgif
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Variable declaration fix; PR-33164
@
text
@d3 1
a3 1
--- fontforge/parsettf.c.orig	2006-04-04 11:38:32.000000000 +0200
d5 1
a5 1
@@@@ -4254,7 +4254,7 @@@@ return;
d14 1
a14 1
@@@@ -4283,12 +4283,12 @@@@ return( 0 );
@