Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics In directory sc8-pr-cvs17:/tmp/cvs-serv6727
Modified Files: fontforge.info fontforge.patch Log Message: backport new version from 10.4 with 10.3 system header tweak Index: fontforge.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/fontforge.info,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- fontforge.info 2 Sep 2007 18:16:49 -0000 1.56 +++ fontforge.info 24 Sep 2007 04:11:36 -0000 1.57 @@ -1,6 +1,6 @@ Package: fontforge -Version: 20070808 -Revision: 2 +Version: 20070915 +Revision: 1 License: BSD Description: Outline font editor DescDetail: << @@ -17,15 +17,16 @@ Had to remove setting of DYLD_LIBRARY_PATH in start.c. Caused ImageIO problems. Yuck. Enabled python scripting. Uses system python. + Patched Makefile.in's to remove useless -I and reorder flags. << Homepage: http://fontforge.sourceforge.net/ Maintainer: Daniel Johnson <[EMAIL PROTECTED]> Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2 -Source-MD5: 5c549d22c700304949db08c7097e9989 +Source-MD5: d3248d5bd7c63be9cdfd9daf37866b35 SourceDirectory: %n-%v Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2 -Source2-MD5: fa40da4254d2cd8cc8a63a4a91ed27a0 +Source2-MD5: d67b864de7c0143c63f4c275e3145399 Source2ExtractDir: %n-%v/htdocs Depends: << @@ -61,11 +62,16 @@ DocFiles: AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html VERSION PatchFile: %n.patch -PatchFile-MD5: e1ac8b9f4f70ea7579f2f4b77af20097 +PatchFile-MD5: 1e5b18fbdb5b5c35dfd35b495aa93512 PatchScript: << patch -p1 <%{PatchFile} - perl -pi -e 's/#ifndef NODYNAMIC/#if 1/' gdraw/gio.c perl -pi -e 's,python -c,/usr/bin/python -c,g' configure + # These patches fix temporary bugs. Should be fixed in future. + perl -pi -e 's/GImage \*GImageReadJpeg\(FILE \*infile/GImage \*GImageRead_Jpeg\(FILE \*infile/' gdraw/gimagereadjpeg.c + perl -pi -e 's/ret = GImageWrite_Png\(gi,fp,progressive/int ret = GImageWrite_Png\(gi,fp,progressive/g' gdraw/gimagewritepng.c + + # 10.3-specific header issue + perl -pi -e 's,#include <arpa/inet.h>,#include <netinet/in.h>\n$&,' fontforge/http.c << NoSetMAKEFLAGS: true Index: fontforge.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/fontforge.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- fontforge.patch 26 Jul 2007 01:48:07 -0000 1.16 +++ fontforge.patch 24 Sep 2007 04:11:36 -0000 1.17 @@ -1,19 +1,61 @@ -diff -ru fontforge-20070723.orig/Makefile.dynamic.in fontforge-20070723/Makefile.dynamic.in ---- fontforge-20070723.orig/Makefile.dynamic.in 2007-05-28 15:34:59.000000000 -0400 -+++ fontforge-20070723/Makefile.dynamic.in 2007-07-24 14:43:38.000000000 -0400 -@@ -92,7 +92,7 @@ - $(INSTALL_DATA) $(srcdir)/fontforge/fontimage.1 $(mandir)/man1 +diff -ru fontforge-20070831.orig/Makefile.dynamic.in fontforge-20070831/Makefile.dynamic.in +--- fontforge-20070831.orig/Makefile.dynamic.in 2007-08-17 22:06:04.000000000 -0400 ++++ fontforge-20070831/Makefile.dynamic.in 2007-09-15 18:08:25.000000000 -0400 +@@ -94,7 +94,7 @@ + $(INSTALL_DATA) $(srcdir)/fontforge/fontlint.1 $(DESTDIR)$(mandir)/man1 #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" - sh < systemspecific +# sh < systemspecific uninstall: - -rm $(bindir)/fontforge -diff -ru fontforge-20070723.orig/configure fontforge-20070723/configure ---- fontforge-20070723.orig/configure 2007-07-13 23:19:53.000000000 -0400 -+++ fontforge-20070723/configure 2007-07-24 14:43:39.000000000 -0400 -@@ -2684,9 +2684,7 @@ + -rm $(DESTDIR)$(bindir)/fontforge +diff -ru fontforge-20070831.orig/Unicode/Makefile.dynamic.in fontforge-20070831/Unicode/Makefile.dynamic.in +--- fontforge-20070831.orig/Unicode/Makefile.dynamic.in 2007-05-28 10:20:55.000000000 -0400 ++++ fontforge-20070831/Unicode/Makefile.dynamic.in 2007-09-15 18:11:35.000000000 -0400 +@@ -18,8 +18,8 @@ + cjk.lo memory.lo ucharmap.lo unialt.lo ustring.lo utype.lo \ + usprintf.lo gwwiconv.lo + +-Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib +-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ @DEFS@ ++Incs = -I$(top_srcdir)/inc ++CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ @DEFS@ + + ../libgunicode.la: $(libgunicode_OBJECTS) + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -no-undefined @LDFLAGS@ -o ../libgunicode.la $(libgunicode_OBJECTS) \ +diff -ru fontforge-20070831.orig/Unicode/Makefile.in fontforge-20070831/Unicode/Makefile.in +--- fontforge-20070831.orig/Unicode/Makefile.in 2007-05-28 10:20:55.000000000 -0400 ++++ fontforge-20070831/Unicode/Makefile.in 2007-09-15 18:11:22.000000000 -0400 +@@ -18,8 +18,8 @@ + cjk.lo memory.lo ucharmap.lo unialt.lo ustring.lo utype.lo \ + usprintf.lo gwwiconv.lo + +-Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib +-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ @DEFS@ ++Incs = -I$(top_srcdir)/inc ++CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ @DEFS@ + + ../libgunicode.la: $(libgunicode_OBJECTS) + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -no-undefined @LDFLAGS@ -o ../libgunicode.la $(libgunicode_OBJECTS) \ +diff -ru fontforge-20070831.orig/Unicode/Makefile.static.in fontforge-20070831/Unicode/Makefile.static.in +--- fontforge-20070831.orig/Unicode/Makefile.static.in 2006-10-30 10:38:03.000000000 -0500 ++++ fontforge-20070831/Unicode/Makefile.static.in 2007-09-15 18:11:09.000000000 -0400 +@@ -12,8 +12,8 @@ + libgunicode_OBJECTS = ArabicForms.o alphabet.o backtrns.o char.o \ + cjk.o memory.o ucharmap.o unialt.o ustring.o utype.o usprintf.o gwwiconv.o + +-Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib +-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ @DEFS@ ++Incs = -I$(top_srcdir)/inc ++CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ @DEFS@ + + all: ../libs/libgunicode.a + +diff -ru fontforge-20070831.orig/configure fontforge-20070831/configure +--- fontforge-20070831.orig/configure 2007-08-30 18:13:19.000000000 -0400 ++++ fontforge-20070831/configure 2007-09-15 18:08:26.000000000 -0400 +@@ -2686,9 +2686,7 @@ gww_define_caps_for_alt="1" @@ -24,7 +66,7 @@ LIBS="-Wl,/System/Library/Frameworks/CoreServices.framework/CoreServices $LIBS" ;; -@@ -19096,7 +19094,7 @@ +@@ -19100,7 +19098,7 @@ echo "$as_me:$LINENO: result: $ac_cv_file__usr_include_libxml2_libxml" >&5 echo "${ECHO_T}$ac_cv_file__usr_include_libxml2_libxml" >&6 if test $ac_cv_file__usr_include_libxml2_libxml = yes; then @@ -33,7 +75,7 @@ else echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5 -@@ -19117,7 +19115,7 @@ +@@ -19121,7 +19119,7 @@ echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5 echo "${ECHO_T}$ac_cv_file__usr_local_include_libxml2_libxml" >&6 if test $ac_cv_file__usr_local_include_libxml2_libxml = yes; then @@ -42,9 +84,9 @@ else cat >>confdefs.h <<\_ACEOF #define _NO_LIBXML 1 -diff -ru fontforge-20070723.orig/fontforge/Makefile.dynamic.in fontforge-20070723/fontforge/Makefile.dynamic.in ---- fontforge-20070723.orig/fontforge/Makefile.dynamic.in 2007-07-23 10:41:54.000000000 -0400 -+++ fontforge-20070723/fontforge/Makefile.dynamic.in 2007-07-24 14:43:39.000000000 -0400 +diff -ru fontforge-20070831.orig/fontforge/Makefile.dynamic.in fontforge-20070831/fontforge/Makefile.dynamic.in +--- fontforge-20070831.orig/fontforge/Makefile.dynamic.in 2007-08-27 22:18:49.000000000 -0400 ++++ fontforge-20070831/fontforge/Makefile.dynamic.in 2007-09-15 18:08:26.000000000 -0400 @@ -53,9 +53,9 @@ #I used to include -L/usr/lib explicitly after static_libs. Not sure why. Should be implied & breaks 64bit compiles @@ -56,40 +98,28 @@ + $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ -lm +DLIBS = -rpath $(libdir) -L$(libdir) -liconv ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm - all: fontforge sfddiff fontimage + all: fontforge sfddiff fontimage fontlint -diff -ru fontforge-20070723.orig/fontforge/Makefile.in fontforge-20070723/fontforge/Makefile.in ---- fontforge-20070723.orig/fontforge/Makefile.in 2007-07-23 10:41:54.000000000 -0400 -+++ fontforge-20070723/fontforge/Makefile.in 2007-07-24 14:43:39.000000000 -0400 -@@ -82,10 +82,10 @@ - # disasterous effects. This file may not be compiled with the optimizer. - # On the other hand we do need CPPFLAGS to get the right includes... - splinerefigure.o: $(srcdir)/splinerefigure.c $(srcdir)/splinefont.h -- $(CC) -g -c -o splinerefigure.o $(_CFLAGS) $(srcdir)/splinerefigure.c -+ $(CC) -g -c -o splinerefigure.o $(CFLAGS) $(srcdir)/splinerefigure.c +diff -ru fontforge-20070831.orig/fontforge/Makefile.in fontforge-20070831/fontforge/Makefile.in +--- fontforge-20070831.orig/fontforge/Makefile.in 2007-08-27 22:18:49.000000000 -0400 ++++ fontforge-20070831/fontforge/Makefile.in 2007-09-15 18:08:26.000000000 -0400 +@@ -53,9 +53,9 @@ - splinerefigure.lo: $(srcdir)/splinerefigure.c $(srcdir)/splinefont.h -- $(LIBTOOL) --mode=compile $(CC) -g -c -o splinerefigure.lo $(_CFLAGS) $(srcdir)/splinerefigure.c -+ $(LIBTOOL) --mode=compile $(CC) -g -c -o splinerefigure.lo $(CFLAGS) $(srcdir)/splinerefigure.c + #I used to include -L/usr/lib explicitly after static_libs. Not sure why. Should be implied & breaks 64bit compiles + LDFLAGS = @LDFLAGS@ +-LIBS = -rpath $(libdir) $(X_LIBS) ../libgdraw.la ../libgunicode.la \ +- $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm +-DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm ++LIBS = -rpath $(libdir) $(STATIC_LIBS) $(X_LIBS) ../libgdraw.la ../libgunicode.la \ ++ $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ -lm ++DLIBS = -rpath $(libdir) -L$(libdir) -liconv ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm - %.o: %.c + all: fontforge sfddiff fontimage fontlint -diff -ru fontforge-20070723.orig/fontforge/start.c fontforge-20070723/fontforge/start.c ---- fontforge-20070723.orig/fontforge/start.c 2007-07-23 00:11:16.000000000 -0400 -+++ fontforge-20070723/fontforge/start.c 2007-07-24 14:46:44.000000000 -0400 -@@ -38,9 +38,9 @@ - #include <sys/time.h> - #include <locale.h> - #include <unistd.h> --#if !defined(_NO_LIBUNINAMESLIST) && !defined(_STATIC_LIBUNINAMESLIST) && !defined(NODYNAMIC) -+//#if !defined(_NO_LIBUNINAMESLIST) && !defined(_STATIC_LIBUNINAMESLIST) && !defined(NODYNAMIC) - # include <dynamic.h> --#endif -+//#endif - #ifdef __Mac - # include <stdlib.h> /* getenv,setenv */ - #endif -@@ -363,7 +363,6 @@ +diff -ru fontforge-20070831.orig/fontforge/start.c fontforge-20070831/fontforge/start.c +--- fontforge-20070831.orig/fontforge/start.c 2007-08-17 15:27:06.000000000 -0400 ++++ fontforge-20070831/fontforge/start.c 2007-09-15 18:08:26.000000000 -0400 +@@ -361,7 +361,6 @@ /* install image libs. For some reason fink installs in a place */ /* the dynamic loader doesn't find */ /* (And fink's attempts to set the PATH variables generally don't work */ @@ -97,3 +127,45 @@ #endif } +diff -ru fontforge-20070831.orig/gdraw/Makefile.dynamic.in fontforge-20070831/gdraw/Makefile.dynamic.in +--- fontforge-20070831.orig/gdraw/Makefile.dynamic.in 2007-08-17 20:58:23.000000000 -0400 ++++ fontforge-20070831/gdraw/Makefile.dynamic.in 2007-09-15 18:10:49.000000000 -0400 +@@ -38,8 +38,8 @@ + gtextfield.lo gtextinfo.lo gwidgets.lo gxdraw.lo dynamic.lo \ + ghvbox.lo gmatrixedit.lo gdrawable.lo gspacer.lo + +-Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib +-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@ -DLIBDIR='"$(libdir)"' ++Incs = -I$(top_srcdir)/inc ++CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@ -DLIBDIR='"$(libdir)"' + + ../libgdraw.la: $(libgdraw_OBJECTS) + $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) @LDFLAGS@ -o ../libgdraw.la $(libgdraw_OBJECTS) \ +diff -ru fontforge-20070831.orig/gdraw/Makefile.in fontforge-20070831/gdraw/Makefile.in +--- fontforge-20070831.orig/gdraw/Makefile.in 2007-08-17 20:58:23.000000000 -0400 ++++ fontforge-20070831/gdraw/Makefile.in 2007-09-15 18:10:33.000000000 -0400 +@@ -38,8 +38,8 @@ + gtextfield.lo gtextinfo.lo gwidgets.lo gxdraw.lo dynamic.lo \ + ghvbox.lo gmatrixedit.lo gdrawable.lo gspacer.lo + +-Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib +-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@ -DLIBDIR='"$(libdir)"' ++Incs = -I$(top_srcdir)/inc ++CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@ -DLIBDIR='"$(libdir)"' + + ../libgdraw.la: $(libgdraw_OBJECTS) + $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) @LDFLAGS@ -o ../libgdraw.la $(libgdraw_OBJECTS) \ +diff -ru fontforge-20070831.orig/gdraw/Makefile.static.in fontforge-20070831/gdraw/Makefile.static.in +--- fontforge-20070831.orig/gdraw/Makefile.static.in 2007-02-01 08:43:21.000000000 -0500 ++++ fontforge-20070831/gdraw/Makefile.static.in 2007-09-15 18:10:18.000000000 -0400 +@@ -28,8 +28,8 @@ + gtextfield.o gtextinfo.o gwidgets.o gxdraw.o dynamic.o \ + ghvbox.o gmatrixedit.o gdrawable.o gspacer.o + +-Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib +-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@ -DLIBDIR='"$(libdir)"' ++Incs = -I$(top_srcdir)/inc ++CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@ -DLIBDIR='"$(libdir)"' + + all: ../libs/libgdraw.a + ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits