From d5b538dda25095188bf74ef6787139c7270f6ead Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 5 Apr 2006 07:03:25 +0000 Subject: Variable declaration fix; PR-33164 --- fonts/fontforge/PLIST | 3 ++- fonts/fontforge/distinfo | 8 ++++++-- fonts/fontforge/patches/patch-aa | 4 ++-- fonts/fontforge/patches/patch-ae | 21 +++++++++++++++++++++ fonts/fontforge/patches/patch-af | 37 +++++++++++++++++++++++++++++++++++++ fonts/fontforge/patches/patch-ag | 29 +++++++++++++++++++++++++++++ fonts/fontforge/patches/patch-ah | 30 ++++++++++++++++++++++++++++++ 7 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 fonts/fontforge/patches/patch-ae create mode 100644 fonts/fontforge/patches/patch-af create mode 100644 fonts/fontforge/patches/patch-ag create mode 100644 fonts/fontforge/patches/patch-ah (limited to 'fonts') diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST index e2852a9cb18..d26f686a2c4 100644 --- a/fonts/fontforge/PLIST +++ b/fonts/fontforge/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.6 2006/01/20 12:11:22 adam Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/04/05 07:03:25 adam Exp $ bin/fontforge +bin/sfddiff lib/libgdraw.la lib/libgunicode.la lib/pkgconfig/fontforge.pc diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo index d60709e8f69..63a8de8a312 100644 --- a/fonts/fontforge/distinfo +++ b/fonts/fontforge/distinfo @@ -1,9 +1,13 @@ -$NetBSD: distinfo,v 1.19 2006/03/18 04:52:33 minskim Exp $ +$NetBSD: distinfo,v 1.20 2006/04/05 07:03:25 adam Exp $ SHA1 (fontforge_full-20060209.tar.bz2) = 263a7d30a089aae230130b7581529121b9d15b5e RMD160 (fontforge_full-20060209.tar.bz2) = 95e3f6200b135fd44676db1ab00d067ea708ed2a Size (fontforge_full-20060209.tar.bz2) = 3259680 bytes -SHA1 (patch-aa) = c7f9e18ad3c4e055f12f30b37d8ace4e0b7c1b24 +SHA1 (patch-aa) = 7f7a11310fc5050b58e901e08c182dc5025874c6 SHA1 (patch-ab) = c6ac28364922c736ea89fcc83a0600bb4a1570bb SHA1 (patch-ac) = 7fe3d9174e407e04966081155965ff994a0fd69b SHA1 (patch-ad) = 6a76e7e5e4882eb5af6f31ff3dbc6e7c17b69784 +SHA1 (patch-ae) = bb14ecc96253f117191649f2d1a2c12d7fd351a3 +SHA1 (patch-af) = 3f19724b600eeb22cb132ded36098e47d19c4ea2 +SHA1 (patch-ag) = 50868ed681b58a0ea54ae7e0475dfeed0378d6a2 +SHA1 (patch-ah) = 4af516d22d0f13a7985a7803d348e8fe915c14bd diff --git a/fonts/fontforge/patches/patch-aa b/fonts/fontforge/patches/patch-aa index c9e39842d43..3fd7ba0ae80 100644 --- a/fonts/fontforge/patches/patch-aa +++ b/fonts/fontforge/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.4 2006/01/20 12:11:22 adam Exp $ +$NetBSD: patch-aa,v 1.5 2006/04/05 07:03:25 adam Exp $ ---- fontforge/Makefile.dynamic.in.orig 2006-01-15 15:26:05.000000000 +0100 +--- fontforge/Makefile.dynamic.in.orig 2006-02-01 23:28:03.000000000 +0100 +++ fontforge/Makefile.dynamic.in @@ -14,7 +14,7 @@ LIBTOOL = @LIBTOOL@ CC = @CC@ diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae new file mode 100644 index 00000000000..0f96b65d955 --- /dev/null +++ b/fonts/fontforge/patches/patch-ae @@ -0,0 +1,21 @@ +$NetBSD: patch-ae,v 1.1 2006/04/05 07:03:25 adam Exp $ + +--- fontforge/fontinfo.c.orig 2006-04-04 11:33:59.000000000 +0200 ++++ fontforge/fontinfo.c +@@ -5151,6 +5151,7 @@ static int GFI_OK(GGadget *g, GEvent *e) + #endif + char os2_vendor[4]; + NameList *nl; ++ int ans; + + if ( d->tn_smallactive!=-1 ) + TN_FinishSmallEdit(d); +@@ -5324,7 +5325,7 @@ return( true ); + buts[2] = GTK_STOCK_CANCEL; + #endif + buts[3] = NULL; +- int ans = gwwv_ask(_("Change UniqueID?"),(const char **) buts,0,2,_("You have changed this font's name without changing the UniqueID (or XUID).\nThis is probably not a good idea, would you like me to\ngenerate a random new value?")); ++ ans = gwwv_ask(_("Change UniqueID?"),(const char **) buts,0,2,_("You have changed this font's name without changing the UniqueID (or XUID).\nThis is probably not a good idea, would you like me to\ngenerate a random new value?")); + if ( ans==2 ) { + GDrawSetCursor(gw,ct_pointer); + return(true); diff --git a/fonts/fontforge/patches/patch-af b/fonts/fontforge/patches/patch-af new file mode 100644 index 00000000000..e068c1a1bf0 --- /dev/null +++ b/fonts/fontforge/patches/patch-af @@ -0,0 +1,37 @@ +$NetBSD: patch-af,v 1.1 2006/04/05 07:03:25 adam Exp $ + +--- fontforge/openfontdlg.c.orig 2006-02-06 03:45:51.000000000 +0100 ++++ fontforge/openfontdlg.c +@@ -134,8 +134,11 @@ return( true ); + } + + static int e_h(GWindow gw, GEvent *event) { ++ GRect r, size; ++ struct gfc_data *d; ++ + if ( event->type==et_close ) { +- struct gfc_data *d = GDrawGetUserData(gw); ++ d = GDrawGetUserData(gw); + d->done = true; + } else if ( event->type == et_map ) { + /* Above palettes */ +@@ -144,16 +147,15 @@ static int e_h(GWindow gw, GEvent *event + return( false ); + } else if ( event->type == et_mousemove || + (event->type==et_mousedown && event->u.mouse.button==3 )) { +- struct gfc_data *d = GDrawGetUserData(gw); ++ d = GDrawGetUserData(gw); + if ( !WithinList(d,event) ) + GFileChooserPopupCheck(d->gfc,event); + } else if (( event->type==et_mouseup || event->type==et_mousedown ) && + (event->u.mouse.button==4 || event->u.mouse.button==5) ) { +- struct gfc_data *d = GDrawGetUserData(gw); ++ d = GDrawGetUserData(gw); + return( GGadgetDispatchEvent((GGadget *) (d->gfc),event)); + } else if ( event->type == et_resize ) { +- GRect r, size;; +- struct gfc_data *d = GDrawGetUserData(gw); ++ d = GDrawGetUserData(gw); + GDrawGetSize(gw,&size); + GGadgetGetSize(d->gfc,&r); + GGadgetResize(d->gfc,size.width-2*r.x,r.height); diff --git a/fonts/fontforge/patches/patch-ag b/fonts/fontforge/patches/patch-ag new file mode 100644 index 00000000000..888f0a5605e --- /dev/null +++ b/fonts/fontforge/patches/patch-ag @@ -0,0 +1,29 @@ +$NetBSD: patch-ag,v 1.1 2006/04/05 07:03:25 adam Exp $ + +--- fontforge/parsettf.c.orig 2006-04-04 11:38:32.000000000 +0200 ++++ fontforge/parsettf.c +@@ -4254,7 +4254,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); +@@ -4283,12 +4283,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); diff --git a/fonts/fontforge/patches/patch-ah b/fonts/fontforge/patches/patch-ah new file mode 100644 index 00000000000..46d960c85c9 --- /dev/null +++ b/fonts/fontforge/patches/patch-ah @@ -0,0 +1,30 @@ +$NetBSD: patch-ah,v 1.1 2006/04/05 07:03:25 adam Exp $ + +--- fontforge/savefontdlg.c.orig 2006-04-04 11:44:50.000000000 +0200 ++++ fontforge/savefontdlg.c +@@ -2143,6 +2143,12 @@ static void DoSave(struct gfc_data *d,un + struct sflist *sfs=NULL, *cur, *last=NULL; + static int psscalewarned=0, ttfscalewarned=0; + int flags; ++ struct sflist *sfl; ++ char **former; ++ NameList *rename_to; ++ GTextInfo *ti = GGadgetGetListItemSelected(d->rename); ++ char *nlname = u2utf8_copy(ti->text); ++ extern NameList *force_names_when_saving; + #if defined(FONTFORGE_CONFIG_GDRAW) + char *buts[3]; + buts[0] = _("_Yes"); +@@ -2151,12 +2157,6 @@ static void DoSave(struct gfc_data *d,un + #elif defined(FONTFORGE_CONFIG_GTK) + static char *buts[] = { GTK_STOCK_YES, GTK_STOCK_NO, NULL }; + #endif +- struct sflist *sfl; +- char **former; +- NameList *rename_to; +- GTextInfo *ti = GGadgetGetListItemSelected(d->rename); +- char *nlname = u2utf8_copy(ti->text); +- extern NameList *force_names_when_saving; + + rename_to = NameListByName(nlname); + free(nlname); -- cgit v1.2.3