Mercurial > gub
changeset 6406:e03165e90a12
Add GUB's internal fonts directory
| author | Masamichi Hosoda <trueroad@users.noreply.github.com> |
|---|---|
| date | Mon, 10 Aug 2015 22:40:15 +0900 |
| parents | 743ca8729076 |
| children | 8b7c2e05473e |
| files | gub/installer.py gub/specs/fontconfig.py |
| diffstat | 2 files changed, 22 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/installer.py Sat Aug 08 14:44:43 2015 +0900 +++ b/gub/installer.py Mon Aug 10 22:40:15 2015 +0900 @@ -223,6 +223,8 @@ '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.
--- a/gub/specs/fontconfig.py Sat Aug 08 14:44:43 2015 +0900 +++ b/gub/specs/fontconfig.py Mon Aug 10 22:40:15 2015 +0900 @@ -97,8 +97,16 @@ set FONTCONFIG_PATH=$INSTALLER_PREFIX/etc/fonts ''', '%(install_prefix)s/etc/relocate/fontconfig.reloc') - - + self.dump ('''<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <!-- GUB's internal fonts directory --> + <dir>%(system_prefix)s/share/fonts</dir> + <dir>%(tools_prefix)s/share/fonts</dir> +</fontconfig> +''', + '%(install_prefix)s/etc/fonts/conf.d/98-gub-fonts-dir.conf') + class Fontconfig__mingw (Fontconfig): def patch (self): Fontconfig.patch (self) @@ -147,3 +155,13 @@ 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 ('''<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <!-- GUB's internal fonts directory --> + <dir>%(tools_prefix)s/share/fonts</dir> +</fontconfig> +''', + '%(install_prefix)s/etc/fonts/conf.d/98-gub-fonts-dir.conf')