diff --git a/gub/installer.py b/gub/installer.py
index 8b6a09701..d407c9986 100644
--- a/gub/installer.py
+++ b/gub/installer.py
@@ -223,6 +223,8 @@ def strip_unnecessary_files (self):
'lib/fonts/[^hf]*',
'share/mkspecs',
'share/terminfo',
+# GUB's internal fonts directory settings
+ 'etc/fonts/conf.d/98-gub-fonts-dir.conf',
]
# FIXME: why are we removing these, we need these in a root image.
diff --git a/gub/specs/fontconfig.py b/gub/specs/fontconfig.py
index 88b2b6e0a..db0132d1c 100644
--- a/gub/specs/fontconfig.py
+++ b/gub/specs/fontconfig.py
@@ -21,9 +21,15 @@ class Fontconfig (target.AutoBuild):
fonts within the system and select them according to requirements
specified by applications.'''
- source = 'http://fontconfig.org/release/fontconfig-2.8.0.tar.gz'
+ source = 'http://fontconfig.org/release/fontconfig-2.11.1.tar.bz2'
+ patches = [
+ # This patch will be unnecessary from fontconfig-2.11.91.
+ 'fontconfig-2.11.1-texgyre-aliases.patch',
+ # This patch will be unnecessary from fontconfig-2.11.91.
+ 'fontconfig-2.11.1-new-urw-aliases.patch',
+ ]
#source = 'git://anongit.freedesktop.org/git/fontconfig?branch=master&revision=' + version
- dependencies = ['libtool', 'expat-devel', 'freetype-devel', 'tools::freetype', 'tools::pkg-config']
+ dependencies = ['libtool', 'expat-devel', 'freetype-devel', 'tools::freetype', 'tools::pkg-config', 'tools::bzip2']
# FIXME: system dir vs packaging install
## UGH - this breaks on Darwin!
## UGH2 - the added /cross/ breaks Cygwin; possibly need
@@ -86,7 +92,7 @@ def compile (self):
relax = ''
if 'stat' in misc.librestrict ():
relax = 'LIBRESTRICT_IGNORE=%(tools_prefix)s/bin/bash:%(tools_prefix)s/bin/make '
- for i in ('fc-case', 'fc-lang', 'fc-glyphname', 'fc-arch'):
+ for i in ('fc-case', 'fc-lang', 'fc-glyphname'):
self.system ('''
cd %(builddir)s/%(i)s && %(relax)s make "CFLAGS=%(cflags)s" "LIBS=%(libs)s" CPPFLAGS= LD_LIBRARY_PATH=%(tools_prefix)s/lib LDFLAGS=-L%(tools_prefix)s/lib INCLUDES=
''', locals ())
@@ -97,8 +103,16 @@ def install (self):
set FONTCONFIG_PATH=$INSTALLER_PREFIX/etc/fonts
''',
'%(install_prefix)s/etc/relocate/fontconfig.reloc')
-
-
+ self.dump ('''
+
+
+
+ %(system_prefix)s/share/fonts
+ %(tools_prefix)s/share/fonts
+
+''',
+ '%(install_prefix)s/etc/fonts/conf.d/98-gub-fonts-dir.conf')
+
class Fontconfig__mingw (Fontconfig):
def patch (self):
Fontconfig.patch (self)
@@ -140,10 +154,20 @@ class Fontconfig__freebsd (Fontconfig__linux):
class Fontconfig__tools (tools.AutoBuild):
# FIXME: use mi to get to source?
#source = 'git://anongit.freedesktop.org/git/fontconfig?revision=' + version
- source = 'http://fontconfig.org/release/fontconfig-2.8.0.tar.gz'
+ source = 'http://fontconfig.org/release/fontconfig-2.11.1.tar.bz2'
def patch (self):
self.dump ('\nAC_SUBST(LT_AGE)', '%(srcdir)s/configure.in', mode='a', permissions=octal.o755)
tools.AutoBuild.patch (self)
- dependencies = ['libtool', 'freetype', 'expat', 'pkg-config']
+ dependencies = ['libtool', 'freetype', 'expat', 'pkg-config', 'bzip2']
make_flags = ('man_MANS=' # either this, or add something like tools::docbook-utils
+ ' DOCSRC="" ')
+ def install (self):
+ tools.AutoBuild.install (self)
+ self.dump ('''
+
+
+
+ %(tools_prefix)s/share/fonts
+
+''',
+ '%(install_prefix)s/etc/fonts/conf.d/98-gub-fonts-dir.conf')
diff --git a/gub/specs/fonts-bitstream-charter.py b/gub/specs/fonts-bitstream-charter.py
new file mode 100644
index 000000000..e6c209b99
--- /dev/null
+++ b/gub/specs/fonts-bitstream-charter.py
@@ -0,0 +1,14 @@
+from gub import tools
+from gub import build
+
+class Fonts_bitstream_charter (build.BinaryBuild):
+ source = 'http://mirrors.ctan.org/fonts/charter.zip'
+ def install (self):
+ self.system ('mkdir -p %(install_prefix)s/share/fonts/type1/bitstream/charter')
+ self.system ('cp %(srcdir)s/charter/*.afm %(install_prefix)s/share/fonts/type1/bitstream/charter/')
+ self.system ('cp %(srcdir)s/charter/*.pf? %(install_prefix)s/share/fonts/type1/bitstream/charter/')
+ def package (self):
+ build.AutoBuild.package (self)
+
+class Fonts_bitstream_charter__tools (tools.AutoBuild, Fonts_bitstream_charter):
+ pass
diff --git a/gub/specs/fonts-bitstream-vera.py b/gub/specs/fonts-bitstream-vera.py
new file mode 100644
index 000000000..0c6e004d9
--- /dev/null
+++ b/gub/specs/fonts-bitstream-vera.py
@@ -0,0 +1,14 @@
+from gub import tools
+from gub import build
+
+class Fonts_bitstream_vera (build.BinaryBuild):
+ source = 'http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2'
+ dependencies = ['tools::bzip2']
+ def install (self):
+ self.system ('mkdir -p %(install_prefix)s/share/fonts/truetype/bitstream/vera')
+ self.system ('cp %(srcdir)s/*.ttf %(install_prefix)s/share/fonts/truetype/bitstream/vera/')
+ def package (self):
+ build.AutoBuild.package (self)
+
+class Fonts_bitstream_vera__tools (tools.AutoBuild, Fonts_bitstream_vera):
+ pass
diff --git a/gub/specs/fonts-dejavu.py b/gub/specs/fonts-dejavu.py
new file mode 100644
index 000000000..b7f18344d
--- /dev/null
+++ b/gub/specs/fonts-dejavu.py
@@ -0,0 +1,14 @@
+from gub import tools
+from gub import build
+
+class Fonts_dejavu (build.BinaryBuild):
+ source = 'http://sourceforge.net/projects/dejavu/files/dejavu/2.35/dejavu-fonts-ttf-2.35.tar.bz2'
+ dependencies = ['tools::bzip2']
+ def install (self):
+ self.system ('mkdir -p %(install_prefix)s/share/fonts/truetype/dejavu')
+ self.system ('cp %(srcdir)s/ttf/*.ttf %(install_prefix)s/share/fonts/truetype/dejavu/')
+ def package (self):
+ build.AutoBuild.package (self)
+
+class Fonts_dejavu__tools (tools.AutoBuild, Fonts_dejavu):
+ pass
diff --git a/gub/specs/fonts-ipafont.py b/gub/specs/fonts-ipafont.py
new file mode 100644
index 000000000..26e5ce9f5
--- /dev/null
+++ b/gub/specs/fonts-ipafont.py
@@ -0,0 +1,13 @@
+from gub import tools
+from gub import build
+
+class Fonts_ipafont (build.BinaryBuild):
+ source = 'http://download.forest.impress.co.jp/pub/library/i/ipafont/10483/IPAfont00303.zip'
+ def install (self):
+ self.system ('mkdir -p %(install_prefix)s/share/fonts/opentype/ipafont')
+ self.system ('cp %(srcdir)s/IPAfont00303/*.ttf %(install_prefix)s/share/fonts/opentype/ipafont/')
+ def package (self):
+ build.AutoBuild.package (self)
+
+class Fonts_ipafont__tools (tools.AutoBuild, Fonts_ipafont):
+ pass
diff --git a/gub/specs/fonts-liberation.py b/gub/specs/fonts-liberation.py
new file mode 100644
index 000000000..02ab74361
--- /dev/null
+++ b/gub/specs/fonts-liberation.py
@@ -0,0 +1,13 @@
+from gub import tools
+from gub import build
+
+class Fonts_liberation (build.BinaryBuild):
+ source = 'https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-2.00.1.tar.gz'
+ def install (self):
+ self.system ('mkdir -p %(install_prefix)s/share/fonts/truetype/liberation')
+ self.system ('cp %(srcdir)s/*.ttf %(install_prefix)s/share/fonts/truetype/liberation/')
+ def package (self):
+ build.AutoBuild.package (self)
+
+class Fonts_liberation__tools (tools.AutoBuild, Fonts_liberation):
+ pass
diff --git a/gub/specs/fonts-libertine.py b/gub/specs/fonts-libertine.py
new file mode 100644
index 000000000..ea5804ae2
--- /dev/null
+++ b/gub/specs/fonts-libertine.py
@@ -0,0 +1,13 @@
+from gub import tools
+from gub import build
+
+class Fonts_libertine (build.BinaryBuild):
+ source = 'http://sourceforge.net/projects/linuxlibertine/files/linuxlibertine/5.3.0/LinLibertineOTF_5.3.0_2012_07_02.tgz&strip=0'
+ def install (self):
+ self.system ('mkdir -p %(install_prefix)s/share/fonts/opentype/linux-libertine')
+ self.system ('cp %(srcdir)s/*.otf %(install_prefix)s/share/fonts/opentype/linux-libertine/')
+ def package (self):
+ build.AutoBuild.package (self)
+
+class Fonts_libertine__tools (tools.AutoBuild, Fonts_libertine):
+ pass
diff --git a/gub/specs/fonts-luximono.py b/gub/specs/fonts-luximono.py
new file mode 100644
index 000000000..1ffc7d8a5
--- /dev/null
+++ b/gub/specs/fonts-luximono.py
@@ -0,0 +1,14 @@
+from gub import tools
+from gub import build
+
+class Fonts_luximono (build.BinaryBuild):
+ source = 'http://mirrors.ctan.org/fonts/LuxiMono.zip'
+ def install (self):
+ self.system ('mkdir -p %(install_prefix)s/share/fonts/type1/luximono')
+ self.system ('cp %(srcdir)s/LuxiMono/*.afm %(install_prefix)s/share/fonts/type1/luximono/')
+ self.system ('cp %(srcdir)s/LuxiMono/*.pf? %(install_prefix)s/share/fonts/type1/luximono/')
+ def package (self):
+ build.AutoBuild.package (self)
+
+class Fonts_luximono__tools (tools.AutoBuild, Fonts_luximono):
+ pass
diff --git a/gub/specs/fonts-texgyre.py b/gub/specs/fonts-texgyre.py
new file mode 100644
index 000000000..d2d88d9b8
--- /dev/null
+++ b/gub/specs/fonts-texgyre.py
@@ -0,0 +1,13 @@
+from gub import tools
+from gub import build
+
+class Fonts_texgyre (build.BinaryBuild):
+ source = 'http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-2.005otf.zip'
+ def install (self):
+ self.system ('mkdir -p %(install_prefix)s/share/fonts/opentype/texgyre')
+ self.system ('cp %(srcdir)s/*.otf %(install_prefix)s/share/fonts/opentype/texgyre/')
+ def package (self):
+ build.AutoBuild.package (self)
+
+class Fonts_texgyre__tools (tools.AutoBuild, Fonts_texgyre):
+ pass
diff --git a/gub/specs/fonts-urw-core35.py b/gub/specs/fonts-urw-core35.py
new file mode 100644
index 000000000..41ab22fcc
--- /dev/null
+++ b/gub/specs/fonts-urw-core35.py
@@ -0,0 +1,14 @@
+from gub import tools
+from gub import build
+
+class Fonts_urw_core35 (build.BinaryBuild):
+ source = 'git://git.ghostscript.com/urw-core35-fonts.git'
+ def install (self):
+ self.system ('mkdir -p %(install_prefix)s/share/fonts/type1/urw-core35')
+ self.system ('cp %(srcdir)s/*.afm %(install_prefix)s/share/fonts/type1/urw-core35/')
+ self.system ('cp %(srcdir)s/*.pf? %(install_prefix)s/share/fonts/type1/urw-core35/')
+ def package (self):
+ build.AutoBuild.package (self)
+
+class Fonts_urw_core35__tools (tools.AutoBuild, Fonts_urw_core35):
+ pass
diff --git a/gub/specs/lilypond-doc.py b/gub/specs/lilypond-doc.py
index 8a3170da3..8443d1ced 100644
--- a/gub/specs/lilypond-doc.py
+++ b/gub/specs/lilypond-doc.py
@@ -12,6 +12,14 @@ class LilyPond_doc (lilypond.LilyPond_base):
'tools::imagemagick',
'tools::rsync', # ugh, we depend on *rsync* !?
#'tools::texlive',
+ 'tools::fonts-dejavu',
+ 'tools::fonts-libertine',
+ 'tools::fonts-bitstream-charter',
+ 'tools::fonts-bitstream-vera',
+ 'tools::fonts-liberation',
+ 'tools::fonts-urw-core35',
+ 'tools::fonts-luximono',
+ 'tools::fonts-ipafont',
'system::makeinfo',
'system::zip',
])
diff --git a/gub/specs/lilypond-test.py b/gub/specs/lilypond-test.py
index d6e5b6953..ebc3f7673 100644
--- a/gub/specs/lilypond-test.py
+++ b/gub/specs/lilypond-test.py
@@ -5,6 +5,17 @@
from gub.specs import lilypond
class LilyPond_test (lilypond.LilyPond_base):
+ dependencies = (lilypond.LilyPond_base.dependencies
+ + [
+ 'tools::fonts-dejavu',
+ 'tools::fonts-libertine',
+ 'tools::fonts-bitstream-charter',
+ 'tools::fonts-bitstream-vera',
+ 'tools::fonts-liberation',
+ 'tools::fonts-urw-core35',
+ 'tools::fonts-luximono',
+ 'tools::fonts-ipafont',
+ ])
@context.subst_method
def test_ball (self):
return '%(uploads)s/lilypond-%(version)s-%(build_number)s.test-output.tar.bz2'
diff --git a/gub/specs/lilypond.py b/gub/specs/lilypond.py
index 8c4177c5f..d5d7980b6 100644
--- a/gub/specs/lilypond.py
+++ b/gub/specs/lilypond.py
@@ -35,7 +35,7 @@ class LilyPond__simple (target.AutoBuild):
'guile-devel',
'pango-devel',
'python-devel',
- 'urw-fonts',
+ 'tools::fonts-texgyre',
'tools::autoconf',
'tools::bison',
@@ -61,7 +61,7 @@ class LilyPond__simple (target.AutoBuild):
+ ' --enable-relocation'
+ ' --enable-rpath'
+ ' --disable-documentation'
- + ' --with-fonts-dir=%(system_prefix)s/share/fonts/default/Type1'
+ + ' --with-texgyre-dir=%(tools_prefix)s/share/fonts/opentype/texgyre'
)
make_flags = ' TARGET_PYTHON=/usr/bin/python'
diff --git a/patches/fontconfig-2.11.1-new-urw-aliases.patch b/patches/fontconfig-2.11.1-new-urw-aliases.patch
new file mode 100644
index 000000000..58df7eac0
--- /dev/null
+++ b/patches/fontconfig-2.11.1-new-urw-aliases.patch
@@ -0,0 +1,308 @@
+From b732bf057f4b3ec3bac539803005e9c42d056b2a Mon Sep 17 00:00:00 2001
+From: Akira TAGOH
+Date: Thu, 6 Nov 2014 13:15:09 +0900
+Subject: Update aliases for new URW fonts
+
+Patch from Tom Yan
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85225
+
+diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
+index 49a9602..cd1e924 100644
+--- a/conf.d/30-metric-aliases.conf
++++ b/conf.d/30-metric-aliases.conf
+@@ -6,17 +6,17 @@
+
+ Alias similar/metric-compatible families from various sources:
+
+-PostScript fonts: URW fonts: GUST fonts: Windows fonts:
+-====================== ==================== ================= ==================
+-Helvetica Nimbus Sans L TeX Gyre Heros
+-Helvetica Condensed TeX Gyre Heros Cn
+-Times Nimbus Roman No9 L TeX Gyre Termes
+-Courier Nimbus Mono L TeX Gyre Cursor
+-ITC Avant Garde Gothic URW Gothic L TeX Gyre Adventor
+-ITC Bookman URW Bookman L TeX Gyre Bonum Bookman Old Style
+-ITC Zapf Chancery URW Chancery L TeX Gyre Chorus
+-Palatino URW Palladio L TeX Gyre Pagella Palatino Linotype
+-New Century Schoolbook Century Schoolbook L TeX Gyre Schola Century Schoolbook
++PostScript fonts: URW fonts: GUST fonts: Windows fonts:
++====================== ====================== ================= ==================
++Helvetica Nimbus Sans TeX Gyre Heros
++Helvetica Condensed Nimbus Sans Narrow TeX Gyre Heros Cn
++Times Nimbus Roman TeX Gyre Termes
++Courier Nimbus Mono TeX Gyre Cursor
++ITC Avant Garde Gothic URW Gothic TeX Gyre Adventor
++ITC Bookman Bookman URW TeX Gyre Bonum Bookman Old Style
++ITC Zapf Chancery Chancery URW TeX Gyre Chorus
++Palatino Palladio URW TeX Gyre Pagella Palatino Linotype
++New Century Schoolbook Century SchoolBook URW TeX Gyre Schola Century Schoolbook
+
+ Microsoft fonts: Liberation fonts: Google CrOS core fonts: StarOffice fonts: AMT fonts:
+ ================ ====================== ======================= ================= ==============
+@@ -57,6 +57,13 @@ but in an order preferring similar designs first. We do this in three steps:
+
+
+
++ Nimbus Sans
++
++ Helvetica
++
++
++
++
+ TeX Gyre Heros
+
+ Helvetica
+@@ -64,6 +71,13 @@ but in an order preferring similar designs first. We do this in three steps:
+
+
+
++ Nimbus Sans Narrow
++
++ Helvetica Condensed
++
++
++
++
+ TeX Gyre Heros Cn
+
+ Helvetica Condensed
+@@ -78,6 +92,13 @@ but in an order preferring similar designs first. We do this in three steps:
+
+
+
++ Nimbus Roman
++
++ Times
++
++
++
++
+ TeX Gyre Termes
+
+ Times
+@@ -92,6 +113,13 @@ but in an order preferring similar designs first. We do this in three steps:
+
+
+
++ Nimbus Mono
++
++ Courier
++
++
++
++
+ TeX Gyre Cursor
+
+ Courier
+@@ -113,6 +141,13 @@ but in an order preferring similar designs first. We do this in three steps:
+
+
+
++ URW Gothic
++
++ ITC Avant Garde Gothic
++
++
++
++
+ TeX Gyre Adventor
+
+ ITC Avant Garde Gothic
+@@ -134,6 +169,13 @@ but in an order preferring similar designs first. We do this in three steps:
+
+
+
++ Bookman URW
++
++ ITC Bookman
++
++
++
++
+ TeX Gyre Bonum
+
+ ITC Bookman
+@@ -162,6 +204,13 @@ but in an order preferring similar designs first. We do this in three steps:
+
+
+
++ Chancery URW
++
++ ITC Zapf Chancery
++
++
++
++
+ TeX Gyre Chorus
+
+ ITC Zapf Chancery
+@@ -176,6 +225,13 @@ but in an order preferring similar designs first. We do this in three steps:
+
+
+
++ Palladio URW
++
++ Palatino
++
++
++
++
+ TeX Gyre Pagella
+
+ Palatino
+@@ -197,6 +253,13 @@ but in an order preferring similar designs first. We do this in three steps:
+
+
+
++ Century SchoolBook URW
++
++ New Century Schoolbook
++
++
++
++
+ TeX Gyre Schola
+
+ New Century Schoolbook
+@@ -401,6 +464,7 @@ but in an order preferring similar designs first. We do this in three steps:
+ Helvetica
+
+ TeX Gyre Heros
++ Nimbus Sans
+ Nimbus Sans L
+
+
+@@ -409,6 +473,7 @@ but in an order preferring similar designs first. We do this in three steps:
+ Helvetica Condensed
+
+ TeX Gyre Heros Cn
++ Nimbus Sans Narrow
+
+
+
+@@ -416,6 +481,7 @@ but in an order preferring similar designs first. We do this in three steps:
+ Times
+
+ TeX Gyre Termes
++ Nimbus Roman
+ Nimbus Roman No9 L
+
+
+@@ -424,6 +490,7 @@ but in an order preferring similar designs first. We do this in three steps:
+ Courier
+
+ TeX Gyre Cursor
++ Nimbus Mono
+ Nimbus Mono L
+
+
+@@ -432,6 +499,7 @@ but in an order preferring similar designs first. We do this in three steps:
+ ITC Avant Garde Gothic
+
+ TeX Gyre Adventor
++ URW Gothic
+ URW Gothic L
+
+
+@@ -441,6 +509,7 @@ but in an order preferring similar designs first. We do this in three steps:
+
+ Bookman Old Style
+ TeX Gyre Bonum
++ Bookman URW
+ URW Bookman L
+
+
+@@ -449,6 +518,7 @@ but in an order preferring similar designs first. We do this in three steps:
+ ITC Zapf Chancery
+
+ TeX Gyre Chorus
++ Chancery URW
+ URW Chancery L
+
+
+@@ -458,6 +528,7 @@ but in an order preferring similar designs first. We do this in three steps:
+
+ Palatino Linotype
+ TeX Gyre Pagella
++ Palladio URW
+ URW Palladio L
+
+
+@@ -467,6 +538,7 @@ but in an order preferring similar designs first. We do this in three steps:
+
+ Century Schoolbook
+ TeX Gyre Schola
++ Century SchoolBook URW
+ Century Schoolbook L
+
+
+diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf
+index 996fb81..72490f3 100644
+--- a/conf.d/45-latin.conf
++++ b/conf.d/45-latin.conf
+@@ -34,6 +34,10 @@
+ serif
+
+
++ Nimbus Roman
++ serif
++
++
+ Luxi Serif
+ serif
+
+@@ -97,6 +101,10 @@
+ sans-serif
+
+
++ Nimbus Sans
++ sans-serif
++
++
+ Luxi Sans
+ sans-serif
+
+@@ -151,6 +159,10 @@
+ Nimbus Mono L
+ monospace
+
++
++ Nimbus Mono
++ monospace
++
+
+diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf
+index 2107e31..35600ea 100644
+--- a/conf.d/60-latin.conf
++++ b/conf.d/60-latin.conf
+@@ -10,6 +10,7 @@
+ Thorndale AMT
+ Luxi Serif
+ Nimbus Roman No9 L
++ Nimbus Roman
+ Times
+
+
+@@ -23,6 +24,7 @@
+ Albany AMT
+ Luxi Sans
+ Nimbus Sans L
++ Nimbus Sans
+ Helvetica
+ Lucida Sans Unicode
+ BPG Glaho International
+@@ -40,6 +42,7 @@
+ Cumberland AMT
+ Luxi Mono
+ Nimbus Mono L
++ Nimbus Mono
+ Courier
+
+
+--
+cgit v0.10.2
+
diff --git a/patches/fontconfig-2.11.1-texgyre-aliases.patch b/patches/fontconfig-2.11.1-texgyre-aliases.patch
new file mode 100644
index 000000000..8c1e55dcd
--- /dev/null
+++ b/patches/fontconfig-2.11.1-texgyre-aliases.patch
@@ -0,0 +1,43 @@
+From e7121de237a1873c3241a5b8451e7d00a3d41524 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH
+Date: Fri, 3 Oct 2014 12:26:42 +0900
+Subject: Revert "Bug 73291 - poppler does not show fl ligature"
+
+This reverts commit c6aa4d4bfcbed14f39d070fe7ef90a4b74642ee7.
+
+This issue has been fixed in poppler and we no longer need to patch it out in fontconfig.
+
+diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
+index 08c8ba3..49a9602 100644
+--- a/conf.d/30-metric-aliases.conf
++++ b/conf.d/30-metric-aliases.conf
+@@ -77,15 +77,12 @@ but in an order preferring similar designs first. We do this in three steps:
+
+
+
+-
+
+
+ Nimbus Mono L
+@@ -418,10 +415,7 @@ but in an order preferring similar designs first. We do this in three steps:
+
+ Times
+
+-
+ Nimbus Roman No9 L
+
+
+--
+cgit v0.10.2
+
diff --git a/sourcefiles/lilypond-sharhead.sh b/sourcefiles/lilypond-sharhead.sh
index 71888bd97..f50f78a1f 100644
--- a/sourcefiles/lilypond-sharhead.sh
+++ b/sourcefiles/lilypond-sharhead.sh
@@ -246,17 +246,6 @@ cd ${bindir};
done
cd - > /dev/null;
-
-## fontconfig lily fonts
-mkdir -p ${prefix}/usr/etc/fonts/conf.d
-cat < ${prefix}/usr/etc/fonts/conf.d/00-lilypond.conf
-
-
-
- ${prefix}/usr/share/lilypond/current/fonts/otf
-
-EOF
-
###################
## uninstall script