From 61b78e20a3354a5f70e0e6303a0d45575b87b0ff Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sat, 8 Aug 2015 14:44:43 +0900 Subject: [PATCH 01/19] Update fontconfig to 2.11.1 For fixing Japanese serif font selection problem on Windows. The cause is fontconfig-2.8.0's `Bug 43406'. --- gub/specs/fontconfig.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gub/specs/fontconfig.py b/gub/specs/fontconfig.py index 88b2b6e0a..99864b8b0 100644 --- a/gub/specs/fontconfig.py +++ b/gub/specs/fontconfig.py @@ -21,9 +21,9 @@ 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' #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 +86,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 ()) @@ -140,10 +140,10 @@ 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="" ') From 3e500ae679637dc36c4506f70427b2a7682ab99f Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Mon, 10 Aug 2015 22:40:15 +0900 Subject: [PATCH 02/19] Add GUB's internal fonts directory --- gub/installer.py | 2 ++ gub/specs/fontconfig.py | 22 ++++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) 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 99864b8b0..80671276a 100644 --- a/gub/specs/fontconfig.py +++ b/gub/specs/fontconfig.py @@ -97,8 +97,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) @@ -147,3 +155,13 @@ def patch (self): 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') From 401f1d23b6448ff9a7cfe4f43a4e79e6139b8255 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Mon, 10 Aug 2015 22:50:00 +0900 Subject: [PATCH 03/19] Remove unnecessary fontconfig conf --- sourcefiles/lilypond-sharhead.sh | 11 ----------- 1 file changed, 11 deletions(-) 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 From 2422bb8d480810be05394a429c99773914b4a4eb Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Mon, 10 Aug 2015 22:55:24 +0900 Subject: [PATCH 04/19] Add specs Linux Libertine fonts --- gub/specs/libertine-fonts.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 gub/specs/libertine-fonts.py diff --git a/gub/specs/libertine-fonts.py b/gub/specs/libertine-fonts.py new file mode 100644 index 000000000..a2715fc1b --- /dev/null +++ b/gub/specs/libertine-fonts.py @@ -0,0 +1,13 @@ +from gub import tools +from gub import build + +class Libertine_fonts (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/* %(install_prefix)s/share/fonts/opentype/linux-libertine/') + def package (self): + build.AutoBuild.package (self) + +class Libertine_fonts__tools (tools.AutoBuild, Libertine_fonts): + pass From 2e8d3bd90931bcecd286178630dcdb5c08b17fa8 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Mon, 10 Aug 2015 23:02:15 +0900 Subject: [PATCH 05/19] Add Libertine fonts dependency to lilypond-doc --- gub/specs/lilypond-doc.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gub/specs/lilypond-doc.py b/gub/specs/lilypond-doc.py index 8a3170da3..a29ff64ea 100644 --- a/gub/specs/lilypond-doc.py +++ b/gub/specs/lilypond-doc.py @@ -12,6 +12,7 @@ class LilyPond_doc (lilypond.LilyPond_base): 'tools::imagemagick', 'tools::rsync', # ugh, we depend on *rsync* !? #'tools::texlive', + 'tools::libertine-fonts', 'system::makeinfo', 'system::zip', ]) From a08926d3286b137591b9427bbde8c4edbb0328b2 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sat, 15 Aug 2015 22:58:34 +0900 Subject: [PATCH 06/19] Rename libertine fonts spec file --- gub/specs/{libertine-fonts.py => fonts-libertine.py} | 4 ++-- gub/specs/lilypond-doc.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename gub/specs/{libertine-fonts.py => fonts-libertine.py} (81%) diff --git a/gub/specs/libertine-fonts.py b/gub/specs/fonts-libertine.py similarity index 81% rename from gub/specs/libertine-fonts.py rename to gub/specs/fonts-libertine.py index a2715fc1b..3caa6b8ef 100644 --- a/gub/specs/libertine-fonts.py +++ b/gub/specs/fonts-libertine.py @@ -1,7 +1,7 @@ from gub import tools from gub import build -class Libertine_fonts (build.BinaryBuild): +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') @@ -9,5 +9,5 @@ def install (self): def package (self): build.AutoBuild.package (self) -class Libertine_fonts__tools (tools.AutoBuild, Libertine_fonts): +class Fonts_libertine__tools (tools.AutoBuild, Fonts_libertine): pass diff --git a/gub/specs/lilypond-doc.py b/gub/specs/lilypond-doc.py index a29ff64ea..adeea1b59 100644 --- a/gub/specs/lilypond-doc.py +++ b/gub/specs/lilypond-doc.py @@ -12,7 +12,7 @@ class LilyPond_doc (lilypond.LilyPond_base): 'tools::imagemagick', 'tools::rsync', # ugh, we depend on *rsync* !? #'tools::texlive', - 'tools::libertine-fonts', + 'tools::fonts-libertine', 'system::makeinfo', 'system::zip', ]) From 1233f7229e0b57edfe9612b22439f3ab128a45b8 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sun, 16 Aug 2015 00:47:41 +0900 Subject: [PATCH 07/19] Update fontconfig built-in conf file for new URW++ fonts aliases These patches are from fontconfig git repo. So they will be unnecessary from fontconfig-2.11.91. --- gub/specs/fontconfig.py | 6 + .../fontconfig-2.11.1-new-urw-aliases.patch | 308 ++++++++++++++++++ .../fontconfig-2.11.1-texgyre-aliases.patch | 43 +++ 3 files changed, 357 insertions(+) create mode 100644 patches/fontconfig-2.11.1-new-urw-aliases.patch create mode 100644 patches/fontconfig-2.11.1-texgyre-aliases.patch diff --git a/gub/specs/fontconfig.py b/gub/specs/fontconfig.py index 80671276a..db0132d1c 100644 --- a/gub/specs/fontconfig.py +++ b/gub/specs/fontconfig.py @@ -22,6 +22,12 @@ class Fontconfig (target.AutoBuild): specified by applications.''' 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', 'tools::bzip2'] # FIXME: system dir vs packaging install 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 + From 9d12fff59e02fdc752e8f55ca7fc70ffdb1ad09c Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sun, 16 Aug 2015 00:53:29 +0900 Subject: [PATCH 08/19] Fix fonts-libertine Install ttf files only. --- gub/specs/fonts-libertine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gub/specs/fonts-libertine.py b/gub/specs/fonts-libertine.py index 3caa6b8ef..ea5804ae2 100644 --- a/gub/specs/fonts-libertine.py +++ b/gub/specs/fonts-libertine.py @@ -5,7 +5,7 @@ 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/* %(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) From 43b2d3c2a6a4d246bdb586775edd08ac76b5fcb2 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sun, 16 Aug 2015 00:56:50 +0900 Subject: [PATCH 09/19] Add fonts `Bitstream Charter' --- gub/specs/fonts-bitstream-charter.py | 14 ++++++++++++++ gub/specs/lilypond-doc.py | 1 + 2 files changed, 15 insertions(+) create mode 100644 gub/specs/fonts-bitstream-charter.py 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/lilypond-doc.py b/gub/specs/lilypond-doc.py index adeea1b59..a175c1834 100644 --- a/gub/specs/lilypond-doc.py +++ b/gub/specs/lilypond-doc.py @@ -13,6 +13,7 @@ class LilyPond_doc (lilypond.LilyPond_base): 'tools::rsync', # ugh, we depend on *rsync* !? #'tools::texlive', 'tools::fonts-libertine', + 'tools::fonts-bitstream-charter', 'system::makeinfo', 'system::zip', ]) From be830d5fafec0af9b900f82f32503afaed8dafae Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sun, 16 Aug 2015 00:58:31 +0900 Subject: [PATCH 10/19] Add fonts `Bitstream Vera' --- gub/specs/fonts-bitstream-vera.py | 14 ++++++++++++++ gub/specs/lilypond-doc.py | 1 + 2 files changed, 15 insertions(+) create mode 100644 gub/specs/fonts-bitstream-vera.py 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/lilypond-doc.py b/gub/specs/lilypond-doc.py index a175c1834..3059338f2 100644 --- a/gub/specs/lilypond-doc.py +++ b/gub/specs/lilypond-doc.py @@ -14,6 +14,7 @@ class LilyPond_doc (lilypond.LilyPond_base): #'tools::texlive', 'tools::fonts-libertine', 'tools::fonts-bitstream-charter', + 'tools::fonts-bitstream-vera', 'system::makeinfo', 'system::zip', ]) From 110262556bf4711256026ed2d723be7be91ff269 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sun, 16 Aug 2015 01:00:20 +0900 Subject: [PATCH 11/19] Add fonts `Liberation' `Times New Roman' substitute --- gub/specs/fonts-liberation.py | 13 +++++++++++++ gub/specs/lilypond-doc.py | 1 + 2 files changed, 14 insertions(+) create mode 100644 gub/specs/fonts-liberation.py 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/lilypond-doc.py b/gub/specs/lilypond-doc.py index 3059338f2..b8764eebd 100644 --- a/gub/specs/lilypond-doc.py +++ b/gub/specs/lilypond-doc.py @@ -15,6 +15,7 @@ class LilyPond_doc (lilypond.LilyPond_base): 'tools::fonts-libertine', 'tools::fonts-bitstream-charter', 'tools::fonts-bitstream-vera', + 'tools::fonts-liberation', 'system::makeinfo', 'system::zip', ]) From ea318f00b818ad69e9565226e3d2b5d948451ba7 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sun, 16 Aug 2015 01:02:47 +0900 Subject: [PATCH 12/19] Add fonts `urw-core35' for `Nimbus Sans' --- gub/specs/fonts-urw-core35.py | 14 ++++++++++++++ gub/specs/lilypond-doc.py | 1 + 2 files changed, 15 insertions(+) create mode 100644 gub/specs/fonts-urw-core35.py 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 b8764eebd..7cf71253e 100644 --- a/gub/specs/lilypond-doc.py +++ b/gub/specs/lilypond-doc.py @@ -16,6 +16,7 @@ class LilyPond_doc (lilypond.LilyPond_base): 'tools::fonts-bitstream-charter', 'tools::fonts-bitstream-vera', 'tools::fonts-liberation', + 'tools::fonts-urw-core35', 'system::makeinfo', 'system::zip', ]) From 824473d0511b13ea13e637eed02abef1c1bc7cdc Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sun, 16 Aug 2015 01:04:12 +0900 Subject: [PATCH 13/19] Add fonts `LuxiMono' --- gub/specs/fonts-luximono.py | 14 ++++++++++++++ gub/specs/lilypond-doc.py | 1 + 2 files changed, 15 insertions(+) create mode 100644 gub/specs/fonts-luximono.py 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/lilypond-doc.py b/gub/specs/lilypond-doc.py index 7cf71253e..1c7b63832 100644 --- a/gub/specs/lilypond-doc.py +++ b/gub/specs/lilypond-doc.py @@ -17,6 +17,7 @@ class LilyPond_doc (lilypond.LilyPond_base): 'tools::fonts-bitstream-vera', 'tools::fonts-liberation', 'tools::fonts-urw-core35', + 'tools::fonts-luximono', 'system::makeinfo', 'system::zip', ]) From fcd81f2187329dd8d8719c47aac004eb5821eb65 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sun, 16 Aug 2015 01:05:16 +0900 Subject: [PATCH 14/19] Add fonts `DejaVu' --- gub/specs/fonts-dejavu.py | 14 ++++++++++++++ gub/specs/lilypond-doc.py | 1 + 2 files changed, 15 insertions(+) create mode 100644 gub/specs/fonts-dejavu.py 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/lilypond-doc.py b/gub/specs/lilypond-doc.py index 1c7b63832..e08126282 100644 --- a/gub/specs/lilypond-doc.py +++ b/gub/specs/lilypond-doc.py @@ -12,6 +12,7 @@ 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', From 188be2ea431145c3a6547b4d15be576d0bfe2416 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sun, 16 Aug 2015 01:06:13 +0900 Subject: [PATCH 15/19] Add fonts `IPAfonts' Japanese fonts. --- gub/specs/fonts-ipafont.py | 13 +++++++++++++ gub/specs/lilypond-doc.py | 1 + 2 files changed, 14 insertions(+) create mode 100644 gub/specs/fonts-ipafont.py 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/lilypond-doc.py b/gub/specs/lilypond-doc.py index e08126282..8443d1ced 100644 --- a/gub/specs/lilypond-doc.py +++ b/gub/specs/lilypond-doc.py @@ -19,6 +19,7 @@ class LilyPond_doc (lilypond.LilyPond_base): 'tools::fonts-liberation', 'tools::fonts-urw-core35', 'tools::fonts-luximono', + 'tools::fonts-ipafont', 'system::makeinfo', 'system::zip', ]) From badff38711aaaa3748dde643f391140ba6e1c895 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sun, 16 Aug 2015 01:38:25 +0900 Subject: [PATCH 16/19] Add fonts 'TeX Gyre' --- gub/specs/fonts-texgyre.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 gub/specs/fonts-texgyre.py 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 From b679ccf6ee77ee5d4a1e11117b9d674f44598296 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sun, 16 Aug 2015 23:00:59 +0900 Subject: [PATCH 17/19] Add fonts dependency to lilypond-test --- gub/specs/lilypond-test.py | 11 +++++++++++ 1 file changed, 11 insertions(+) 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' From f1912c0f4c379a625e8b8c6f0b199091a50a92e4 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sun, 16 Aug 2015 01:40:31 +0900 Subject: [PATCH 18/19] Add `TeX Gyre' fonts to lilypond spec file Add fonts dependency Add configure option --- gub/specs/lilypond.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gub/specs/lilypond.py b/gub/specs/lilypond.py index 8c4177c5f..60253f3c4 100644 --- a/gub/specs/lilypond.py +++ b/gub/specs/lilypond.py @@ -36,6 +36,7 @@ class LilyPond__simple (target.AutoBuild): 'pango-devel', 'python-devel', 'urw-fonts', + 'tools::fonts-texgyre', 'tools::autoconf', 'tools::bison', @@ -62,6 +63,7 @@ class LilyPond__simple (target.AutoBuild): + ' --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' From 89da436b2a2978dc9bba31db21cbaea785bcb2e2 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Sun, 16 Aug 2015 23:23:16 +0900 Subject: [PATCH 19/19] Remove URW++ fonts from lilypond spec file Remove fonts dependency Remove configure option --- gub/specs/lilypond.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/gub/specs/lilypond.py b/gub/specs/lilypond.py index 60253f3c4..d5d7980b6 100644 --- a/gub/specs/lilypond.py +++ b/gub/specs/lilypond.py @@ -35,7 +35,6 @@ class LilyPond__simple (target.AutoBuild): 'guile-devel', 'pango-devel', 'python-devel', - 'urw-fonts', 'tools::fonts-texgyre', 'tools::autoconf', @@ -62,7 +61,6 @@ 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'