Remove freetype dependency on Windows

servo · Feb 6, 2017 · b6b9632 · b6b9632
1 parent ef2851a
commit b6b9632
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -118,8 +118,8 @@ dependencies. We are upgrading to a gcc-free build on Windows as soon as possibl
 
  ```sh
 pacman -Su
-pacman -Sy git mingw-w64-x86_64-toolchain mingw-w64-x86_64-freetype \
-    mingw-w64-x86_64-icu mingw-w64-x86_64-nspr mingw-w64-x86_64-ca-certificates \
+pacman -Sy git mingw-w64-x86_64-toolchain mingw-w64-x86_64-icu \
+    mingw-w64-x86_64-nspr mingw-w64-x86_64-ca-certificates \
     mingw-w64-x86_64-expat mingw-w64-x86_64-cmake tar diffutils patch \
     patchutils make python2-setuptools
 export GCC_URL=http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc

diff --git a/appveyor.yml b/appveyor.yml
@@ -49,7 +49,7 @@ install:
   - if %BUILD_ENV%==gnu  set MSYS=winsymlinks=lnk
   - if %BUILD_ENV%==gnu  bash -lc "echo $MSYSTEM; pacman --needed --noconfirm -Sy pacman-mirrors"
   - if %BUILD_ENV%==gnu  bash -lc "pacman --noconfirm -Sy"
-  - if %BUILD_ENV%==gnu  bash -lc "pacman -Sy --needed --noconfirm mingw-w64-x86_64-ccache mingw-w64-x86_64-toolchain mingw-w64-x86_64-freetype mingw-w64-x86_64-icu mingw-w64-x86_64-nspr mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-expat mingw-w64-x86_64-cmake tar diffutils patch patchutils make python2-setuptools"
+  - if %BUILD_ENV%==gnu  bash -lc "pacman -Sy --needed --noconfirm mingw-w64-x86_64-ccache mingw-w64-x86_64-toolchain mingw-w64-x86_64-icu mingw-w64-x86_64-nspr mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-expat mingw-w64-x86_64-cmake tar diffutils patch patchutils make python2-setuptools"
   # Downgrade msys2 build GCC to 5.4.0-1 - https://github.com/servo/servo/issues/12512
   - if %BUILD_ENV%==gnu  set GCC_URL=http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc
   - if %BUILD_ENV%==gnu  set GCC_EXT=5.4.0-1-any.pkg.tar.xz

diff --git a/python/servo/command_base.py b/python/servo/command_base.py
@@ -401,6 +401,8 @@ def package_dir(package):
         if is_windows():
             if not os.environ.get("NATIVE_WIN32_PYTHON"):
                 env["NATIVE_WIN32_PYTHON"] = sys.executable
+            # Always build harfbuzz from source
+            env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true"
 
         if not self.config["tools"]["system-rust"] \
                 or self.config["tools"]["rust-root"]:

diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
@@ -117,19 +117,15 @@ def copy_windows_dependencies(binary_path, destination):
             "libgcc_s_seh-1.dll",
             "libexpat-1.dll",
             "zlib1.dll",
-            "libpng16-16.dll",
             "libiconv-2.dll",
-            "libglib-2.0-0.dll",
-            "libgraphite2.dll",
-            "libfreetype-6.dll",
-            "libfontconfig-1.dll",
             "libintl-8.dll",
-            "libpcre-1.dll",
             "libeay32.dll",
             "ssleay32.dll",
-            "libharfbuzz-0.dll",
         ]
-        [shutil.copy(path.join("C:\\msys64\\mingw64\\bin", d), path.join(destination, d)) for d in deps]
+        for d in deps:
+            dep_path = path.join("C:\\msys64\\mingw64\\bin", d)
+            if path.exists(dep_path):
+                shutil.copy(dep_path, path.join(destination, d))
 
 
 def change_prefs(resources_path, platform):

diff --git a/python/servo/packages.py b/python/servo/packages.py
@@ -6,7 +6,6 @@
     "diffutils",
     "make",
     "mingw-w64-x86_64-toolchain",
-    "mingw-w64-x86_64-freetype",
     "mingw-w64-x86_64-icu",
     "mingw-w64-x86_64-nspr",
     "mingw-w64-x86_64-ca-certificates",