Index: fontforge/parsettf.c
--- fontforge/parsettf.c.orig	2019-06-15 10:27:10.000000000 +0200
+++ fontforge/parsettf.c	2019-06-26 20:33:09.699206000 +0200
@@ -61,6 +61,8 @@
 #include <locale.h>
 #include <math.h>
 
+#define getsid fontforge_getsid
+
 char *SaveTablesPref;
 int ask_user_for_cmap = false;
 
Index: fontforge/splinechar.c
--- fontforge/splinechar.c.orig	2019-06-15 10:27:10.000000000 +0200
+++ fontforge/splinechar.c	2019-06-26 20:33:09.700218000 +0200
@@ -268,6 +268,7 @@
 	    if ( sp->next==NULL || rsp->next==NULL )
 	break;
 	    sp = sp->next->to;
+            if (rsp->next != NULL)
 	    rsp = rsp->next->to;
 	}
     }
Index: fontforge/splinesaveafm.c
--- fontforge/splinesaveafm.c.orig	2019-06-15 10:27:10.000000000 +0200
+++ fontforge/splinesaveafm.c	2019-06-26 20:33:09.700578000 +0200
@@ -491,6 +491,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);
@@ -504,6 +505,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: fontforge/ufo.c
--- fontforge/ufo.c.orig	2019-06-26 20:26:28.000000000 +0200
+++ fontforge/ufo.c	2019-06-26 20:33:09.701072000 +0200
@@ -796,6 +796,7 @@
 	// dict is the Python dictionary from which to extract data.
 	// target is the xml node to which to add the contents of that dict.
 	// exclusions is a NULL-terminated array of strings naming keys to exclude.
+#ifndef _NO_PYTHON
 	PyObject *items, *key, *value;
 	int i, len;
 	char *str;
@@ -822,6 +823,7 @@
 		// "<...>...</...>"
 		Py_DECREF(item); item = NULL;
 	}
+#endif
 	return target;
 }
 #endif
Index: inc/gfile.h
--- inc/gfile.h.orig	2019-06-15 10:27:10.000000000 +0200
+++ inc/gfile.h	2019-06-26 20:33:09.701189000 +0200
@@ -33,6 +33,8 @@
 /* For mode_t */
 #include <sys/types.h>
 
+#include <fcntl.h>
+
 /* home directories for fontforge */
 enum { Cache, Config, Data };
 
