Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22729

Modified Files:
        mftrace.info 
Added Files:
        mftrace.patch 
Log Message:
Hardcode choice of fontforge

Index: mftrace.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/mftrace.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mftrace.info        27 Jul 2007 21:14:18 -0000      1.8
+++ mftrace.info        4 Jan 2009 00:01:08 -0000       1.9
@@ -1,11 +1,12 @@
 Package: mftrace
 Version: 1.2.14
-Revision: 1002
+Revision: 1004
 Maintainer: Matthias Neeracher <neerac...@mac.com>
 BuildDepends: libkpathsea4 | system-tetex
 Depends: python25, libkpathsea4-shlibs | system-tetex, tetex3-base | 
system-tetex, potrace, t1utils, fontforge (>= 20070607-1)
 Source: http://lilypond.org/download/sources/%n/%n-%v.tar.gz
 Source-MD5: 4e8837594c9e451666b65bfae3165e4f
+Patch: %n.patch
 ConfigureParams: --mandir='${prefix}/share/man'
 CompileScript: <<
 PYTHON=%p/bin/python2.5 ./configure %c

--- NEW FILE: mftrace.patch ---
diff -ruN mftrace-1.2.14-orig/mftrace.py mftrace-1.2.14/mftrace.py
--- mftrace-1.2.14-orig/mftrace.py      2008-01-08 03:30:20.000000000 +0100
+++ mftrace-1.2.14/mftrace.py   2008-01-08 03:31:04.000000000 +0100
@@ -710,24 +710,7 @@
     return ''
 
 def get_fontforge_command ():
-    fontforge_cmd = ''
-    for ff in ['fontforge', 'pfaedit']:
-        if get_binary(ff):
-            fontforge_cmd = ff
-
-    stat = 1
-    if fontforge_cmd:
-        stat = system ("%s -usage > pfv 2>&1 " % fontforge_cmd,
-               ignore_error = 1)
-
-        if stat != 0:
-            warning ("Command `%s -usage' failed.  Cannot simplify or convert 
to TTF.\n" % fontforge_cmd)
-
-    if fontforge_cmd == 'pfaedit' \
-     and re.search ("-script", open ('pfv').read ()) == None:
-        warning ("pfaedit does not support -script.  Install 020215 or 
later.\nCannot simplify or convert to TTF.\n")
-        return ''
-    return fontforge_cmd
+    return 'fontforge'
 
 def tfm2kpx (tfmname, encoding):
     kpx_lines = []


------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to