Update to fontforge-20110222.
libfontforge gets a major bump (some functions changed arguments),
all other libraries get a minor bump just to be on the save side
(probably not needed at all).
While here, patch away some weird attempts to get something meaningful
by dividing the address of the timezone(3) function by 3600 (ouch).
Tests/comments/oks are welcome. I'll run a lilypond build with it
to see wether the scripting part of fontforge still works correctly.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/fontforge/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile 8 Jun 2011 17:37:36 -0000 1.29
+++ Makefile 8 Jul 2011 15:46:39 -0000
@@ -4,15 +4,14 @@ SHARED_ONLY= Yes
COMMENT= vector font editor/converter
-DISTNAME= fontforge_full-20100501
+DISTNAME= fontforge_full-20110222
PKGNAME= ${DISTNAME:S,_full,,}
-REVISION = 6
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= fontforge 3.0 \
- gdraw 5.0 \
- gioftp 2.0 \
- gunicode 5.0 \
- gutils 2.0
+SHARED_LIBS= fontforge 4.0 \
+ gdraw 5.1 \
+ gioftp 2.1 \
+ gunicode 5.1 \
+ gutils 2.1
CATEGORIES= print
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/fontforge/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 23 Jun 2010 08:00:42 -0000 1.8
+++ distinfo 8 Jul 2011 15:46:39 -0000
@@ -1,5 +1,5 @@
-MD5 (fontforge_full-20100501.tar.bz2) = Xz0g1kXsGqK3tIdjht+HFw==
-RMD160 (fontforge_full-20100501.tar.bz2) = Te4uzb0yvzhUEF8ZWYTZyr8Zj9g=
-SHA1 (fontforge_full-20100501.tar.bz2) = SDQlEWxq9q2Q43+a2gwo408lHsM=
-SHA256 (fontforge_full-20100501.tar.bz2) =
7kkosN90gMMaQiZFhU2fP09nGN1CO2iFvTPoeopu3Xk=
-SIZE (fontforge_full-20100501.tar.bz2) = 6666386
+MD5 (fontforge_full-20110222.tar.bz2) = W+Tdo0W11zonzDmd+W5GOg==
+RMD160 (fontforge_full-20110222.tar.bz2) = fydunj72c7eDVbt75Q9rJYeu5jM=
+SHA1 (fontforge_full-20110222.tar.bz2) = j62gdkfxAjUbsdfRxNpIc1bnFC8=
+SHA256 (fontforge_full-20110222.tar.bz2) =
j6KBgCb4S7e4p3RR0hyrfp3qiqkE5SGK+hWL5qMgQz4=
+SIZE (fontforge_full-20110222.tar.bz2) = 5126031
Index: patches/patch-fontforge_Makefile_dynamic_in
===================================================================
RCS file:
/cvs/ports/print/fontforge/patches/patch-fontforge_Makefile_dynamic_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-fontforge_Makefile_dynamic_in
--- patches/patch-fontforge_Makefile_dynamic_in 23 Jun 2010 08:00:42 -0000
1.1
+++ patches/patch-fontforge_Makefile_dynamic_in 8 Jul 2011 15:46:39 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-fontforge_Makefile_dynamic_in,v 1.1 2010/06/23 08:00:42 kili
Exp $
---- fontforge/Makefile.dynamic.in.orig Tue Feb 2 06:23:06 2010
-+++ fontforge/Makefile.dynamic.in Sun Jun 20 15:24:37 2010
-@@ -135,12 +135,12 @@ splinerefigure.lo: $(srcdir)/splinerefigure.c $(srcdir
+--- fontforge/Makefile.dynamic.in.orig Tue Feb 15 04:37:39 2011
++++ fontforge/Makefile.dynamic.in Fri Jul 8 16:50:10 2011
+@@ -136,12 +136,12 @@ splinerefigure.lo: $(srcdir)/splinerefigure.c $(srcdir
%.o: %.c
%.o: %.c $(srcdir)/splinefont.h $(srcdir)/views.h $(srcdir)/stemdb.h
$(srcdir)/ttf.h $(srcdir)/unicoderange.h $(srcdir)/psfont.h $(srcdir)/groups.h
$(srcdir)/edgelist.h $(srcdir)/edgelist2.h $(srcdir)/uiinterface.h
$(srcdir)/fontforgevw.h
Index: patches/patch-fontforge_cvexport_c
===================================================================
RCS file: patches/patch-fontforge_cvexport_c
diff -N patches/patch-fontforge_cvexport_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-fontforge_cvexport_c 8 Jul 2011 15:46:39 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- fontforge/cvexport.c.orig Tue Feb 15 04:37:39 2011
++++ fontforge/cvexport.c Fri Jul 8 17:24:12 2011
+@@ -219,15 +219,7 @@ int _ExportPDF(FILE *pdf,SplineChar *sc,int layer) {
+ fprintf( pdf, " /CreationDate (D:%04d%02d%02d%02d%2d%02d",
+ 1900+tm->tm_year, tm->tm_mon+1, tm->tm_mday,
+ tm->tm_hour, tm->tm_min, tm->tm_sec );
+-#ifdef _NO_TZSET
+ fprintf( pdf, "Z)\n" );
+-#else
+- tzset();
+- if ( timezone==0 )
+- fprintf( pdf, "Z)\n" );
+- else
+- fprintf( pdf, "%+02d')\n", (int) timezone/3600 ); /* doesn't
handle half-hour zones */
+-#endif
+ fprintf( pdf, " /Title (%s from %s)\n", sc->name, sc->parent->fontname
);
+ if ( author!=NULL )
+ fprintf( pdf, " /Author (%s)\n", author );
Index: patches/patch-fontforge_ffpython_h
===================================================================
RCS file: patches/patch-fontforge_ffpython_h
diff -N patches/patch-fontforge_ffpython_h
--- patches/patch-fontforge_ffpython_h 6 Jun 2011 18:46:49 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-fontforge_ffpython_h,v 1.1 2011/06/06 18:46:49 rpointel Exp $
-Patch from https://bugs.gentoo.org/show_bug.cgi?id=327113
---- fontforge/ffpython.h.orig
-+++ fontforge/ffpython.h
-@@ -43,7 +43,7 @@
-
- #define STRING_CHECK PyBytes_Check
- #define STRING_TO_PY PyBytes_FromString
--#define DECODE_UTF8(s, size, errors) PyBytes_Decode(s, size, "UTF-8", errors)
-+#define DECODE_UTF8(s, size, errors) PyString_Decode(s, size, "UTF-8", errors)
- #define PYBYTES_UTF8(str) PyString_AsEncodedObject(str, "UTF-8",
NULL)
- #define STRING_FROM_FORMAT PyBytes_FromFormat
-
Index: patches/patch-fontforge_fvimportbdf_c
===================================================================
RCS file: patches/patch-fontforge_fvimportbdf_c
diff -N patches/patch-fontforge_fvimportbdf_c
--- patches/patch-fontforge_fvimportbdf_c 21 Dec 2010 18:41:37 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
-$OpenBSD: patch-fontforge_fvimportbdf_c,v 1.1 2010/12/21 18:41:37 jasper Exp $
-
-Security fix for CVE-2010-4259
-FontForge: Stack-based buffer overflow by processing specially-crafted
CHARSET_REGISTRY font file header
-
-Patch from: https://bugzilla.redhat.com/show_bug.cgi?id=659359
-
---- fontforge/fvimportbdf.c.orig Fri Apr 16 05:02:02 2010
-+++ fontforge/fvimportbdf.c Tue Dec 21 19:32:52 2010
-@@ -560,7 +560,7 @@ static int slurp_header(FILE *bdf, int *_as, int *_ds,
- }
-
- if ( strcmp(tok,"FONT")==0 ) {
-- if ( sscanf(buf,"-%*[^-]-%[^-]-%[^-]-%[^-]-%*[^-]-", family,
weight, italic )!=0 ) {
-+ if ( sscanf(buf,"-%*[^-]-%99[^-]-%99[^-]-%99[^-]-%*[^-]-", family,
weight, italic )!=0 ) {
- char *pt=buf;
- int dcnt=0;
- while ( *pt=='-' && dcnt<7 ) { ++pt; ++dcnt; }
-@@ -616,26 +616,30 @@ static int slurp_header(FILE *bdf, int *_as, int *_ds,
- sscanf(buf, "%d", &defs->metricsset );
- else if ( strcmp(tok,"VVECTOR")==0 )
- sscanf(buf, "%*d %d", &defs->vertical_origin );
-+ /* For foundry, fontname and encname, only copy up to the buffer size */
- else if ( strcmp(tok,"FOUNDRY")==0 )
-- sscanf(buf, "%[^\"]", foundry );
-+ sscanf(buf, "%99[^\"]", foundry );
- else if ( strcmp(tok,"FONT_NAME")==0 )
-- sscanf(buf, "%[^\"]", fontname );
-+ sscanf(buf, "%99[^\"]", fontname );
- else if ( strcmp(tok,"CHARSET_REGISTRY")==0 )
-- sscanf(buf, "%[^\"]", encname );
-+ sscanf(buf, "%99[^\"]", encname );
- else if ( strcmp(tok,"CHARSET_ENCODING")==0 ) {
- enc = 0;
- if ( sscanf(buf, " %d", &enc )!=1 )
- sscanf(buf, "%d", &enc );
-+ /* These properties should be copied up to the buffer length too */
- } else if ( strcmp(tok,"FAMILY_NAME")==0 ) {
-- strcpy(family,buf);
-+ strlcpy(family,buf,99);
- } else if ( strcmp(tok,"FULL_NAME")==0 || strcmp(tok,"FACE_NAME")==0 ) {
-- strcpy(full,buf);
-+ strlcpy(full,buf,99);
- } else if ( strcmp(tok,"WEIGHT_NAME")==0 )
-- strcpy(weight,buf);
-+ strlcpy(weight,buf,99);
- else if ( strcmp(tok,"SLANT")==0 )
-- strcpy(italic,buf);
-+ strlcpy(italic,buf,99);
- else if ( strcmp(tok,"COPYRIGHT")==0 ) {
-- strcpy(comments,buf);
-+ /* LS: Assume the size of the passed-in buffer is 1000, see
below in
-+ * COMMENT */
-+ strlcpy(comments,buf,999);
- found_copyright = true;
- } else if ( strcmp(tok,"COMMENT")==0 && !found_copyright ) {
- char *pt = comments+strlen(comments);
Index: patches/patch-fontforge_print_c
===================================================================
RCS file: patches/patch-fontforge_print_c
diff -N patches/patch-fontforge_print_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-fontforge_print_c 8 Jul 2011 15:46:39 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- fontforge/print.c.orig Fri Feb 18 22:33:20 2011
++++ fontforge/print.c Fri Jul 8 17:05:49 2011
+@@ -1056,10 +1056,7 @@ static void dump_pdfprologue(PI *pi) {
+ tm = localtime(&now);
+ fprintf( pi->out, " /CreationDate (D:%4d%02d%02d%02d%02d",
+ tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour,
tm->tm_min );
+- if ( timezone==0 )
+- fprintf( pi->out, "Z)\n" );
+- else
+- fprintf( pi->out, "%+02d')\n", (int) timezone/3600 ); /* doesn't
handle half-hour zones */
++ fprintf( pi->out, "Z)\n" );
+ if ( author!=NULL )
+ fprintf( pi->out, " /Author (%s)\n", author );
+ fprintf( pi->out, ">>\n" );
Index: patches/patch-fontforge_svg_c
===================================================================
RCS file: patches/patch-fontforge_svg_c
diff -N patches/patch-fontforge_svg_c
--- patches/patch-fontforge_svg_c 11 Jul 2010 05:23:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-fontforge_svg_c,v 1.1 2010/07/11 05:23:20 kili Exp $
---- fontforge/svg.c.orig Thu Jul 8 21:17:10 2010
-+++ fontforge/svg.c Thu Jul 8 21:49:46 2010
-@@ -150,7 +150,7 @@ return( defwid );
- static int svg_pathdump(FILE *file, SplineSet *spl, int lineout,
- int forceclosed, int do_clips) {
- BasePoint last;
-- char buffer[60];
-+ char buffer[85];
- int closed=false;
- Spline *sp, *first;
- /* as I see it there is nothing to be gained by optimizing out the */
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/fontforge/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 23 Jun 2010 08:00:42 -0000 1.7
+++ pkg/PLIST 8 Jul 2011 15:46:39 -0000
@@ -14,7 +14,7 @@ include/fontforge/bitmapcontrol.h
include/fontforge/chardata.h
include/fontforge/charset.h
include/fontforge/config.h
-include/fontforge/configure-pfaedit.h
+include/fontforge/configure-fontforge.h
include/fontforge/delta.h
include/fontforge/dynamic.h
include/fontforge/edgelist.h
@@ -23,6 +23,7 @@ include/fontforge/encoding.h
include/fontforge/fffreetype.h
include/fontforge/ffpython.h
include/fontforge/fileutil.h
+include/fontforge/fontforge.h
include/fontforge/fontforgevw.h
include/fontforge/fvmetrics.h
include/fontforge/gdraw.h
@@ -46,7 +47,6 @@ include/fontforge/mm.h
include/fontforge/namehash.h
include/fontforge/nonlineartrans.h
include/fontforge/ofl.h
-include/fontforge/pfaedit.h
include/fontforge/plugins.h
include/fontforge/print.h
include/fontforge/psfont.h
@@ -261,9 +261,7 @@ share/locale/es/LC_MESSAGES/FontForge.mo
share/locale/fr/LC_MESSAGES/FontForge.mo
share/locale/it/LC_MESSAGES/FontForge.mo
share/locale/ja/LC_MESSAGES/FontForge.mo
-share/locale/mal/
-share/locale/mal/LC_MESSAGES/
-share/locale/mal/LC_MESSAGES/FontForge.mo
+share/locale/ml/LC_MESSAGES/FontForge.mo
share/locale/pl/LC_MESSAGES/FontForge.mo
share/locale/ru/LC_MESSAGES/FontForge.mo
share/locale/uk/LC_MESSAGES/FontForge.mo
