# HG changeset patch # User Masamichi Hosoda # Date 1439012683 -32400 # Node ID 743ca8729076321fc096dc6f1a43d68225336d00 # Parent e84fa9bddd3f9f7f404836b4ffc3c0f256dcdeaf 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'. diff -r e84fa9bddd3f -r 743ca8729076 gub/specs/fontconfig.py --- a/gub/specs/fontconfig.py Wed Apr 22 15:53:41 2015 +0100 +++ b/gub/specs/fontconfig.py Sat Aug 08 14:44:43 2015 +0900 @@ -21,9 +21,9 @@ 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 @@ 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__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="" ')