Merge pull request #1087 from LLNL/bugfix/new-harfbuzz-fix

Bugfix/new harfbuzz fix

var/spack/repos/builtin/packages/cairo/package.py

@@ -24,8 +24,10 @@
 ##############################################################################
 from spack import *
 
+
 class Cairo(Package):
-    """Cairo is a 2D graphics library with support for multiple output devices."""
+    """Cairo is a 2D graphics library with support for multiple output
+    devices."""
     homepage = "http://cairographics.org"
     url      = "http://cairographics.org/releases/cairo-1.14.0.tar.xz"
 
@@ -34,11 +36,12 @@ class Cairo(Package):
     depends_on("libpng")
     depends_on("glib")
     depends_on("pixman")
-    depends_on("fontconfig@2.10.91:") # Require newer version of fontconfig.
+    depends_on("freetype")
+    depends_on("fontconfig@2.10.91:")  # Require newer version of fontconfig.
 
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix,
-                  "--disable-trace", # can cause problems with libiberty
+                  "--disable-trace",  # can cause problems with libiberty
                   "--enable-tee")
         make()
         make("install")

var/spack/repos/builtin/packages/freetype/package.py

@@ -24,17 +24,18 @@
 ##############################################################################
 from spack import *
 
+
 class Freetype(Package):
     """Font package"""
     homepage = "http://http://www.freetype.org"
     url      = "http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.gz"
 
-    version('2.5.3'  , 'cafe9f210e45360279c730d27bf071e9')
+    version('2.5.3', 'cafe9f210e45360279c730d27bf071e9')
 
     depends_on('libpng')
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix)
+        configure("--prefix=%s" % prefix, "--with-harfbuzz=no")
 
         make()
         make("install")

var/spack/repos/builtin/packages/harfbuzz/package.py

@@ -24,6 +24,7 @@
 ##############################################################################
 from spack import *
 
+
 class Harfbuzz(Package):
     """The Harfbuzz package contains an OpenType text shaping engine."""
     homepage = "http://www.freedesktop.org/wiki/Software/HarfBuzz/"
@@ -34,6 +35,8 @@ class Harfbuzz(Package):
     depends_on("glib")
     depends_on("icu")
     depends_on("freetype")
+    depends_on("cairo")
+    depends_on("zlib")
 
     def patch(self):
         change_sed_delimiter('@', ';', 'src/Makefile.in')

var/spack/repos/builtin/packages/python/package.py

@@ -203,8 +203,10 @@ def python_ignore(self, ext_pkg, args):
                 r'site-packages/site[^/]*\.pyc?$',
                 r'site-packages/__pycache__/site[^/]*\.pyc?$'
             ])
+        if ext_pkg.name != 'py-pygments':
+            patterns.append(r'bin/pygmentize$')
         if ext_pkg.name != 'py-numpy':
-            patterns.append(r'bin/f2py$')
+            patterns.append(r'bin/f2py3?$')
 
         return match_predicate(ignore_arg, patterns)