update

Author: Doekin

packages/c/cairo/xmake.lua

@@ -9,6 +9,7 @@ package("cairo")
     add_versions("1.17.6", "a2227afc15e616657341c42af9830c937c3a6bfa63661074eabef13600e8936f")
     add_versions("1.17.8", "b4ed6d33037171d4c6594345b42d81796f335a6995fdf5638db0d306c17a0d3e")
     add_versions("1.18.0", "39a78afdc33a435c0f2ab53a5ec2a693c3c9b6d2ec9783ceecb2b94d54d942b0")
+    add_versions("1.18.4", "2f3e6e665dbbb420809102b71ad7d0f7ce870a0b1bf8b34c073f06aefb511fc6")
 
     add_patches("1.18.0", path.join(os.scriptdir(), "patches", "1.18.0", "alloca.patch"), "55f8577929537d43eed9f74241560821001b6c8613d6a7a21cff83f8431c6a70")
 
@@ -40,7 +41,7 @@ package("cairo")
         add_frameworks("CoreGraphics", "CoreFoundation", "CoreText", "Foundation")
     end
 
-    on_load("windows|x64", "windows|x86", "macosx", "linux", function (package)
+    on_load(function (package)
         if package:is_plat("windows") and not package:config("shared") then
             package:add("defines", "CAIRO_WIN32_STATIC_BUILD=1")
         end
@@ -58,7 +59,7 @@ package("cairo")
         end
     end)
 
-    on_install("windows|x64", "windows|x86", "macosx", "linux", function (package)
+    on_install(function (package)
         import("package.tools.meson")
 
         local configs = {

packages/f/fontconfig/xmake.lua

@@ -22,7 +22,7 @@ package("fontconfig")
         add_deps("pkg-config")
     end
 
-    on_load("windows", "linux", "macosx", function (package)
+    on_load(function (package)
         if package:config("nls") and not package:is_plat("linux") then
             package:add("deps", "libintl")
         end
@@ -32,7 +32,7 @@ package("fontconfig")
         end
     end)
 
-    on_install("windows", "linux", "macosx", function (package)
+    on_install(function (package)
         if package:is_plat("windows") then
             io.replace("meson.build", "c_args = []", "c_args = ['-DXML_STATIC']", {plain = true})
         end

packages/f/fribidi/xmake.lua

@@ -40,7 +40,7 @@ package("fribidi")
         import("package.tools.autoconf").install(package, configs)
     end)
 
-    on_install("windows|x86", "windows|x64", "mingw", "msys", "wasm", "cross", function (package)
+    on_install("windows", "mingw", "msys", "wasm", "cross", "android", "iphoneos", function (package)
         local configs = {"-Ddocs=false", "-Dtests=false"}
         table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static"))
         import("package.tools.meson").install(package, configs)

packages/g/glib/xmake.lua

@@ -8,6 +8,7 @@ package("glib")
     end, excludes = {"*/COPYING"}})
     add_urls("https://gitlab.gnome.org/GNOME/glib/-/archive/$(version)/glib-$(version).tar.gz", {alias = "gitlab"})
     add_urls("https://gitlab.gnome.org/GNOME/glib.git")
+
     add_versions("home:2.71.0", "926816526f6e4bba9af726970ff87be7dac0b70d5805050c6207b7bb17ea4fca")
     add_versions("home:2.78.1", "915bc3d0f8507d650ead3832e2f8fb670fce59aac4d7754a7dab6f1e6fed78b2")
     add_versions("home:2.85.0", "97cfb0466ae41fca4fa2a57a15440bee15b54ae76a12fb3cbff11df947240e48")
@@ -83,7 +84,7 @@ package("glib")
         end
     end)
 
-    on_install("windows", "macosx", "linux", "cross", "mingw", function (package)
+    on_install(function (package)
         local configs = {"-Dbsymbolic_functions=false",
                          "-Ddtrace=false",
                          "-Dman=false",

packages/g/gperf/xmake.lua

@@ -7,6 +7,7 @@ package("gperf")
     set_urls("https://ftpmirror.gnu.org/gnu/gperf/gperf-$(version).tar.gz",
              "https://ftp.gnu.org/gnu/gperf/gperf-$(version).tar.gz")
 
+    add_versions("3.3", "fd87e0aba7e43ae054837afd6cd4db03a3f2693deb3619085e6ed9d8d9604ad8")
     add_versions("3.1", "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2")
 
     if is_host("linux") then

packages/l/libffi/xmake.lua

@@ -33,7 +33,7 @@ package("libffi")
         end
     end)
 
-    on_install("windows", "iphoneos", "cross", function (package)
+    on_install("windows", "iphoneos", "cross", "android", function (package)
         io.gsub("fficonfig.h.in", "# *undef (.-)\n", "${define %1}\n")
         os.cp(path.join(os.scriptdir(), "port", "xmake.lua"), "xmake.lua")
         import("package.tools.xmake").install(package, {

packages/p/pango/xmake.lua

@@ -6,6 +6,7 @@ package("pango")
 
     add_urls("https://gitlab.gnome.org/GNOME/pango/-/archive/$(version)/pango-$(version).tar.gz")
     add_urls("https://gitlab.gnome.org/GNOME/pango.git")
+    add_versions("1.56.3", "7a059664dcd1c517979e2db2e71dc9a3550acf5a8cf76a1aadb6526d9d4b90f1")
     add_versions("1.51.1", "ea92cd570cdba62ca52cc0a7c9ea3cd311b6da3f0328a5aa8a4a81b0a74944a5")
     add_versions("1.50.3", "4a8b0cf33d5f9ecaa9cd99dd72703d5c4c53bc58df64dd9538493bb4356ab691")
 
@@ -16,7 +17,7 @@ package("pango")
         add_deps("libintl")
     elseif is_plat("macosx") then
         add_deps("libintl")
-        add_deps("libiconv", {system = true})
+        add_deps("libiconv")
         add_extsources("brew::pango")
         add_frameworks("CoreFoundation")
     elseif is_plat("linux") then
@@ -27,9 +28,9 @@ package("pango")
     end
     add_includedirs("include", "include/pango-1.0")
 
-    on_install("windows|x64", "windows|x86", "macosx", "linux", function (package)
+    on_install(function (package)
         import("package.tools.meson")
-        local configs = {"-Dintrospection=disabled", "-Dgtk_doc=false", "-Dfontconfig=enabled"}
+        local configs = {"-Dintrospection=disabled", "-Dfontconfig=enabled"}
 
         table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static"))
         io.gsub("meson.build", "subdir%('tests'%)", "")
@@ -50,7 +51,9 @@ package("pango")
 
         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:")
+        if envs.LDFLAGS and envs.LDFLAGS ~= "" then
+            envs.LDFLAGS = string.gsub(envs.LDFLAGS, "%-libpath:", "/libpath:")
+        end
         meson.install(package, configs, {envs = envs})
     end)
 

packages/p/pcre/xmake.lua

@@ -36,7 +36,7 @@ package("pcre")
         import("package.tools.cmake").install(package, configs)
     end)
 
-    on_install("macosx", "linux", "mingw", "cross", function (package)
+    on_install("@!windows", function (package)
         local configs = {}
         table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
         table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))

packages/p/pixman/xmake.lua

@@ -9,10 +9,12 @@ package("pixman")
     add_urls("https://github.com/freedesktop/pixman/archive/refs/tags/pixman-$(version).tar.gz", {alias = "git_release"})
     add_urls("https://gitlab.freedesktop.org/pixman/pixman.git")
 
+    add_versions("git_release:0.46.0", "92c1b08db747ff17f9028da3e63168c8ac23204ce62b1a0437607847c8ad6c36")
     add_versions("git_release:0.42.0", "45c6462f6d6441923d4c17d06fa50ce066f0ceff0fc84af8d342df63c1079151")
     add_versions("git_release:0.42.2", "4191a5084bae000a61e3513b06027b6f8f559d17d61769ed9de27dfb0cec8699")
     add_versions("git_release:0.43.4", "2af0acd451e22ae9d86d3c8aa45fcc19e4cc33e86bec311e5328cc2171ff1720")
 
+    add_versions("home:0.46.0", "02d9ff7b8458ef61731c3d355f854bbf461fd0a4d3563c51f1c1c7b00638050d")
     add_versions("home:0.42.0", "07f74c8d95e4a43eb2b08578b37f40b7937e6c5b48597b3a0bb2c13a53f46c13")
     add_versions("home:0.42.2", "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e")
     add_versions("home:0.43.2", "ea79297e5418fb528d0466e8b5b91d1be88857fa3706f49777b2925a72ae9924")
@@ -34,7 +36,7 @@ package("pixman")
         end)
     end
 
-    on_install("!android and !cross and (!windows or windows|!arm64)", function (package)
+    on_install(function (package)
         if package:is_plat("windows") and package:config("shared") then
             package:add("defines", "PIXMAN_API=__declspec(dllimport)")
         end