* buildscripts/guile-gnome.sh: Update.

* mf/GNUmakefile (aybabtu.otf): Add dependency on .pe.

* mf/aybabtu.pe.in: Capitalize Aybabtu.

diff --git a/ChangeLog b/ChangeLog
index b119012f2930f8475c5a8fe0f50bce6d874ab4e1..03063f43ff5f0bb02f1ccf4a4573a415a5bad09b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-12  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * buildscripts/guile-gnome.sh: Update.
+
+       * mf/GNUmakefile (aybabtu.otf): Add dependency on .pe.
+
+       * mf/aybabtu.pe.in: Capitalize Aybabtu.
+
 2005-03-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/separating-group-spanner.cc (find_rods): oops. Fix the real

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index f7157f1b3508094a67ec70c1a1a5ece10bf9df34..b5ac03b293b40314848c509350de7ddb38e1eded 100644 (file)
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -22,8 +22,9 @@ SLIB_PATH=`locate slib/require.scm | head -1 | sed -s 's/require.scm//g'`
 # What extra modules to pull (eg: EXTRA="libgnomecanvas libwnck")
 EXTRA=${EXTRA-libgnomecanvas}
 PANGOVERSION=1.6.0
-GGVERSION=2.7.97
-GWRAPVERSION=1.9.3
+GGVERSION=2.7.99
+GWRAPVERSION=1.9.5
+GLVERSION=0.1.2
 
 download=$HOME/usr/src/releases
 [ -d $download ] || mkdir -p $download
@@ -84,21 +85,14 @@ fi
 
 ## 3. Currently (2004-9-15) GUILE CVS works somewhat
 ##    But there's a guile/g-wrap problem with integer parameters
-unset GUILE_LOAD_PATH
-PATH=/usr/bin:$PATH
+## PATH=/usr/bin:$PATH
 
 if [ -d $OPT/libffi/ ]; then
     export LDFLAGS=-L$OPT/libffi/lib
     export CPPFLAGS=-I$OPT/libffi/include
 fi
 
-PKG_CONFIG_PATH=$OPT/g-wrap/lib/pkgconfig:$PKG_CONFIG_PATH
-LD_LIBRARY_PATH=$OPT/g-wrap/lib:$LD_LIBRARY_PATH
-GUILE_LOAD_PATH=$OPT/g-wrap/share/guile/site:$GUILE_LOAD_PATH:$SLIB_PATH
-
-
 ## 4.  get g-wrap 2.0
-## note that bleeding edge (2004-9-13) g-wrap breaks guile-gnome.
 if ! pkg-config --atleast-version=$GWRAPVERSION g-wrap-2.0-guile; then
     if [ -n "$BLOEDIGE_RAND" ]; then
        tla register-archive a.rottmann@gmx.at--2004-main \
@@ -125,8 +119,38 @@ if ! pkg-config --atleast-version=$GWRAPVERSION g-wrap-2.0-guile; then
     ../configure --prefix=$OPT/g-wrap --enable-maintainer-mode
     make install
     cd ../..
-fi    
+    PKG_CONFIG_PATH=$OPT/g-wrap/lib/pkgconfig:$PKG_CONFIG_PATH
+    LD_LIBRARY_PATH=$OPT/g-wrap/lib:$LD_LIBRARY_PATH
+    GUILE_LOAD_PATH=$OPT/g-wrap/share/guile/site:$GUILE_LOAD_PATH:$SLIB_PATH
+fi
 
+## 4a.  get g-lib 0.1.2
+if ! guile -c "(use-modules (srfi srfi-35))"; then
+    if [ -n "$BLOEDIGE_RAND" ]; then
+       :
+    else
+       $WGET http://download.gna.org/guile-lib/guile-lib-$GLVERSION.tar.gz
+       tar xzf $download/guile-lib-$GLVERSION.tar.gz
+       ln -s guile-lib-$GLVERSION guile-lib
+    fi
+    cd guile-lib
+    
+    rm -rf $OPT/guile-lib
+    if [ ! -f src/configure ]; then
+       sh autogen.sh --noconfigure
+    fi    
+    mkdir =build
+    cd =build
+    ../src/configure --prefix=$OPT/guile-lib #--enable-maintainer-mode
+    if true; then
+       make
+       cp ./guile-lib/doc/guile-library.info doc
+       install -d $OPT/guile-lib/share/info
+    fi
+    make install
+    cd ../..
+    GUILE_LOAD_PATH=$OPT/guile-lib/share/guile:$GUILE_LOAD_PATH
+fi    
 
 # not a good idea
 ## cp srfi-34.scm from CVS head ?  --hwn
