Ver código fonte

fix fontconfig for macosx

ruki 6 anos atrás
pai
commit
4f81b9f163
1 arquivos alterados com 6 adições e 5 exclusões
  1. 6 5
      packages/f/fontconfig/xmake.lua

+ 6 - 5
packages/f/fontconfig/xmake.lua

@@ -6,14 +6,15 @@ package("fontconfig")
     set_urls("https://www.freedesktop.org/software/fontconfig/release/fontconfig-$(version).tar.gz")
     add_versions("2.13.1", "9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f")
 
-    add_deps("pkg-config", "freetype >= 2.9")
+    add_deps("pkg-config", "freetype >= 2.9", "expat")
     if not is_plat("macosx") then
-        add_deps("autoconf", "automake", "libtool", "gperf", "bzip2", "expat")
+        add_deps("autoconf", "automake", "libtool", "gperf", "bzip2")
         add_deps("util-linux", {configs = {libuuid = true}})
-        -- fix the build issue with --enable-static
-        add_patches("2.13.1", "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/8208f99fa1676c42bfd8d74de3e9dac5366c150c.diff",
-                              "2abdff214b99f2d074170e6512b0149cc858ea26cd930690aa6b4ccea2c549ef")
     end
+
+    -- fix the build issue with --enable-static
+    add_patches("2.13.1", "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/8208f99fa1676c42bfd8d74de3e9dac5366c150c.diff",
+                          "2abdff214b99f2d074170e6512b0149cc858ea26cd930690aa6b4ccea2c549ef")
  
     on_install("linux", "macosx", function (package)
         local font_dirs = {}