|
|
|
|
Index: fontforge/cvexport.c
|
|
|
|
|
--- fontforge/cvexport.c.orig 2013-06-22 15:18:03.000000000 +0200
|
|
|
|
|
+++ fontforge/cvexport.c 2013-06-22 15:25:06.758559613 +0200
|
|
|
|
|
@@ -214,7 +214,7 @@
|
|
|
|
|
fprintf( pdf, " /CreationDate (D:%04d%02d%02d%02d%02d%02d",
|
|
|
|
|
1900+tm->tm_year, tm->tm_mon+1, tm->tm_mday,
|
|
|
|
|
tm->tm_hour, tm->tm_min, tm->tm_sec );
|
|
|
|
|
-#ifdef _NO_TZSET
|
|
|
|
|
+#if defined(_NO_TZSET) || defined(__FreeBSD__)
|
|
|
|
|
fprintf( pdf, "Z)\n" );
|
|
|
|
|
#else
|
|
|
|
|
tzset();
|
|
|
|
|
Index: fontforge/print.c
|
|
|
|
|
--- fontforge/print.c.orig 2013-06-22 15:18:03.000000000 +0200
|
|
|
|
|
+++ fontforge/print.c 2013-06-22 15:25:48.029927484 +0200
|
|
|
|
|
@@ -1147,8 +1147,8 @@
|
|
|
|
|
tm = localtime(&now);
|
|
|
|
|
fprintf( pi->out, " /CreationDate (D:%04d%02d%02d%02d%02d%02d",
|
|
|
|
|
tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec );
|
|
|
|
|
-#ifdef _NO_TZSET
|
|
|
|
|
- fprintf( pdf, "Z)\n" );
|
|
|
|
|
+#if defined(_NO_TZSET) || defined(__FreeBSD__)
|
|
|
|
|
+ fprintf( pi->out, "Z)\n" );
|
|
|
|
|
#else
|
|
|
|
|
if ( timezone==0 )
|
|
|
|
|
fprintf( pi->out, "Z)\n" );
|
|
|
|
|
Index: fontforge/splinechar.c
|
|
|
|
|
--- fontforge/splinechar.c.orig 2013-06-22 15:18:03.000000000 +0200
|
|
|
|
|
+++ fontforge/splinechar.c 2013-06-22 15:19:21.308399379 +0200
|
|
|
|
|
@@ -251,6 +251,7 @@
|
|
|
|
|
if ( sp->next==NULL )
|
|
|
|
|
break;
|
|
|
|
|
sp = sp->next->to;
|
|
|
|
|
+ if (rsp->next != NULL)
|
|
|
|
|
rsp = rsp->next->to;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Index: fontforge/splinesaveafm.c
|
|
|
|
|
--- fontforge/splinesaveafm.c.orig 2013-06-22 15:18:03.000000000 +0200
|
|
|
|
|
+++ fontforge/splinesaveafm.c 2013-06-22 15:19:21.308399379 +0200
|
|
|
|
|
@@ -474,6 +474,7 @@
|
|
|
|
|
(*gvbase)->part_cnt = cnt;
|
|
|
|
|
(*gvbase)->parts = gcalloc(cnt,sizeof(struct gv_part));
|
|
|
|
|
for ( j=0; j<cnt; ++j ) {
|
|
|
|
|
+ if ( bats[j]!=NULL ) {
|
|
|
|
|
DBounds b;
|
|
|
|
|
bigreal len;
|
|
|
|
|
SplineCharFindBounds(bats[j],&b);
|
|
|
|
|
@@ -487,6 +488,7 @@
|
|
|
|
|
(*gvbase)->parts[j].endConnectorLength = len/4;
|
|
|
|
|
(*gvbase)->parts[j].fullAdvance = len;
|
|
|
|
|
}
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define BigEndianWord(pt) ((((uint8 *) pt)[0]<<24) | (((uint8 *) pt)[1]<<16) | (((uint8 *) pt)[2]<<8) | (((uint8 *) pt)[3]))
|
|
|
|
|
Index: gutils/gioftp.c
|
|
|
|
|
--- gutils/gioftp.c.orig 2013-06-22 15:18:03.000000000 +0200
|
|
|
|
|
+++ gutils/gioftp.c 2013-06-22 15:19:21.308399379 +0200
|
|
|
|
|
@@ -613,7 +613,9 @@
|
|
|
|
|
} else {
|
|
|
|
|
ftp = gcalloc(1,sizeof(struct ftpconnectiondata));
|
|
|
|
|
gc->connectiondata = (struct gio_connectiondata *) ftp;
|
|
|
|
|
+#ifdef HAVE_PTHREAD_H
|
|
|
|
|
pthread_mutex_lock(&stdfuncs->hostacccess_mutex);
|
|
|
|
|
+#endif
|
|
|
|
|
for ( had=(struct ftphostaccessdata *) (addr->had); had!=NULL &&
|
|
|
|
|
(had->port!=port || had->protocol_index!=ftp_protocol_index);
|
|
|
|
|
had=had->next );
|
|
|
|
|
@@ -623,7 +625,9 @@
|
|
|
|
|
had->protocol_index = ftp_protocol_index;
|
|
|
|
|
had->tzoff = -9999;
|
|
|
|
|
}
|
|
|
|
|
+#ifdef HAVE_PTHREAD_H
|
|
|
|
|
pthread_mutex_unlock(&stdfuncs->hostacccess_mutex);
|
|
|
|
|
+#endif
|
|
|
|
|
ftp->ctl = ctl = socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
|
|
|
|
|
setnopipe(ctl);
|
|
|
|
|
locaddr = addr->addr;
|
|
|
|
|
Index: gutils/gnetwork.c
|
|
|
|
|
--- gutils/gnetwork.c.orig 2013-06-22 15:18:03.000000000 +0200
|
|
|
|
|
+++ gutils/gnetwork.c 2013-06-22 15:23:02.898422132 +0200
|
|
|
|
|
@@ -42,6 +42,7 @@
|
|
|
|
|
extern int h_errno;
|
|
|
|
|
# include <netdb.h>
|
|
|
|
|
# include <arpa/inet.h>
|
|
|
|
|
+# include <sys/socket.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
