Parcourir la source

glib: update to 2.85.0 (#7341)

* glib: update to 2.85.0

* Link against `uuid`

* `add_deps("libintl")` for `MinGW`

* fix hash

* Update xmake.lua
Saikari il y a 1 mois
Parent
commit
3df5cf899d
1 fichiers modifiés avec 12 ajouts et 6 suppressions
  1. 12 6
      packages/g/glib/xmake.lua

+ 12 - 6
packages/g/glib/xmake.lua

@@ -1,5 +1,4 @@
 package("glib")
-
     set_homepage("https://docs.gtk.org/glib/")
     set_description("Low-level core library that forms the basis for projects such as GTK+ and GNOME.")
     set_license("LGPL-2.1")
@@ -11,6 +10,7 @@ package("glib")
     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")
     add_patches("2.71.0", path.join(os.scriptdir(), "patches", "2.71.0", "macosx.patch"), "a0c928643e40f3a3dfdce52950486c7f5e6f6e9cfbd76b20c7c5b43de51d6399")
 
     if is_plat("mingw") and is_subhost("msys") then
@@ -26,7 +26,7 @@ package("glib")
     end
 
     if is_plat("windows", "mingw") then
-        add_syslinks("user32", "shell32", "ole32", "ws2_32", "shlwapi", "iphlpapi", "dnsapi")
+        add_syslinks("user32", "shell32", "ole32", "ws2_32", "shlwapi", "iphlpapi", "dnsapi", "uuid")
     elseif is_plat("macosx") then
         add_syslinks("resolv")
         add_frameworks("AppKit", "Foundation", "CoreServices", "CoreFoundation")
@@ -40,8 +40,13 @@ package("glib")
     elseif is_plat("macosx") then
         add_deps("libiconv", {system = true})
         add_deps("libintl")
-    elseif is_plat("windows") then
-        add_deps("libintl", "pkgconf")
+    elseif is_plat("windows", "mingw") then
+        add_deps("libintl")
+        if is_subhost("windows") then
+            add_deps("pkgconf")
+        else
+            add_deps("pkg-config")
+        end
     end
 
     add_includedirs("include/glib-2.0", "lib/glib-2.0/include")
@@ -78,7 +83,7 @@ package("glib")
         end
     end)
 
-    on_install("windows", "macosx", "linux", "cross", function (package)
+    on_install("windows", "macosx", "linux", "cross", "mingw", function (package)
         local configs = {"-Dbsymbolic_functions=false",
                          "-Ddtrace=false",
                          "-Dman=false",
@@ -87,7 +92,8 @@ package("glib")
                          "-Dinstalled_tests=false",
                          "-Dsystemtap=false",
                          "-Dselinux=disabled",
-                         "-Dlibmount=disabled"}
+                         "-Dlibmount=disabled",
+                         "-Dsysprof=disabled"}
         if package:is_plat("macosx") and package:version():le("2.61.0") then
             table.insert(configs, "-Diconv=native")
         elseif package:is_plat("windows") and package:version():le("2.74.0") then