You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

101 lines
3.2 KiB

Index: fontforge/cvexport.c
--- fontforge/cvexport.c.orig 2013-06-22 15:18:03.000000000 +0200
+++ fontforge/cvexport.c 2014-01-26 12:36:08.681018610 +0100
@@ -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 2014-01-26 12:36:08.681018000 +0100
+++ fontforge/print.c 2014-01-26 12:50:48.721097609 +0100
@@ -1147,7 +1147,7 @@
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
+#if defined(_NO_TZSET) || defined(__FreeBSD__)
fprintf( pi->out, "Z)\n" );
#else
if ( timezone==0 )
14 years ago
Index: fontforge/splinechar.c
--- fontforge/splinechar.c.orig 2014-01-26 12:36:41.000000000 +0100
+++ fontforge/splinechar.c 2014-01-26 12:36:08.701637340 +0100
@@ -251,6 +251,7 @@
14 years ago
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 2014-01-26 12:36:08.701637340 +0100
14 years ago
@@ -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 2014-01-26 12:36:08.701637340 +0100
14 years ago
@@ -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-11-25 20:30:55.000000000 +0100
+++ gutils/gnetwork.c 2014-01-26 12:36:08.701637340 +0100
@@ -44,6 +44,7 @@
extern int h_errno;
# include <netdb.h>
# include <arpa/inet.h>
+# include <sys/socket.h>
#endif
#ifdef BUILD_COLLAB
Index: inc/gfile.h
--- inc/gfile.h.orig 2014-01-26 12:36:41.000000000 +0100
+++ inc/gfile.h 2014-01-26 12:36:08.701637340 +0100
@@ -30,6 +30,8 @@
/* For mode_t */
#include <sys/types.h>
+#include <fcntl.h>
+
/* home directories for fontforge */
enum { Cache, Config, Data };