@@ -134,9 +158,6 @@ fi
 # mv srfi-34.scm srfi-34.scm-g-wrap
 # cp $OPT/guile/share/guile-1.7/srfi/srfi-34.scm .)
 
-PKG_CONFIG_PATH=$OPT/guile-gnome/lib/pkgconfig:$PKG_CONFIG_PATH
-LD_LIBRARY_PATH=$OPT/guile-gnome/lib:$LD_LIBRARY_PATH
-GUILE_LOAD_PATH=$OPT/guile-gnome/share/guile:$GUILE_LOAD_PATH
 ## 5.  get guile-gnome
 if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then
     if [ -n "$BLOEDIGE_RAND" ]; then
@@ -179,7 +200,8 @@ if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then
        cd ..
        srcdir="../src"
     else
-       $WGET http://download.gna.org/guile-gnome/releases/guile-gnome-platform-$GGVERSION.tar.gz
+       #$WGET http://download.gna.org/guile-gnome/releases/guile-gnome-platform-$GGVERSION.tar.gz
+       $WGET ftp://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/guile-gnome-platform-$GGVERSION.tar.gz
        tar xzf $download/guile-gnome-platform-$GGVERSION.tar.gz
        ln -s guile-gnome-platform-$GGVERSION guile-gnome
        cd guile-gnome
@@ -205,6 +227,9 @@ if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then
        CC=$GCC34 $srcdir/configure --prefix=$OPT/guile-gnome --enable-maintainer-mode
     fi
     make all install G_WRAP_MODULE_DIR=$OPT/g-wrap/share/guile/site
+    PKG_CONFIG_PATH=$OPT/guile-gnome/lib/pkgconfig:$PKG_CONFIG_PATH
+    LD_LIBRARY_PATH=$OPT/guile-gnome/lib:$LD_LIBRARY_PATH
+    GUILE_LOAD_PATH=$OPT/guile-gnome/share/guile:$GUILE_LOAD_PATH
 fi
 
 cat <<EOF

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index a16d2217d9fc3c1fd479ed3f1e8f972d458795c2..e66b7490b3fe1c3c4255f66a76004b4bda523567 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -64,7 +64,7 @@ $(outdir)/%.otf-table: $(outdir)/%.lisp $(if $(findstring brace,$<),,$(subst fet
                $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \
                $(if $(findstring brace,$<),,$(subst feta,feta-alphabet,$<)) > $@
 
-$(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts  $(outdir)/aybabtu.fontname $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable
+$(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts  $(outdir)/aybabtu.fontname $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable $(outdir)/aybabtu.pe
 
 $(outdir)/aybabtu.fontname:
        echo -n 'aybabtu' > $@ 

diff --git a/mf/aybabtu.pe.in b/mf/aybabtu.pe.in
index ed04d9ddc54a325cdbf24d62b0a1ec6673e0358e..62b89a49af91f5e208ec0f3d51951c34a85d142a 100644 (file)
--- a/mf/aybabtu.pe.in
+++ b/mf/aybabtu.pe.in
@@ -54,7 +54,7 @@ MergeFonts("feta-braces-g.scale.pfa");
 MergeFonts("feta-braces-h.scale.pfa");
 MergeFonts("feta-braces-i.scale.pfa");
 
-SetFontNames("aybabtu-Regular", "aybabtu", "aybabtu Regular", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");
+SetFontNames("Aybabtu-Regular", "Aybabtu", "Aybabtu Regular", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");
 
 i = 0;
 while (i < CharCnt())