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.
88 lines
2.9 KiB
88 lines
2.9 KiB
Index: gutils/gioftp.c |
|
--- gutils/gioftp.c.orig 2009-02-22 18:26:06.000000000 +0100 |
|
+++ gutils/gioftp.c 2010-03-13 11:53:00.000000000 +0100 |
|
@@ -602,7 +602,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 ); |
|
@@ -612,7 +614,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: inc/utype.h |
|
--- inc/utype.h.orig 2009-01-30 07:54:49.000000000 +1100 |
|
+++ inc/utype.h 2009-07-25 03:24:27.000000000 +1000 |
|
@@ -1,6 +1,8 @@ |
|
#ifndef _UTYPE_H |
|
#define _UTYPE_H |
|
|
|
+#include <ctype.h> |
|
+ |
|
#define ____L 0x1 |
|
#define ____U 0x2 |
|
#define ____TITLE 0x4 |
|
Index: fontforge/splinechar.c |
|
--- fontforge/splinechar.c.orig 2010-02-04 18:42:37.000000000 +0100 |
|
+++ fontforge/splinechar.c 2010-03-20 10:23:36.000000000 +0100 |
|
@@ -250,6 +250,7 @@ |
|
if ( sp->next==NULL ) |
|
break; |
|
sp = sp->next->to; |
|
+ if (rsp->next != NULL) |
|
rsp = rsp->next->to; |
|
} |
|
} |
|
Index: Makefile.dynamic.in |
|
--- Makefile.dynamic.in.orig 2008-11-12 05:41:46.000000000 +0100 |
|
+++ Makefile.dynamic.in 2010-04-30 21:19:57.000000000 +0200 |
|
@@ -22,7 +22,7 @@ |
|
|
|
libs: libgunicode libgutils @GDRAW_LIB@ |
|
|
|
-fontforge: libgunicode libgutils @GDRAW_LIB@ pos |
|
+fontforge: libgunicode libgutils @GDRAW_LIB@ |
|
( cd fontforge ; $(MAKE) ) |
|
|
|
libgunicode: |
|
@@ -123,7 +123,7 @@ |
|
$(INSTALL_DATA) $(srcdir)/fontforge/fontimage.1 $(DESTDIR)$(mandir)/man1 |
|
$(INSTALL_DATA) $(srcdir)/fontforge/fontlint.1 $(DESTDIR)$(mandir)/man1 |
|
|
|
-install: $(DESTDIR)$(sharedir) all install_libs install_incs install_po install_prog install_pycontrib |
|
+install: $(DESTDIR)$(sharedir) all install_libs install_incs install_prog install_pycontrib |
|
# You may need to be root to do the install |
|
#explicit use of sh to make sure we don't invoke csh with different "if" syntax |
|
sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; fi" |
|
Index: Makefile.static.in |
|
--- Makefile.static.in.orig 2008-07-29 02:48:21.000000000 +0200 |
|
+++ Makefile.static.in 2010-04-30 21:20:06.000000000 +0200 |
|
@@ -20,7 +20,7 @@ |
|
|
|
libs: libgunicode @GDRAW_LIB@ |
|
|
|
-fontforge: libgunicode libgutils @GDRAW_LIB@ pos |
|
+fontforge: libgunicode libgutils @GDRAW_LIB@ |
|
( cd fontforge ; $(MAKE) ) |
|
|
|
libgunicode: |
|
@@ -66,7 +66,7 @@ |
|
mkdir -p $(DESTDIR)$(pythondir) |
|
( cd pycontrib ; $(INSTALL_DATA) *.py $(DESTDIR)$(pythondir) ) |
|
|
|
-install: $(sharedir) all install_libs install_po install_pycontrib |
|
+install: $(sharedir) all install_libs install_pycontrib |
|
# You may need to be root to do the install |
|
mkdir -p $(DESTDIR)$(bindir) |
|
mkdir -p $(DESTDIR)$(mandir)/man1
|
|
|