Jelajahi Sumber

add libthai for pango (#5068)

* add libthai for pango

* move the libthai to linux brace

* add libdatrie

* add lzo for cairo

* change the order of dep
benny066567 1 tahun lalu
induk
melakukan
b408cba8f6
3 mengubah file dengan 4 tambahan dan 2 penghapusan
  1. 0 0
      clang
  2. 2 1
      packages/c/cairo/xmake.lua
  3. 2 1
      packages/p/pango/xmake.lua

+ 0 - 0
clang


+ 2 - 1
packages/c/cairo/xmake.lua

@@ -23,6 +23,7 @@ package("cairo")
         add_deps("pkgconf", "libintl")
     elseif is_plat("macosx") then
         add_deps("libiconv", {system = true})
+        add_deps("lzo")
     elseif is_plat("linux") then
         add_deps("libiconv")
     end
@@ -76,7 +77,7 @@ package("cairo")
         io.replace("meson.build", "subdir('fuzzing')", "", {plain = true})
         io.replace("meson.build", "subdir('docs')", "", {plain = true})
         io.replace("meson.build", "'CoreFoundation'", "'CoreFoundation', 'Foundation'", {plain = true})
-        local envs = meson.buildenvs(package, {packagedeps = {"libintl", "libiconv"}})
+        local envs = meson.buildenvs(package, {packagedeps = {"libintl", "libiconv", "lzo"}})
         if package:is_plat("windows") then
             envs.PATH = package:dep("pkgconf"):installdir("bin") .. path.envsep() .. envs.PATH
         end

+ 2 - 1
packages/p/pango/xmake.lua

@@ -21,6 +21,7 @@ package("pango")
         add_frameworks("CoreFoundation")
     elseif is_plat("linux") then
         add_deps("libiconv")
+        add_deps("libthai")
         add_deps("xorgproto")
         add_extsources("apt::libpango-1.0-0", "pacman::pango")
     end
@@ -47,7 +48,7 @@ package("pango")
         -- fix unexpected -Werror=array-bounds errors, see https://gitlab.gnome.org/GNOME/pango/-/issues/740
         io.replace("meson.build", "'-Werror=array-bounds',", "", {plain = true})
 
-        local envs = meson.buildenvs(package, {packagedeps = {"fontconfig", "freetype", "harfbuzz", "fribidi", "cairo", "glib", "pcre2", "libintl", "libiconv"}})
+        local envs = meson.buildenvs(package, {packagedeps = {"fontconfig", "freetype", "harfbuzz", "fribidi", "cairo", "glib", "pcre2", "libintl", "libiconv", "libthai", "libdatrie", }})
         -- workaround for https://github.com/xmake-io/xmake/issues/4412
         envs.LDFLAGS = string.gsub(envs.LDFLAGS, "%-libpath:", "/libpath:")
         meson.install(package, configs, {envs = envs})