Now it is built now. I suggest applying the attached patches.
lilypond: mftrace 1.1.2 compatibility, python 2.4 compatibity ec-fonts-mftraced: tetex-3.0 compatibility
Bert
Index: buildscripts/builder.py
===================================================================
RCS file: /cvsroot/lilypond/lilypond/buildscripts/builder.py,v
retrieving revision 1.26
diff -u -r1.26 builder.py
--- buildscripts/builder.py 8 Oct 2004 23:39:37 -0000 1.26
+++ buildscripts/builder.py 9 Feb 2005 14:33:16 -0000
@@ -211,7 +211,7 @@
a = 'cd ${TARGET.dir} && \
if test -e ${SOURCE.filebase}.enc; then
encoding="--encoding=${SOURCE.filebase}.enc"; fi; \
MFINPUTS=$srcdir/mf:.: \
-mftrace --pfa --simplify --keep-trying $$encoding $TOO__verbose \
+mftrace --formats=pfa --simplify --keep-trying $$encoding $TOO__verbose \
--include=${TARGET.dir} \
${SOURCE.file}'
Index: cygwin/mknetrel
===================================================================
RCS file: /cvsroot/lilypond/lilypond/cygwin/mknetrel,v
retrieving revision 1.35
diff -u -r1.35 mknetrel
--- cygwin/mknetrel 19 Oct 2004 18:17:57 -0000 1.35
+++ cygwin/mknetrel 9 Feb 2005 14:33:16 -0000
@@ -141,7 +141,7 @@
# set LDFLAGS to find the python library
# EXTRABUILDARGS="LDFLAGS=$cygwin_root/usr/bin/libpython2.3.dll"
- addmakeflags LDFLAGS="$cygwin_root/usr/bin/libpython2.3.dll" ' '
"target=i686-pc-cygwin" ' '
+ addmakeflags LDFLAGS="$cygwin_root/usr/bin/libpython2.4.dll" ' '
"target=i686-pc-cygwin" ' '
if iscygwin; then
# EXTRABUILDARGS="$EXTRABUILDARGS all doc web"
Index: cygwin/postinstall-lilypond.sh
===================================================================
RCS file: /cvsroot/lilypond/lilypond/cygwin/postinstall-lilypond.sh,v
retrieving revision 1.3
diff -u -r1.3 postinstall-lilypond.sh
--- cygwin/postinstall-lilypond.sh 29 Sep 2003 20:29:41 -0000 1.3
+++ cygwin/postinstall-lilypond.sh 9 Feb 2005 14:33:16 -0000
@@ -48,12 +48,14 @@
# generate run-lily-wins.bat - not necessary: direct bash route
# how to handle \r\n endings? text/bin mode?
#cat > /run-lily-wins.bat <<EOF
[EMAIL PROTECTED] off
-#rem run-lily-wins.bat - Invoke /usr/bin/lily-wins from explorer
-#$ROOT\\bin\\bash.exe --login -c "/usr/bin/lily-wins '%1%'"
[EMAIL PROTECTED] off
+#rem run-lily-wins.bat - Invoke /usr/bin/lily-wins from explorer
+#$ROOT\\bin\\bash.exe --login -c "/usr/bin/lily-wins '%1%'"
#EOF
# cleanup old fonts
touch /tmp/.lilypond-install
rm $(find /var/lib/texmf /var/spool/texmf /var/cache/fonts -name 'feta*pk' -or
-name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm')
rm -f /tmp/.lilypond-install
+
+updmap --enable Map ec-mftrace.map
Index: mf/GNUmakefile
===================================================================
RCS file: /cvsroot/lilypond/lilypond/mf/GNUmakefile,v
retrieving revision 1.93.2.1
diff -u -r1.93.2.1 GNUmakefile
--- mf/GNUmakefile 8 Nov 2004 19:57:56 -0000 1.93.2.1
+++ mf/GNUmakefile 9 Feb 2005 14:33:24 -0000
@@ -208,7 +208,7 @@
$(foreach i, $@, touch $i && ) true
$(outdir)/%.pfa: $(outdir)/%.bla
- $(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(notdir
$(basename $@)) && mv $(notdir $@) $(outdir)/
+ $(MFTRACE) -I $(outdir)/ --formats=pfa --simplify --keep-trying
$(notdir $(basename $@)) && mv $(notdir $@) $(outdir)/
$(outdir)/%.enc.in: %.enc
cp $< $@
Index: stepmake/stepmake/metafont-rules.make
===================================================================
RCS file: /cvsroot/lilypond/lilypond/stepmake/stepmake/metafont-rules.make,v
retrieving revision 1.26
diff -u -r1.26 metafont-rules.make
--- stepmake/stepmake/metafont-rules.make 31 Jul 2004 10:15:54 -0000
1.26
+++ stepmake/stepmake/metafont-rules.make 9 Feb 2005 14:33:32 -0000
@@ -30,11 +30,11 @@
$(outdir)/%.pfa: %.mf
- $(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --pfa --simplify $(basename
$(@F))
+ $(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --formats=pfa --simplify
$(basename $(@F))
mv $(basename $(@F)).pfa $(outdir)
$(outdir)/%.pfb: %.mf
- $(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --pfa --pfb --simplify
$(basename $(@F))
+ $(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --formats=pfa,pfb --simplify
$(basename $(@F))
-mv $(basename $(@F)).pfa $(outdir)
mv $(basename $(@F)).pfb $(outdir)
Index: GNUmakefile =================================================================== RCS file: /cvsroot/lilypond/sauter-fonts-mftraced/GNUmakefile,v retrieving revision 1.26 diff -u -r1.26 GNUmakefile --- GNUmakefile 6 Nov 2004 12:39:38 -0000 1.26 +++ GNUmakefile 9 Feb 2005 14:37:45 -0000 @@ -39,7 +39,7 @@ PATHSUF=$(NAME) PFADIR=$(TEXDIR)/fonts/type1/public/$(PATHSUF) TFMDIR=$(TEXDIR)/fonts/tfm/public/$(PATHSUF) -MAPDIR=$(TEXCONFDIR)/dvips/$(PATHSUF) +MAPDIR=$(TEXCONFDIR)/fonts/map/dvips/$(PATHSUF) ##MAPDIR=$(TEXCONFDIR)/dvips Index: cygwin/postinstall-ec-fonts-mftraced.sh =================================================================== RCS file: /cvsroot/lilypond/sauter-fonts-mftraced/cygwin/postinstall-ec-fonts-mftraced.sh,v retrieving revision 1.1 diff -u -r1.1 postinstall-ec-fonts-mftraced.sh --- cygwin/postinstall-ec-fonts-mftraced.sh 19 Oct 2004 16:54:13 -0000 1.1 +++ cygwin/postinstall-ec-fonts-mftraced.sh 9 Feb 2005 14:37:45 -0000 @@ -1,10 +1,5 @@ [EMAIL PROTECTED]@ +#!/bin/sh # /etc/postinstall/ec-fonts-mftraced.sh -# cleanup old fonts -touch /tmp/.ec-fonts-mftraced -rm $(find /var/lib/texmf /var/spool/texmf /var/cache/fonts -name 'ec*pk' -or -name 'ec*tfm') -rm -f /tmp/.ec-fonts-mftraced - # update tex installation -mktexlsr +if [ -e /bin/mktexlsr ]; then mktexlsr; updmap --enable Map ec-mftrace.map ; fi
_______________________________________________ lilypond-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/lilypond-devel
