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.
 
 
 
 
 
 

123 lines
3.8 KiB

Index: bootstrap.conf
--- bootstrap.conf.orig 2015-09-04 16:52:20.000000000 +0200
+++ bootstrap.conf 2015-09-20 11:55:22.415955404 +0200
@@ -28,7 +28,6 @@
# Build prerequisites
buildreq='
- git 1.5.5 http://git-scm.com
perl 5.5 http://perl.com
tar - http://www.gnu.org/s/tar
'
Index: fontforge/cvexport.c
--- fontforge/cvexport.c.orig 2015-06-04 09:14:23.000000000 +0200
+++ fontforge/cvexport.c 2015-09-20 11:55:22.415955404 +0200
@@ -213,7 +213,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 1
fprintf( pdf, "Z)\n" );
#else
tzset();
Index: fontforge/parsettf.c
--- fontforge/parsettf.c.orig 2015-09-19 10:35:23.000000000 +0200
+++ fontforge/parsettf.c 2015-09-20 11:55:41.805685593 +0200
@@ -35,6 +35,8 @@
#include "ttf.h"
#include "scripting.h"
+#define getsid fontforge_getsid
+
char *SaveTablesPref;
int ask_user_for_cmap = false;
Index: fontforge/print.c
--- fontforge/print.c.orig 2015-06-04 09:14:23.000000000 +0200
+++ fontforge/print.c 2015-09-20 11:55:22.415955404 +0200
@@ -1148,7 +1148,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 1
fprintf( pi->out, "Z)\n" );
#else
if ( timezone==0 )
Index: fontforge/splinechar.c
--- fontforge/splinechar.c.orig 2014-10-12 13:49:14.000000000 +0200
+++ fontforge/splinechar.c 2015-09-20 11:55:22.415955404 +0200
@@ -252,6 +252,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 2015-05-01 12:16:09.000000000 +0200
+++ fontforge/splinesaveafm.c 2015-09-20 11:55:22.415955404 +0200
@@ -474,6 +474,7 @@
(*gvbase)->part_cnt = cnt;
(*gvbase)->parts = calloc(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 2014-07-19 09:33:40.000000000 +0200
+++ gutils/gioftp.c 2015-09-20 11:55:22.415955404 +0200
@@ -613,7 +613,9 @@
} else {
ftp = calloc(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 2014-12-14 10:17:29.000000000 +0100
+++ gutils/gnetwork.c 2015-09-20 11:55:22.415955404 +0200
@@ -35,6 +35,7 @@
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/socket.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
Index: inc/gfile.h
--- inc/gfile.h.orig 2015-07-18 10:31:35.000000000 +0200
+++ inc/gfile.h 2015-09-20 11:55:22.415955404 +0200
@@ -30,6 +30,8 @@
/* For mode_t */
#include <sys/types.h>
+#include <fcntl.h>
+
/* home directories for fontforge */
enum { Cache, Config, Data };