diff --git a/.cvsignore b/.cvsignore index 86d6b5c..d117d2f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -fontforge_full-20090923.tar.bz2 -fontforge_htdocs-20090914.tar.bz2 +fontforge_htdocs-20100429.tar.bz2 +fontforge_full-20100501.tar.bz2 diff --git a/fontforge-20090923-rel-path.patch b/fontforge-20090923-rel-path.patch deleted file mode 100644 index c1dc22e..0000000 --- a/fontforge-20090923-rel-path.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -Nur fontforge-20090923.orig/gutils/fsys.c fontforge-20090923/gutils/fsys.c ---- fontforge-20090923.orig/gutils/fsys.c 2009-01-25 11:06:49.000000000 -0700 -+++ fontforge-20090923/gutils/fsys.c 2009-12-31 09:59:54.000000000 -0700 -@@ -41,6 +41,15 @@ - - static char dirname_[1024]; - -+static void savestrcpy(char *dest,const char *src) { -+ forever { -+ *dest = *src; -+ if ( *dest=='\0' ) -+ break; -+ ++dest; ++src; -+ } -+} -+ - char *GFileGetAbsoluteName(char *name, char *result, int rsiz) { - /* result may be the same as name */ - char buffer[1000]; -@@ -62,13 +71,13 @@ - if ( *spt=='/' ) ++spt; - for ( pt = spt; *pt!='\0' && *pt!='/'; ++pt ); - if ( pt==spt ) /* Found // in a path spec, reduce to / (we've*/ -- strcpy(spt,pt); /* skipped past the :// of the machine name) */ -- else if ( pt==spt+1 && spt[0]=='.' ) /* Noop */ -- strcpy(spt,pt); -- else if ( pt==spt+2 && spt[0]=='.' && spt[1]=='.' ) { -+ savestrcpy(spt,spt+1); /* skipped past the :// of the machine name) */ -+ else if ( pt==spt+1 && spt[0]=='.' ) { /* Noop */ -+ savestrcpy(spt,spt+2); -+ } else if ( pt==spt+2 && spt[0]=='.' && spt[1]=='.' ) { - for ( bpt=spt-2 ; bpt>rpt && *bpt!='/'; --bpt ); - if ( bpt>=rpt && *bpt=='/' ) { -- strcpy(bpt,pt); -+ savestrcpy(bpt,pt); - spt = bpt; - } else { - rpt = pt; -@@ -99,7 +108,7 @@ - - if ( dir==NULL || *dir=='\0' ) { - if ( strlen( fname ) /dev/null || : %{_libdir}/pkgconfig/*.pc %changelog +* Wed May 19 2010 Kevin Fenzi - 20100501-1 +- Update to 20100501 + +* Fri Apr 30 2010 Kevin Fenzi - 20100429-1 +- Update to 20100429 + * Sat Mar 20 2010 Kevin Fenzi - 20090923-3 - Fix patch to fix python module (fixes #560277) diff --git a/sources b/sources index 0255201..cb1cf52 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ea9d8dc38de79235fbe6add725b38ffe fontforge_full-20090923.tar.bz2 -8979b8b38e3653c452dbe310f17a996d fontforge_htdocs-20090914.tar.bz2 +7ff67bcb694b673dbe0b8ca3dfd4675e fontforge_htdocs-20100429.tar.bz2 +5f3d20d645ec1aa2b7b4876386df8717 fontforge_full-20100501.tar.bz2