Merge freetype change into this branch

Author: johnwparent

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

@@ -50,9 +50,14 @@ def headers(self):
 
 
 class CMakeBuilder(CMakeBuilder):
-    def cmake_args(self):
-        return [self.define("FT_WITH_ZLIB", True), self.define("FT_WITH_BZIP2", True)]
-
+        def cmake_args(self):
+            return [
+                self.define("FT_DISABLE_ZLIB", True),
+                self.define("FT_DISABLE_BROTLI", True),
+                self.define("FT_DISABLE_HARFBUZZ", True),
+                self.define("FT_REQUIRE_PNG", True),
+                self.define("FT_REQUIRE_BZIP2", True),
+            ]
 
 class AutoToolsBuilder(AutotoolsBuilder):
     def configure_args(self):