瀏覽代碼

atk: add 2.38.0 version (#5140)

* atk: add 2.38.0 version

* disable cross

* Revert "disable cross"

This reverts commit 05ae9dbdb66afc446a32ee5036aea50bd8fa8823.

* add git url

* fix packagedeps
star9029 11 月之前
父節點
當前提交
0d3e70611c
共有 2 個文件被更改,包括 18 次插入11 次删除
  1. 16 9
      packages/a/atk/xmake.lua
  2. 2 2
      packages/g/glib/xmake.lua

+ 16 - 9
packages/a/atk/xmake.lua

@@ -1,13 +1,14 @@
 package("atk")
-
     set_homepage("https://gitlab.gnome.org/GNOME/atk")
     set_description("ATK - The Accessibility Toolkit")
     set_license("LGPL-2.0")
 
-    add_urls("https://download.gnome.org/sources/atk/$(version).tar.xz", {version = function (version)
-        return format("%d.%d/atk-%s", version:major(), version:minor(), version)
-    end})
-    add_versions("2.36.0", "fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788")
+    add_urls("https://gitlab.gnome.org/Archive/atk/-/archive/$(version)/atk-$(version).tar.bz2",
+             "https://gitlab.gnome.org/Archive/atk.git")
+
+    add_versions("2.38.0", "469313d28bd22bcbf7b7ea300dddb9b6c13854455d297f4d51a944e378b0a9d7")
+
+    add_configs("introspection", {description = "Whether to build introspection files", default = false, type = "boolean"})
 
     if is_plat("mingw") and is_subhost("msys") then
         add_extsources("pacman::atk")
@@ -17,12 +18,18 @@ package("atk")
         add_extsources("brew::atk")
     end
 
-    add_deps("meson", "ninja", "glib", "pkg-config")
     add_includedirs("include/atk-1.0")
-    on_install("linux", function (package)
-        local configs = {"-Dintrospection=false"}
+
+    add_deps("meson", "ninja", "glib")
+    if is_plat("windows") then
+        add_deps("pkgconf")
+    end
+
+    on_install("windows", "macosx", "linux", "cross", function (package)
+        local configs = {}
         table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static"))
-        import("package.tools.meson").install(package, configs)
+        table.insert(configs, "-Dintrospection=" .. (package:config("introspection") and "true" or "false"))
+        import("package.tools.meson").install(package, configs, {packagedeps = {"libintl", "libiconv"}})
     end)
 
     on_test(function (package)

+ 2 - 2
packages/g/glib/xmake.lua

@@ -60,8 +60,8 @@ package("glib")
         end
     end)
 
-    on_load("windows", "macosx", "linux", "cross", function (package)
-        if package:version():ge("2.74.0") then
+    on_load(function (package)
+        if package:gitref() or package:version():ge("2.74.0") then
             package:add("deps", "pcre2")
         else
             package:add("deps", "pcre")